diff options
Diffstat (limited to 'pkgs')
2108 files changed, 47474 insertions, 29804 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 219ab5d4f805..35488732117d 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0d5npn4p321jqsbqjxkbv0ncvs2hp9vdp30np6n8n53f896cxl92"; + sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix index 8a8c4a7f1021..cc3e83befa64 100644 --- a/pkgs/applications/altcoins/dcrd.nix +++ b/pkgs/applications/altcoins/dcrd.nix @@ -29,5 +29,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix index aa6e8a0315e7..8d966684b23c 100644 --- a/pkgs/applications/altcoins/dcrwallet.nix +++ b/pkgs/applications/altcoins/dcrwallet.nix @@ -38,5 +38,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index d7cce586b9b7..174ff96a1247 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -51,6 +51,8 @@ rec { memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; }; + mist = callPackage ./mist.nix { }; + namecoin = callPackage ./namecoin.nix { withGui = true; }; namecoind = callPackage ./namecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix index b7d14a43921b..0659c4fa2585 100644 --- a/pkgs/applications/altcoins/ethsign/default.nix +++ b/pkgs/applications/altcoins/ethsign/default.nix @@ -52,7 +52,7 @@ buildGoPackage rec { ]; meta = with stdenv.lib; { - homepage = http://github.com/dapphub/ethsign; + homepage = https://github.com/dapphub/ethsign; description = "Make raw signed Ethereum transactions"; license = [licenses.gpl3]; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 84e0a32e7b2e..65e1dbc9b198 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.2"; + version = "1.8.3"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "19ryfy9dsmgk3kimkmq2hif1di4binqg9718xrmirf063rajk02a"; + sha256 = "1vdrf3fi4arr6aivyp5myj4jy7apqbiqa6brr3jplmc07q1yijnf"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix index 51e5f6bcb298..1aa598f32545 100644 --- a/pkgs/applications/altcoins/hevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -55,6 +55,7 @@ lib.overrideDerivation (mkDerivation rec { description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; maintainers = [stdenv.lib.maintainers.dbrock]; + broken = true; # 2018-04-10 }) (attrs: { buildInputs = attrs.buildInputs ++ [solc]; nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper]; diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix new file mode 100644 index 000000000000..c112384f3d84 --- /dev/null +++ b/pkgs/applications/altcoins/mist.nix @@ -0,0 +1,71 @@ +{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: + +let + version = "0.10.0"; + name = "mist-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.system}"; + + meta = with stdenv.lib; { + description = "Browse and use Ðapps on the Ethereum network"; + homepage = https://github.com/ethereum/mist; + license = licenses.gpl3; + maintainers = with maintainers; []; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + + urlVersion = builtins.replaceStrings ["."] ["-"] version; + + desktopItem = makeDesktopItem rec { + name = "Mist"; + exec = "mist"; + icon = "mist"; + desktopName = name; + genericName = "Mist Browser"; + categories = "Network;"; + }; + + mist = stdenv.mkDerivation { + inherit name version; + + src = { + i686-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip"; + sha256 = "01hvxlm9w522pwvsjdy18gsrapkfjr7d1jjl4bqjjysxnjaaj2lk"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip"; + sha256 = "01k17j7fdfhxfd26njdsiwap0xnka2536k9ydk32czd8db7ya9zi"; + }; + }.${stdenv.system} or throwSystem; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out/lib/mist $out/bin + unzip -d $out/lib/mist $src + ln -s $out/lib/mist/mist $out/bin + fixupPhase + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$out/lib/mist" \ + $out/lib/mist/mist + ''; + }; +in +buildFHSUserEnv { + name = "mist"; + + targetPkgs = pkgs: with pkgs; [ + mist + ]; + + extraInstallCommands = '' + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* $out/share/applications + ''; + + runScript = "mist"; +} diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 0d2899b2e649..2aff86ae1d38 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -2,32 +2,34 @@ , makeWrapper, makeDesktopItem , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative -, qtlocation, qtquickcontrols, qtwebchannel +, qtlocation, qtquickcontrols2, qtwebchannel , qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind +, pcsclite, zeromq, cppzmq, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.11.1.0"; + version = "0.12.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "01d7apwrv8j8bh7plvvhlnll3ransaha3n6rx19nkgvfn319hswq"; + sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects - qtdeclarative qtlocation qtquickcontrols + qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline - boost libunwind makeWrapper + boost libunwind pcsclite zeromq cppzmq + makeWrapper ]; patches = [ diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 928fb32911f5..08840c6a65e8 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -1,8 +1,8 @@ diff --git a/main.cpp b/main.cpp -index 1a9a979..2316929 100644 +index c03b160..a8ea263 100644 --- a/main.cpp +++ b/main.cpp -@@ -74,10 +74,6 @@ int main(int argc, char *argv[]) +@@ -80,14 +80,16 @@ int main(int argc, char *argv[]) // qDebug() << "High DPI auto scaling - enabled"; //#endif @@ -13,9 +13,6 @@ index 1a9a979..2316929 100644 MainApp app(argc, argv); qDebug() << "app startd"; -@@ -86,6 +82,13 @@ int main(int argc, char *argv[]) - app.setOrganizationDomain("getmonero.org"); - app.setOrganizationName("monero-project"); + // Log settings + QString logfile = @@ -23,20 +20,19 @@ index 1a9a979..2316929 100644 + + "/monero-wallet-gui.log"; + Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); + -+ - filter *eventFilter = new filter; - app.installEventFilter(eventFilter); - + app.setApplicationName("monero-core"); + app.setOrganizationDomain("getmonero.org"); + app.setOrganizationName("monero-project"); diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp -index 8525bf3..6967b24 100644 +index 74649ce..fe1efc6 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp -@@ -613,7 +613,7 @@ QString Wallet::getDaemonLogPath() const - - QString Wallet::getWalletLogPath() const - { -- return QCoreApplication::applicationDirPath() + "/monero-wallet-gui.log"; -+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/monero-wallet-gui.log"; +@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const + #ifdef Q_OS_MACOS + return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename; + #else +- return QCoreApplication::applicationDirPath() + "/" + filename; ++ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename; + #endif } - Wallet::Wallet(Monero::Wallet *w, QObject *parent) diff --git a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch deleted file mode 100644 index 5436332db802..000000000000 --- a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt -index 63908005..f6656d5c 100644 ---- a/src/wallet/CMakeLists.txt -+++ b/src/wallet/CMakeLists.txt -@@ -86,43 +86,40 @@ target_link_libraries(wallet - ${EXTRA_LIBRARIES}) - add_dependencies(wallet version) - --if (NOT BUILD_GUI_DEPS) -- set(wallet_rpc_sources -- wallet_rpc_server.cpp) -+set(wallet_rpc_sources -+ wallet_rpc_server.cpp) - -- set(wallet_rpc_headers) -+set(wallet_rpc_headers) - -- set(wallet_rpc_private_headers -- wallet_rpc_server.h) -+set(wallet_rpc_private_headers -+ wallet_rpc_server.h) - -- monero_private_headers(wallet_rpc_server -- ${wallet_rpc_private_headers}) -- monero_add_executable(wallet_rpc_server -- ${wallet_rpc_sources} -- ${wallet_rpc_headers} -- ${wallet_rpc_private_headers}) -- -- target_link_libraries(wallet_rpc_server -- PRIVATE -- wallet -- epee -- rpc -- cryptonote_core -- cncrypto -- common -- ${Boost_CHRONO_LIBRARY} -- ${Boost_PROGRAM_OPTIONS_LIBRARY} -- ${Boost_FILESYSTEM_LIBRARY} -- ${Boost_THREAD_LIBRARY} -- ${CMAKE_THREAD_LIBS_INIT} -- ${EXTRA_LIBRARIES}) -- add_dependencies(wallet_rpc_server version) -- set_property(TARGET wallet_rpc_server -- PROPERTY -- OUTPUT_NAME "monero-wallet-rpc") -- install(TARGETS wallet_rpc_server DESTINATION bin) --endif() -+monero_private_headers(wallet_rpc_server -+ ${wallet_rpc_private_headers}) -+monero_add_executable(wallet_rpc_server -+ ${wallet_rpc_sources} -+ ${wallet_rpc_headers} -+ ${wallet_rpc_private_headers}) - -+target_link_libraries(wallet_rpc_server -+ PRIVATE -+ wallet -+ epee -+ rpc -+ cryptonote_core -+ cncrypto -+ common -+ ${Boost_CHRONO_LIBRARY} -+ ${Boost_PROGRAM_OPTIONS_LIBRARY} -+ ${Boost_FILESYSTEM_LIBRARY} -+ ${Boost_THREAD_LIBRARY} -+ ${CMAKE_THREAD_LIBS_INIT} -+ ${EXTRA_LIBRARIES}) -+add_dependencies(wallet_rpc_server version) -+set_property(TARGET wallet_rpc_server -+ PROPERTY -+ OUTPUT_NAME "monero-wallet-rpc") -+install(TARGETS wallet_rpc_server DESTINATION bin) - - # build and install libwallet_merged only if we building for GUI - if (BUILD_GUI_DEPS) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 57a058bada6b..8be24522f564 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,48 +1,44 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake -, boost, miniupnpc, openssl, pkgconfig, unbound -, IOKit +{ stdenv, fetchFromGitHub, cmake, pkgconfig, git +, boost, miniupnpc, openssl, unbound, cppzmq +, zeromq, pcsclite, readline +, CoreData, IOKit, PCSC }: +assert stdenv.isDarwin -> IOKit != null; + +with stdenv.lib; + stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.11.1.0"; + version = "0.12.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148"; + sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig git ]; - buildInputs = [ boost miniupnpc openssl unbound ] - ++ stdenv.lib.optional stdenv.isDarwin IOKit; - - patches = [ - ./build-wallet-rpc.patch # fixed in next release - ]; + buildInputs = [ + boost miniupnpc openssl unbound + cppzmq zeromq pcsclite readline + ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" ]; - doCheck = false; - - installPhase = '' - make install - install -Dt "$out/bin/" \ - bin/monero-blockchain-export \ - bin/monero-blockchain-import \ - bin/monero-wallet-rpc - ''; + hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { + meta = { description = "Private, secure, untraceable currency"; homepage = https://getmonero.org/; license = licenses.bsd3; platforms = platforms.all; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; [ ehmry rnhmjoj ]; }; } diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index ee4203fa88c9..ed78133a759c 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.9.4"; - sha256 = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f"; - cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3"; - patches = [ ./patches/vendored-sources-1.9.patch ]; + version = "1.10.0"; + sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; + cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; + patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index fe2c2c628275..991799321094 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.8.11"; - sha256 = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k"; - cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi"; - patches = [ ./patches/vendored-sources-1.8.patch ]; + version = "1.9.5"; + sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; + cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; + patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch index 3239df63de30..3e8e032f30c2 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch @@ -1,17 +1,30 @@ diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 000000000..8dddda426 ---- /dev/null +index 72652ad2f..b21c6aa7b 100644 +--- a/.cargo/config +++ b/.cargo/config -@@ -0,0 +1,94 @@ +@@ -1,3 +1,113 @@ + [target.x86_64-pc-windows-msvc] + # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 + rustflags = ["-Ctarget-feature=+crt-static"] ++ +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" -+branch = "master" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git" ++rev = "bd25b41cd642c6b822d820dded3aa601a29aa079" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git" ++rev = "4b6f112412716cd05123d32eeb7fda448288a6c6" +replace-with = "vendored-sources" + +[source."https://github.com/nikvolf/parity-tokio-ipc"] +git = "https://github.com/nikvolf/parity-tokio-ipc" -+branch = "master" ++branch = "master" +replace-with = "vendored-sources" + +[source."https://github.com/nikvolf/tokio-named-pipes"] @@ -19,6 +32,16 @@ index 000000000..8dddda426 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/parity-js/dapp-wallet.git"] ++git = "https://github.com/parity-js/dapp-wallet.git" ++rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/parity-js/shell.git"] ++git = "https://github.com/parity-js/shell.git" ++rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" @@ -34,14 +57,9 @@ index 000000000..8dddda426 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/js-precompiled.git"] -+git = "https://github.com/paritytech/js-precompiled.git" -+branch = "stable" -+replace-with = "vendored-sources" -+ +[source."https://github.com/paritytech/jsonrpc.git"] +git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.8" ++branch = "parity-1.10" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"] @@ -54,11 +72,6 @@ index 000000000..8dddda426 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/nanomsg.rs.git"] -+git = "https://github.com/paritytech/nanomsg.rs.git" -+branch = "parity-1.7" -+replace-with = "vendored-sources" -+ +[source."https://github.com/paritytech/rust-ctrlc.git"] +git = "https://github.com/paritytech/rust-ctrlc.git" +branch = "master" @@ -89,6 +102,11 @@ index 000000000..8dddda426 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/tailhook/rotor"] +git = "https://github.com/tailhook/rotor" +branch = "master" diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index d1f6520d706b..d91b103c6cef 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -10,13 +10,13 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"] -+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git" ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"] -+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git" ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git" +branch = "master" +replace-with = "vendored-sources" + @@ -90,8 +90,8 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/pepyakin/wasmi"] -+git = "https://github.com/pepyakin/wasmi" ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" +branch = "master" +replace-with = "vendored-sources" + diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index bb0615df25b8..9c42c98ba5e3 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.2"; + version = "2.9.3"; name = "asunder-${version}"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; - sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r"; + sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6890b53f407d..6e411c8448f6 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio player"; - homepage = http://audacious-media-player.org/; + homepage = https://audacious-media-player.org/; maintainers = with maintainers; [ eelco ramkromberg ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 8910fdc1b0a8..019bde7cc64a 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -81,7 +81,7 @@ mkDerivation { meta = with lib; { description = "Audio player"; - homepage = http://audacious-media-player.org/; + homepage = https://audacious-media-player.org/; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index e5a5cc7c9c6a..922acf9e3e00 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + sha256 = "18gghx0ygwh01cidj8mkf82l9qhq2dy1b3yc4ajksvj762yg6cf2"; }; buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 27724bc28e99..2d90599346fb 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -9,9 +9,13 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = "https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/plain/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; + url = "https://salsa.debian.org/multimedia-team/caps/raw/9a99c225/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway"; }) + (fetchurl { + url = "https://salsa.debian.org/multimedia-team/caps/raw/a411203d/debian/patches/0002-Use-standard-exp10f-instead-of-pow10f.patch"; + sha256 = "18ciklnscabr77l8b89xmbagkk79w4iqfpzr2yhn2ywv2jp8akx9"; + }) ]; configurePhase = '' diff --git a/pkgs/applications/audio/chuck/clang.patch b/pkgs/applications/audio/chuck/clang.patch new file mode 100644 index 000000000000..77227ef0fd44 --- /dev/null +++ b/pkgs/applications/audio/chuck/clang.patch @@ -0,0 +1,58 @@ +diff --git a/src/ugen_osc.cpp b/src/ugen_osc.cpp +index 6b93c6b..dbefe4f 100644 +--- a/src/ugen_osc.cpp ++++ b/src/ugen_osc.cpp +@@ -1232,7 +1232,7 @@ CK_DLL_CTRL( gen5_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1287,7 +1287,7 @@ CK_DLL_CTRL( gen7_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1340,7 +1340,7 @@ CK_DLL_CTRL( gen9_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1390,7 +1390,7 @@ CK_DLL_CTRL( gen10_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1441,7 +1441,7 @@ CK_DLL_CTRL( gen17_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1502,7 +1502,7 @@ CK_DLL_CTRL( curve_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) goto done; ++ if(weights!=0) goto done; + + nargs = weights->size(); + if (nargs < 5 || (nargs % 3) != 2) { // check number of args diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index fd7f0c2b07c2..e94172b0f879 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }: +{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which +, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel +}: stdenv.mkDerivation rec { version = "1.3.5.2"; @@ -10,19 +12,24 @@ stdenv.mkDerivation rec { }; buildInputs = [ bison flex libsndfile which ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib + ++ stdenv.lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; - patches = [ ./darwin-limits.patch ]; + patches = [ ./clang.patch ./darwin-limits.patch ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" substituteInPlace src/makefile.osx --replace "xcodebuild" "/usr/bin/xcodebuild" substituteInPlace src/makefile.osx --replace "weak_framework" "framework" + substituteInPlace src/makefile.osx --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" ''; - buildPhase = - stdenv.lib.optionals stdenv.isLinux ["make -C src linux-alsa"] ++ - stdenv.lib.optionals stdenv.isDarwin ["make -C src osx"]; + buildPhase = '' + make -C src ${if stdenv.isDarwin then "osx" else "linux-alsa"} + ''; installPhase = '' install -Dm755 ./src/chuck $out/bin/chuck diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 92a33035c827..b8ff3daec606 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -76,6 +76,8 @@ let enableParallelBuilding = true; + passthru.unfree = unfree; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -85,8 +87,8 @@ let }; }; - # Spotify blob for Clementine - blob = stdenv.mkDerivation { + # Unfree Spotify blob for Clementine + unfree = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine inherit src nativeBuildInputs postPatch; @@ -95,7 +97,7 @@ let ./clementine-spotify-blob.patch ]; - buildInputs = buildInputs ++ [ libspotify ]; + buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob @@ -104,6 +106,15 @@ let mkdir -p $out/libexec/clementine mv $out/bin/clementine-spotifyblob $out/libexec/clementine rmdir $out/bin + + makeWrapper ${free}/bin/clementine $out/bin/clementine \ + --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + + mkdir -p $out/share + for dir in applications icons kde4; do + ln -s "$free/share/$dir" "$out/share/$dir" + done ''; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -116,34 +127,4 @@ let }; }; -in - -with stdenv.lib; - -runCommand "clementine-${version}" -{ - inherit blob free; - buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks - dontPatchELF = true; - dontStrip = true; - meta = { - description = "A multiplatform music player" - + " (" + (optionalString withSpotify "with Spotify, ") - + "with gstreamer plugins: " - + concatStrings (intersperse ", " (map (x: x.name) gst_plugins)) - + ")"; - license = licenses.gpl3Plus; - inherit (free.meta) homepage platforms maintainers; - }; -} -'' - mkdir -p $out/bin - makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ - ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - - mkdir -p $out/share - for dir in applications icons kde4; do - ln -s "$free/share/$dir" "$out/share/$dir" - done -'' +in free diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix new file mode 100644 index 000000000000..0383af06795e --- /dev/null +++ b/pkgs/applications/audio/crip/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchurl +, makeWrapper + +, perl +, perlPackages + +, cdparanoia +, coreutils +, eject +, flac +, gnugrep +, nano +, sox +, vorbis-tools +, vorbisgain +, which +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "crip-3.9"; + src = fetchurl { + url = "http://bach.dynet.com/crip/src/${name}.tar.gz"; + sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz"; + }; + + buildInputs = [ perl perlPackages.CDDB_get ]; + nativeBuildInputs = [ makeWrapper ]; + + toolDeps = makeBinPath [ + cdparanoia + coreutils + eject + flac + gnugrep + sox + vorbis-tools + vorbisgain + which + ]; + + scripts = [ "crip" "editcomment" "editfilenames" ]; + + installPhase = '' + mkdir -p $out/bin/ + + for script in ${escapeShellArgs scripts}; do + cp $script $out/bin/ + + substituteInPlace $out/bin/$script \ + --replace '$editor = "vim";' '$editor = "${nano}/bin/nano";' + + wrapProgram $out/bin/$script \ + --set PERL5LIB "${makePerlPath [ perlPackages.CDDB_get ]}" \ + --set PATH "${toolDeps}" + done + ''; + + meta = { + homepage = http://bach.dynet.com/crip/; + description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; + license = stdenv.lib.licenses.gpl1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; +} diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 1ca2570fd4bd..e3263c944f45 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas +, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , gnome3, wrapGAppsHook }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libid3tag id3lib taglib libvorbis libogg flac + gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 6affb16e073f..4ef1f1dd2020 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,14 +7,13 @@ mkDerivation rec { name = "elisa-${version}"; - # 0.1 is expected in early/mid 2018-04 - version = "0.0.20180320"; + version = "0.1"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; - rev = "9dd35d7244a8a3553275152f5b50fbe6d272ce64"; - sha256 = "0mjqvcpk2y4jlwkka8gzl50wgqjjx9bzpbrj79cr0ib3jyviss4k"; + rev = version; + sha256 = "13i0fkpwrskric3gfalh7mcpp4l2knwnq7jpq391lgh6krq04r4w"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 3faeeb12d4c6..651604c71a11 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: +{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig +, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; version = "2.2"; @@ -10,6 +11,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + patches = [ + (fetchpatch { + # glibc 2.27 compatibility + url = https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch; + sha256 = "07b0wf6k4xqgigv4h095bzfaw8r218wa36r9w1817jcys13r6c5r"; + }) + ]; + installFlags = '' DESTDIR=$(out) ''; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 4875ee8b57da..bf5bb7815856 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -49,7 +49,7 @@ let # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index f0564f37d6b1..db5433cc35fc 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -78,7 +78,7 @@ let # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 789ee35f260e..27ca539850e2 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q"; + sha256 = "04jlgq1d1hd8r9cnmkl3lgf1fgm7kgy4hh9nfddap41fm1wp121p"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index e238f8831421..f1bdcd8c5242 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -11,10 +11,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fmit-${version}"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { - sha256 = "1p374gf7iksrlyvddm3w4qk3l0rxsiyymz5s8dmc447yvin8ykfq"; + sha256 = "18gvl8smcnigzldy1acs5h8rscf287b39xi4y2cl5armqbj0y38x"; rev = "v${version}"; repo = "fmit"; owner = "gillesdegottex"; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 25704d262801..4266b8c69bb8 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9"; + sha256 = "1xflbbnjdibjmyxb1zq8liylaw5k03nnl1z3272jh204pqh17ri9"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 24421b527e16..680542dc405b 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "09iryxnhg8d9q36a4brb25bqkjprkx5kl0x7vyy82gxivqk0ihl8"; + sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 01b450ab7dd0..d0c3eab69154 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { version = "1.0.6"; src = fetchurl { - url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz"; + url = "https://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz"; sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e"; }; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { installCommand = "python setup.py install --prefix=$out"; meta = { - homepage = http://www.red-bean.com/decklin/lastfmsubmitd/; + homepage = https://www.red-bean.com/decklin/lastfmsubmitd/; description = "An last.fm audio scrobbler and daemon"; }; } diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index fa4ea6343e91..4dfc7b13046e 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy/gmusic.nix index b792ec3428e7..e58cddd42942 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://www.mopidy.com/; + homepage = https://www.mopidy.com/; description = "Mopidy extension for playing music from Google Play Music"; license = licenses.asl20; maintainers = [ maintainers.jgillich ]; diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy/iris.nix index cb99f9b5dbe5..1c8b0af70e43 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.14.0"; + version = "3.16.3"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb"; + sha256 = "1zdlvrqlj1hapaxnskrbp9idziy3rcxhpqhw3x4q25cjbl8m0b0d"; }; propagatedBuildInputs = [ @@ -17,8 +17,11 @@ pythonPackages.buildPythonApplication rec { pylast spotipy raven + tornado ]); + postPatch = "sed -i /tornado/d setup.py"; + # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy/local-images.nix index 063821544aed..063821544aed 100644 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ b/pkgs/applications/audio/mopidy/local-images.nix diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix index 7aebc43dabbb..7aebc43dabbb 100644 --- a/pkgs/applications/audio/mopidy-local-sqlite/default.nix +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy/moped.nix index 3754bf763b20..3754bf763b20 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy/moped.nix diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy/mopify.nix index d55e711cf330..d55e711cf330 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index d2f525bffd1d..d2f525bffd1d 100644 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 098812961649..098812961649 100644 --- a/pkgs/applications/audio/mopidy-soundcloud/default.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 034a07bf027d..034a07bf027d 100644 --- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy/spotify.nix index 999883dc26c3..64b5ee629b33 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://www.mopidy.com/; + homepage = https://www.mopidy.com/; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy/youtube.nix index d3eb8539a19c..d3eb8539a19c 100644 --- a/pkgs/applications/audio/mopidy-youtube/default.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index ed7a4e786f07..eb5aa7c036cc 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, libvorbis }: +{ stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: stdenv.mkDerivation rec { version = "3.2.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libvorbis - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin SDL; buildFlags = [ "CXXFLAGS=-Wno-narrowing" ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 1b30399ae0a5..3aef2e35943d 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.8"; + name = "mpg123-1.25.10"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "16s9z1xc5kv1p90g42vsr9m4gq3dwjsmrj873x4i8601mvpm3nkr"; + sha256 = "08vhp8lz7d9ybhxcmkq3adwfryhivfvp0745k4r9kgz4wap3f4vc"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 93e909fc604b..ffd5b9a58582 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,20 +3,18 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q"; + sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624"; }; buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 10c3bb2a195d..87f5f94bb30b 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad"; + sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 8f04bf116a6c..3670fb8347d6 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -20,13 +20,16 @@ stdenv.mkDerivation rec { mv helmholtz~/src/Makefile . rm -rf helmholtz~/src/ rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.pd_linux rm helmholtz~/helmholtz~.dll rm -rf __MACOSX ''; patchPhase = '' + mkdir -p $out/helmholtz~ sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile sed -i "s@-Wl@@g" Makefile + sed -i "s@\$(NAME).pd_linux \.\./\$(NAME).pd_linux@helmholtz~.pd_linux $out/helmholtz~/@g" Makefile ''; installPhase = '' diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 94b240ebb028..ada12eefaf7e 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.37"; + version = "6.0.38"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1c675jfzcrwfn8lcswm5y5kmazkhnb0p4mzlf5sim57hms88ffjq"; + sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc"; }; configurePhase = '' diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index fd328669846f..972da4f773f6 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3, - tag ? "", +{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf, + tag ? "", xvfb_run, dbus, glibcLocales, glib, gobjectIntrospection, gst_all_1, withGstPlugins ? true, xineBackend ? false, xineLib, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, @@ -7,38 +7,53 @@ keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: let optionals = stdenv.lib.optionals; in -python2Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { name = "quodlibet${tag}-${version}"; - version = "3.9.1"; + version = "4.0.2"; # XXX, tests fail + # https://github.com/quodlibet/quodlibet/issues/2820 doCheck = false; src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591"; + sha256 = "072s983p3n84yl807pbdxsy5vrgs8jzzfl648gsri6kpwsp6w5fz"; }; nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; - # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps - buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] + checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; + + buildInputs = [ gnome3.defaultIconTheme libsoup glib gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); - propagatedBuildInputs = with python2Packages; - [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ] + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] ++ optionals withDbusPython [ dbus-python ] ++ optionals withPyInotify [ pyinotify ] ++ optionals withMusicBrainzNgs [ musicbrainzngs ] ++ optionals stdenv.isDarwin [ pyobjc ] ++ optionals withPahoMqtt [ paho-mqtt ]; - makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ]; + LC_ALL = "en_US.UTF-8"; + + checkPhase = '' + runHook preCheck + checkHomeDir=$(mktemp -d) + mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file + env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \ + HOME=$checkHomeDir \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + py.test + runHook postCheck + ''; + + preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; - meta = { + meta = with stdenv.lib; { description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Quod Libet is a GTK+-based audio player written in Python, using @@ -54,7 +69,7 @@ python2Packages.buildPythonApplication rec { & internet radio, and all major audio formats. ''; - maintainers = with stdenv.lib.maintainers; [ coroa sauyon ]; + maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 3fe8ecfe5468..660f342dc9d9 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.1"; + name = "snd-18.2"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh"; + sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 7b78ceddda29..87bf440ed4f3 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.72.117.g6bd7cc73-35"; + version = "1.0.77.338.g758ebd78-41"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap"; + sha256 = "1971jc0431pl8yixpl37ryl2l0pqdf0xjvkg59nqdwj3vbdx5606"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 1ea4b4d27506..ef7aa96beb06 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ duplicity ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0"; postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 685f9c159b65..3227151ce21e 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -9,14 +9,14 @@ let ver_branch = "2.0"; - version = "2.0.4"; + version = "2.0.5"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "1svbyq2l3l2d72k10nw79jz940rqsskryaim2viy6jfpv9k5jfv1"; + sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index a7e8799c9c1c..a41f917a7ec2 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -22,6 +22,10 @@ in mkDerivation rec { # Module Qt5::Test must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|' + '' + # Fix missing include for gettimeofday() + + '' + sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp ''; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 5d06c2221b34..5160e02963f2 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng , fontconfig, freetype, pam, dbus_libs, makeWrapper }: stdenv.mkDerivation rec { @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { # Allow to set logfile to a special "/dev/stderr" in order to continue # logging to stderr and thus to the journal. ./no-logfile.patch - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch"; + sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm"; + }); preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f963fe378d51..a165fad370ec 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -5,10 +5,13 @@ , fetchurl , findutils , file +, fontsConf , git , glxinfo , gnugrep +, gnused , gnutar +, gtk2, gnome_vfs, glib, GConf , gzip , fontconfig , freetype @@ -29,8 +32,6 @@ , writeTextFile , xkeyboard_config , zlib -, gtk2, gnome_vfs, glib, GConf -, fontsConf }: let @@ -57,6 +58,7 @@ let findutils gnugrep which + gnused # For Android emulator file diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4583066842af..e18235024df4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -7,10 +7,15 @@ let }; inherit (gnome2) GConf gnome_vfs; }; + stableVersion = { + version = "3.1.1.0"; # "Android Studio 3.1.1" + build = "173.4697961"; + sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8"; + }; latestVersion = { - version = "3.2.0.6"; # "Android Studio 3.2 Canary 7" - build = "173.4658582"; - sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38"; + version = "3.2.0.10"; # "Android Studio 3.2 Canary 11" + build = "181.4720098"; + sha256Hash = "00cd7qdznspi69cgs1a13a3fnkvsc7zjfl517jgp32vdygkb0qxw"; }; in rec { # Old alias @@ -18,12 +23,9 @@ in rec { # Attributes are named by the corresponding release channels - stable = mkStudio { + stable = mkStudio (stableVersion // { pname = "android-studio"; #pname = "android-studio-stable"; # TODO: Rename and provide symlink - version = "3.0.1.0"; # "Android Studio 3.0.1" - build = "171.4443003"; - sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd"; meta = with stdenv.lib; { description = "The Official IDE for Android (stable channel)"; @@ -36,20 +38,17 @@ in rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ primeos ]; }; - }; + }); - beta = mkStudio { + beta = mkStudio (stableVersion // { pname = "android-studio-preview"; #pname = "android-studio-beta"; # TODO: Rename and provide symlink - version = "3.1.0.15"; # "Android Studio 3.1 RC 3" - build = "173.4658569"; - sha256Hash = "0jvq7k5vhrli41bj2imnsp3z70c7yws3fvs8m873qrjvfgmi5qrq"; meta = stable.meta // { description = "The Official IDE for Android (beta channel)"; homepage = https://developer.android.com/studio/preview/index.html; }; - }; + }); dev = mkStudio (latestVersion // { pname = "android-studio-dev"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8c7ff7b5eae6..9fbf4431f602 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "04iiw0qzl9025l4lasz42w5nfnvsmc7vwcf4a9c2hvl9xsyckajh"; + sha256 = "0h0kr4w26c6i89rb9y4aw4l8f63al42i2cy3ddk16m1irzij9fk4"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix new file mode 100644 index 000000000000..03c3c5d5eec6 --- /dev/null +++ b/pkgs/applications/editors/dit/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchurl, stdenv, coreutils, ncurses, lua }: + +stdenv.mkDerivation rec { + name = "dit-${version}"; + version = "0.4"; + + src = fetchurl { + url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz"; + sha256 = "0bwczbv7annbbpg7bgbsqd5kwypn81sza4v7v99fin94wwmcn784"; + }; + + buildInputs = [ coreutils ncurses lua ]; + + prePatch = '' + patchShebangs tools/GenHeaders + ''; + + # needs GNU tail for tail -r + postPatch = '' + substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)" + ''; + + meta = with stdenv.lib; { + description = "A console text editor for Unix that you already know how to use"; + homepage = https://hisham.hm/dit/; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 23e4449ee2eb..a26d380ec1df 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2 +, zlib, jdk, glib, gtk3, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk3 jdk libX11 libXrender libXtst makeWrapper zlib - ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; + ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' # Unpack tarball. @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index c69686a0967d..1688e606222d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas -, webkitgtk24x-gtk2 ? null # for internal web browser +, glib, gtk3, libXtst, jdk, gsettings-desktop-schemas +, webkitgtk ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage }: @@ -15,7 +15,7 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2 + jdk glib gtk3 libXtst gsettings-desktop-schemas webkitgtk makeWrapper; }; diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index a6611d2f167d..862739b4ed01 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "edbrowse-${version}"; - version = "3.7.2"; + version = "3.7.3"; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "CMB"; repo = "edbrowse"; rev = "v${version}"; - sha256 = "00wi0m91zf8p8wk4ixlz99dndgv4xqy93m2vsiwdr3khw3jwipp2"; + sha256 = "19qdxigp0qv5vyy0hpn0czcc8papvivsjrxx7p367ihizm39yzla"; }; meta = with stdenv.lib; { description = "Command Line Editor Browser"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 497836503933..958066e21066 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.1.0.tar"; - sha256 = "0iy5x61xqkxaph2hq64sg50l1c6yp6qhzppwadayxkdz00b46sas"; + url = "https://elpa.gnu.org/packages/auctex-12.1.1.tar"; + sha256 = "10l96569dy9pfp8bm64pndhk1skg65kqhsyllwfa0zvb7mjkm70l"; }; packageRequires = []; meta = { @@ -713,10 +713,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.4.3"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.4.3.tar"; - sha256 = "1xq0nhhgzgzrvxbb0lgpz71rfd0dcjakh87wg8wi3cpiw9w7zx41"; + url = "https://elpa.gnu.org/packages/ebdb-0.5.2.tar"; + sha256 = "09ff6kf74r6hg3m6lryrjr2rrczm9h702jpkap71xrj0fk4zfb5c"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -768,10 +768,10 @@ el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.6"; + version = "1.6.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.6.tar"; - sha256 = "18pv2l6rl8f9x0yjn4iyf6g94c0ly5mizqg0vxr3m420bkbyk95h"; + url = "https://elpa.gnu.org/packages/el-search-1.6.5.tar"; + sha256 = "1iw13ifyrga2r2xz63zhjxiy541jy4p2rp3a8fgb22sjw1zi8n7w"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -861,10 +861,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.17.tar"; - sha256 = "03vgrrrc1d3xr9ydl1ydvmqnvpnzg858dzdky2nd65h9ssyp2f5f"; + url = "https://elpa.gnu.org/packages/exwm-0.18.tar"; + sha256 = "1shz5bf4v4gg3arjaaldics5qkg3aiiaf3ngys8lb6qyxhcpvh6q"; }; packageRequires = [ xelb ]; meta = { @@ -931,10 +931,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.3.4"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.3.4.tar"; - sha256 = "0s03p0z5dqhigl01hzin2qy53nm7b4ilvfm83d0ca683i9rb7hx1"; + url = "https://elpa.gnu.org/packages/gited-0.4.3.tar"; + sha256 = "07sjrh7900v5gkjzac2hh05ygywp6k4803ikc3wj3x22yrc9l8bx"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1106,10 +1106,10 @@ }) {}; iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "iterators"; - version = "0.1"; + version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/iterators-0.1.el"; - sha256 = "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4"; + url = "https://elpa.gnu.org/packages/iterators-0.1.1.el"; + sha256 = "1r2cz2n6cr6wal5pqiqi5pn28pams639czgrvd60xcqmlr3li3g5"; }; packageRequires = [ emacs ]; meta = { @@ -1160,10 +1160,10 @@ js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "js2-mode"; - version = "20170721"; + version = "20180301"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar"; - sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni"; + url = "https://elpa.gnu.org/packages/js2-mode-20180301.tar"; + sha256 = "0kcs70iygbpaxs094q6agsjs56sz03jy4fwk178f9hr93x95pynx"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1423,14 +1423,29 @@ license = lib.licenses.free; }; }) {}; - multishell = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "mmm-mode"; + version = "0.5.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.6.tar"; + sha256 = "1vwsi8sk1i16dvz940c6q7i75023hrw07sc4cpmcz06rj8r68gr0"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; + license = lib.licenses.free; + }; + }) {}; + multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "multishell"; version = "1.1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar"; sha256 = "0g38p5biyxqkjdkmxlikvhkhkmafyy3ibd012q83skaf8fi4cv1y"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/multishell.html"; license = lib.licenses.free; @@ -1438,10 +1453,10 @@ }) {}; muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "muse"; - version = "3.20.1"; + version = "3.20.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/muse-3.20.1.tar"; - sha256 = "0h8lxm08r519psz93m1i43prkcpsm2dgkcvdlpvg7sm0ky7i5cay"; + url = "https://elpa.gnu.org/packages/muse-3.20.2.tar"; + sha256 = "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn"; }; packageRequires = []; meta = { @@ -1492,10 +1507,10 @@ nhexl-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nhexl-mode"; - version = "0.2"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-0.2.el"; - sha256 = "0qrzpkxxdwi2b3136yj5agvaxwr9g2c58kpmjmjpfhpc6yyyx5x0"; + url = "https://elpa.gnu.org/packages/nhexl-mode-0.5.el"; + sha256 = "02z2mx39m96s7v5d8sh6hxb5p70qzbagjfa3lavfw10zjim8g9wl"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1544,10 +1559,10 @@ }) {}; num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "num3-mode"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/num3-mode-1.2.el"; - sha256 = "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8"; + url = "https://elpa.gnu.org/packages/num3-mode-1.3.el"; + sha256 = "0x2jpnzvpbj03pbmhsny5gygh63c4dbl4g3k0cfs3vh4qmp2dg6w"; }; packageRequires = []; meta = { @@ -1595,6 +1610,19 @@ license = lib.licenses.free; }; }) {}; + org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "org"; + version = "9.1.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-9.1.10.tar"; + sha256 = "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/org.html"; + license = lib.licenses.free; + }; + }) {}; osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "osc"; version = "0.1"; @@ -1717,10 +1745,10 @@ python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; - version = "0.26"; + version = "0.26.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.26.el"; - sha256 = "197sq42xd4ryqq2zy1802pns6wf6n4vzx90yxgn1zzqpwffpv317"; + url = "https://elpa.gnu.org/packages/python-0.26.1.el"; + sha256 = "1dpw2w2nk6ggr8pz293qysjkiya3i7k25i447fbycjil59anzpb3"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1756,10 +1784,10 @@ }) {}; rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rainbow-mode"; - version = "0.13"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-0.13.el"; - sha256 = "1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.el"; + sha256 = "1mg9dbgvg79sphpic56d11mrjwx668xffx5z5jszc9fdl5b8ygml"; }; packageRequires = []; meta = { @@ -1809,10 +1837,10 @@ realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }: elpaBuild { pname = "realgud"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-1.4.4.tar"; - sha256 = "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c"; + url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar"; + sha256 = "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24"; }; packageRequires = [ cl-lib diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index f0d120dd8030..2277ebef4ff0 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,25 +2,25 @@ let modules = [ - { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; } - { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; } - { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; } - { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; } - { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; } - { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; } - { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; } - { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; } - { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; } - { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; } - { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; } - { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; } - { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; } + { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } + { name = "icicles-chg.el"; sha256 = "1kqlhisg5g9ycylzqiwxrmmgfw2jw599wisz26wvi48lac2icgg7"; } + { name = "icicles-cmd1.el"; sha256 = "17cpw798bl6p77cmjl7lwdnxa1qpw4z1wacjq2mdc8fh81cyw3am"; } + { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } + { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } + { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } + { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } + { name = "icicles-fn.el"; sha256 = "1sn56z5rjsvqsy3vs7af7yai0c0qdjvcxvwwc59rhswrbi6zlxz5"; } + { name = "icicles-mac.el"; sha256 = "1wyvqzlpq5n70mggqijb8f5r5q9y1hxxngp64sixy0xszy5d12dk"; } + { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } + { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } + { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } + { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; } ]; forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2017-10-28"; + version = "2018-04-16"; name = "icicles-${version}"; srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index c91812fc30a6..aec089f43dee 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -250,48 +250,6 @@ license = lib.licenses.free; }; }) {}; - ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake"; - version = "20140315.929"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake"; - rev = "f34c9e3ba8cb962e4708c8f53b623e1922500176"; - sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2257db76719cb1e3e2f79aff2b61073b655f9061/recipes/ac-cake"; - sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl"; - name = "ac-cake"; - }; - packageRequires = [ auto-complete cake ]; - meta = { - homepage = "https://melpa.org/#/ac-cake"; - license = lib.licenses.free; - }; - }) {}; - ac-cake2 = callPackage ({ auto-complete, cake2, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake2"; - version = "20140320.8"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake2"; - rev = "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a"; - sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b8b728c2caed96d7505cafc42d0d7ed49d6cadcd/recipes/ac-cake2"; - sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy"; - name = "ac-cake2"; - }; - packageRequires = [ auto-complete cake2 ]; - meta = { - homepage = "https://melpa.org/#/ac-cake2"; - license = lib.licenses.free; - }; - }) {}; ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-capf"; @@ -337,12 +295,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20171209.240"; + version = "20180318.1124"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "f11f17382646e13a0c794821ed5efe1692f96652"; - sha256 = "0ynl5fvsamij5ji2cnxp4vbqwbw09c8x8fxx3s80v02yi3xi5fr0"; + rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7"; + sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -715,12 +673,12 @@ ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-octave"; - version = "20171122.943"; + version = "20180405.2034"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138"; - sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4"; + rev = "fe0f931f2024f43de3c4fff4b1ace672413adeae"; + sha256 = "1yj5fapbp79k88k1cxrmmf91fb0j6s4s7f2dhk2afcf7z83mqkwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; @@ -740,8 +698,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c"; - sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y"; + rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; + sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +715,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20180314.2055"; + version = "20180323.503"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c"; - sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y"; + rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; + sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +761,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "4310b26e69dd9569582962d0013ebc8c372730e5"; - sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -880,6 +838,27 @@ license = lib.licenses.free; }; }) {}; + academic-phrases = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "academic-phrases"; + version = "20180318.438"; + src = fetchFromGitHub { + owner = "nashamri"; + repo = "academic-phrases"; + rev = "0823ed8c24b26c32f909b896a469833ec4d7b656"; + sha256 = "0qfzsq8jh05w4zkr0cvq3i1hdn97bq344vcqjg46sib26x3wpz6r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe4323043fb875c0252861800e61fdd0a51ed453/recipes/academic-phrases"; + sha256 = "18y6lff7xwg6hczwgavwp32848gnlmc30afra9x7m8wmdddps1bh"; + name = "academic-phrases"; + }; + packageRequires = [ dash emacs ht s ]; + meta = { + homepage = "https://melpa.org/#/academic-phrases"; + license = lib.licenses.free; + }; + }) {}; ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-flyspell"; @@ -1447,12 +1426,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20170623.958"; + version = "20180410.2106"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e"; - sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78"; + rev = "8b528fbae0e557461315bed82883275d58df41f2"; + sha256 = "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1531,12 +1510,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20180312.1338"; + version = "20180322.1408"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "69045201a8597181509c71c770d0fbce398f0af5"; - sha256 = "0qmrd9csa3w8a0nkrc8f4a3f67inj7hpbdwsk0883dnc7lq4lkjn"; + rev = "f61eec647abd9981139c720811e1c4e2501f250c"; + sha256 = "0hfhk2bnhml2sc1i7i4py06x9sph1g7qa50x6bffkxx92ry4wvl0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1552,12 +1531,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20180122.1242"; + version = "20180403.38"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "103d34c83fe77e46a6976dcaba3db678199e0c9c"; - sha256 = "1nbk768d8iqjf1mx956497hbjfxar144h3m3sd298byc54z8bvmf"; + rev = "667d9c7848c723eb392ab9bacae07966da3e3504"; + sha256 = "04nrl7kg5pprfdxjbqjyh7vw0vs22bplhhpaf30v3hw7k7nkc0ky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -2209,194 +2188,6 @@ license = lib.licenses.free; }; }) {}; - anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything"; - version = "20170125.1710"; - src = fetchgit { - url = "http://repo.or.cz/r/anything-config.git"; - rev = "9e2259fc779eef1a3e947e74cc7d301d1cea0ca6"; - sha256 = "1rl60k9imk5wma2xnx1s0av7rzgjjbaw7nkb539vwk4pwj1kmqqq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; - sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj"; - name = "anything"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/anything"; - license = lib.licenses.free; - }; - }) {}; - anything-exuberant-ctags = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-exuberant-ctags"; - version = "20140316.1637"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-exuberant-ctags"; - rev = "8ed688fd526751e044435bb77135f5315c8167e5"; - sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66cae648d534468e5e9f125679847fb876935f68/recipes/anything-exuberant-ctags"; - sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk"; - name = "anything-exuberant-ctags"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-exuberant-ctags"; - license = lib.licenses.free; - }; - }) {}; - anything-git-files = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-git-files"; - version = "20130609.243"; - src = fetchFromGitHub { - owner = "tarao"; - repo = "anything-git-files-el"; - rev = "efeec4f8001e2a95f36a9c31181bb30f7561015c"; - sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7f69f8362790ef4a9200f99a8f7ac3770b402b97/recipes/anything-git-files"; - sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw"; - name = "anything-git-files"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-git-files"; - license = lib.licenses.free; - }; - }) {}; - anything-git-grep = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-git-grep"; - version = "20130608.1940"; - src = fetchFromGitHub { - owner = "mechairoi"; - repo = "anything-git-grep"; - rev = "6ee26e68bb8ec23ffacf5c5f9698c451a4bc905c"; - sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/784a04ab60ef0862105d2bec309994d3a755c043/recipes/anything-git-grep"; - sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl"; - name = "anything-git-grep"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-git-grep"; - license = lib.licenses.free; - }; - }) {}; - anything-milkode = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, milkode }: - melpaBuild { - pname = "anything-milkode"; - version = "20140518.743"; - src = fetchFromGitHub { - owner = "ongaeshi"; - repo = "anything-milkode"; - rev = "d6b2be13a351c41793e9cc13c1320953939d3ac9"; - sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/124d55605500c30ca7b01ae31eec3f3da51a2c7e/recipes/anything-milkode"; - sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan"; - name = "anything-milkode"; - }; - packageRequires = [ anything milkode ]; - meta = { - homepage = "https://melpa.org/#/anything-milkode"; - license = lib.licenses.free; - }; - }) {}; - anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }: - melpaBuild { - pname = "anything-prosjekt"; - version = "20140129.4"; - src = fetchFromGitHub { - owner = "abingham"; - repo = "prosjekt"; - rev = "a864a8be5842223043702395f311e3350c28e9db"; - sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/anything-prosjekt"; - sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8"; - name = "anything-prosjekt"; - }; - packageRequires = [ anything prosjekt ]; - meta = { - homepage = "https://melpa.org/#/anything-prosjekt"; - license = lib.licenses.free; - }; - }) {}; - anything-replace-string = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-replace-string"; - version = "20140317.336"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-replace-string"; - rev = "1962f24243d6013bcef7e8d23136277d42e13130"; - sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39b7f3a8de2f7728b374c09a1387beb3f7595d2e/recipes/anything-replace-string"; - sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71"; - name = "anything-replace-string"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-replace-string"; - license = lib.licenses.free; - }; - }) {}; - anything-sage = callPackage ({ anything, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: - melpaBuild { - pname = "anything-sage"; - version = "20141005.413"; - src = fetchFromGitHub { - owner = "stakemori"; - repo = "anything-sage"; - rev = "370b4248935dd4527127954788a028399644f578"; - sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/07be4b11bbddb376e11616525e7b226c5a9f2296/recipes/anything-sage"; - sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3"; - name = "anything-sage"; - }; - packageRequires = [ anything cl-lib sage-shell-mode ]; - meta = { - homepage = "https://melpa.org/#/anything-sage"; - license = lib.licenses.free; - }; - }) {}; - anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-tramp"; - version = "20180311.2344"; - src = fetchFromGitHub { - owner = "masasam"; - repo = "emacs-anything-tramp"; - rev = "9b88be0c58843569dcb016550e6fad4f75847fc5"; - sha256 = "18016zgdqa7i0vaqj9j3zkdw2i3iw8i2axyrm0579hq4hksx69w0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; - sha256 = "053bi7b6d9aa6xwsgm0yxbklbs5sl3dgi529gsapj30lw68lh1vh"; - name = "anything-tramp"; - }; - packageRequires = [ anything emacs ]; - meta = { - homepage = "https://melpa.org/#/anything-tramp"; - license = lib.licenses.free; - }; - }) {}; anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; @@ -2505,12 +2296,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20180201.637"; + version = "20180318.1515"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "44fe79d56bafaaf3a688e5441298ec5f7bbf419e"; - sha256 = "12i39kl4fj1xhzrdw24i4mi2m3aj2w3isxpcyr48z23d1x0grviq"; + rev = "d80ae8d80520786dd5527e53c0a9374534168d41"; + sha256 = "0v2bnndrhvdkk5qa3rzzdl83471i00s0cxbvrsl8ijcm6xpc0m1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2882,12 +2673,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20180119.533"; + version = "20180408.844"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "7279cc6bdba7bfcb53ca8f5471631ae8dc3918b3"; - sha256 = "1nmi2ykwbswj6qv2s38518nijmlhjd2jvhabybqs8smc152g58sw"; + rev = "8bb64e398897d1cc000fc295c5157b4ad1a7bd5b"; + sha256 = "04384akcxirvfcl5rb07hj5xaw2crsgnhbnwyh1dkmy56qak60a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2987,12 +2778,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20171116.2332"; + version = "20180322.301"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "7dd8a45ebccb9b5bbbfd2e822bd914b38dad6008"; - sha256 = "0nbhw43c7jrpx7iyyjp3fdzprccj549d6k1kd3wgym83qljf236d"; + rev = "d6577d61981a8bf293928eddaa6b83d22d59bd8c"; + sha256 = "0qi5g5js885hp0xkwib12zbz84sganb8lnrps48097zlkcxppm3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3131,24 +2922,24 @@ license = lib.licenses.free; }; }) {}; - auth-password-store = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auth-password-store"; - version = "20180222.916"; + pname = "auth-source-pass"; + version = "20180326.8"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "0a83b8fa074571023a10aed263d2ee7d865a49f7"; - sha256 = "0z4pk614ndjg68z70lbc20ns9kv8r3vdayv4yy6n0jj9fvnd2pn8"; + rev = "5690092e40c790384692d8e8da3451e6878d8c17"; + sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; - sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5"; - name = "auth-password-store"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; + sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak"; + name = "auth-source-pass"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/auth-password-store"; + homepage = "https://melpa.org/#/auth-source-pass"; license = lib.licenses.free; }; }) {}; @@ -3197,12 +2988,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20180111.436"; + version = "20180321.807"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "8d117868a0a091389d528428136e60f951e9c550"; - sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; + rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f"; + sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -3554,12 +3345,12 @@ auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170917.1437"; + version = "20180401.245"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "07ea9df59c5364d1938beef3dfbba24afd46c230"; - sha256 = "007w6j6zhjv2647njh80vfbrhjzhmb8rx9yi9rf94fhf17z8pmk3"; + rev = "c0aa31d9385ec809969288d0029c7a6db319690f"; + sha256 = "0fzw91d1ysv82g2mfwc5f1a1zq1ih9f6i26hk9jyyqp5izx9ydfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -3596,12 +3387,12 @@ auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; - version = "20170803.1005"; + version = "20180323.1547"; src = fetchFromGitHub { owner = "rranelli"; repo = "auto-package-update.el"; - rev = "0b296970d09d7deb7f780cb041fcbc313d39aa5d"; - sha256 = "1nicx2sjnmf3i7dlzi788rh2kjc7mj9q69knp3g2x72zxqy8x07d"; + rev = "85c64d11ccfffd58527ef39cac390a88c5b6d979"; + sha256 = "0pg9qw63ii4268hwzz7sj9g6rkmxr956849fpa2rwbfzfhjmns2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update"; @@ -3743,12 +3534,12 @@ auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170916.1304"; + version = "20180408.310"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92"; - sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8"; + rev = "e2628408d4e67e1b1714cf7682cff9405e735c81"; + sha256 = "1cj4a6yay02gvi04lyhnfb7gws8jrappprnv36mcqlq053202wij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -3995,12 +3786,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20180205.2254"; + version = "20180406.2220"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "1a119d0b52f0755fa14ad4d8c6e00e2e720b7732"; - sha256 = "1im1bvrcy9163414328yfmsz2hb0whqxnd6wpmh8hvh6vpbmwaj7"; + rev = "6abf91ecdaeb16a3a5529b0d5abef9756da1f68c"; + sha256 = "0hvg8yp7prfl1n71lkyr9l43f3zm1zsh8n2mh26rmdw2chippr4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; @@ -4016,12 +3807,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20171230.220"; + version = "20180415.1259"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "34d3531a3cd35ae6b9e8dbc37343c027504fdcb0"; - sha256 = "0rgwbm5jcbv132xldbz2kcp09c7hs96329mwfa019v99qdbb5k32"; + rev = "08370cdbc35ff41646461a02d6d9758dfce30c20"; + sha256 = "08pgyj3mab6iqbb029wixvvjfc634iln0ij6lxnvpvgy4298iw9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4142,12 +3933,12 @@ aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "aws-snippets"; - version = "20180213.835"; + version = "20180410.845"; src = fetchFromGitHub { owner = "baron42bba"; repo = "aws-snippets"; - rev = "619c9a401f873042e45547e8cf57f23d0c8947e4"; - sha256 = "19yrdsn76vscqgxmapxn3gv6nrxp7i20p37anylmjss3xkvblxn9"; + rev = "a2ebae582a8c8a5f5f16dbc42ecd2ded9d70fca8"; + sha256 = "08mbi5g321n4ir7a7ggxmh7qpl8pr06pg4rcsk8pklylvkf89k2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; @@ -4163,11 +3954,11 @@ axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20171111.1152"; + version = "20180401.1257"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; - rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; - sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; + rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; + sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment"; @@ -4355,6 +4146,27 @@ license = lib.licenses.free; }; }) {}; + banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "banner-comment"; + version = "20180403.1438"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52"; + sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "banner-comment"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bar-cursor"; @@ -4400,12 +4212,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20180308.1227"; + version = "20180320.2254"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "f84ffb4d4065068f89a416f84002de92a39da1f1"; - sha256 = "06hkpf6azjii9iiqvv3sh0vn7qczsjim9y1mk4vq3hp799ca67wh"; + rev = "69a96c1061d1d783a44f70fd811d49541762caf9"; + sha256 = "1mg158w81vivar7lrya8qk46zghs2b7inmdckjcs8qw7w078cwav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4544,22 +4356,22 @@ license = lib.licenses.free; }; }) {}; - bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + bbcode-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbcode-mode"; - version = "20180316.519"; + version = "20180326.1410"; src = fetchFromGitHub { owner = "lassik"; repo = "bbcode-mode"; - rev = "653cf811460f60cb8c9489cfb3155c6493828d9f"; - sha256 = "120g480vys6wrxhcch87jsxxvqwi31wi3dv1dckcqbxd1w1jfkzm"; + rev = "4a6df9eff9da9cb98d53164a585f2c69d8399e3a"; + sha256 = "1gzx7s96fd6r9xgzp29d1w102rxkyr1mywhyvzcdslszbcrjc0r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; name = "bbcode-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/bbcode-mode"; license = lib.licenses.free; @@ -4567,11 +4379,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20180106.910"; + version = "20180330.2018"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "f18720ff5cd963a0bf6fc0e41293e50c0172b8ae"; - sha256 = "1s5qi8njiqdpgnzlik36islzh13zfhybnynqisr61p602pn4ghk7"; + rev = "e0eff7e1ee5003f7c557a83d655a7fc0b6b45fcc"; + sha256 = "0qalxasfckqqgngsafplrp9j1pcism17bn0h53qs8pfj9gxkng5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4755,12 +4567,12 @@ beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "beeminder"; - version = "20160209.1903"; + version = "20180413.1229"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "a4e159250bac89bc25ced8523a5eac2a951cd5b6"; - sha256 = "0ki9q3ylssjabh15dr49k7dxv88snpj4564g0myp3c61qzyy82lk"; + rev = "3fcee7a7003a37171ddb59171c7f4b5dd4b34349"; + sha256 = "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; @@ -4986,12 +4798,12 @@ bibliothek = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pdf-tools }: melpaBuild { pname = "bibliothek"; - version = "20180122.2021"; + version = "20180327.1422"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "3059378379a6fbd0363cd14fe6227c27739af4e1"; - sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; @@ -5116,8 +4928,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182"; - sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; @@ -5137,8 +4949,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182"; - sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5238,12 +5050,12 @@ bitbake = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, s }: melpaBuild { pname = "bitbake"; - version = "20160613.156"; + version = "20180326.58"; src = fetchFromGitHub { owner = "canatella"; repo = "bitbake-el"; - rev = "4d9f0a4ffb7b9c6cd4d8271f1b429ca1bb7e9130"; - sha256 = "0c8f6w8pgbr63g1zhgppfyh5g3sb0iv31ywqmvp6467766di4qh9"; + rev = "e5088c4b3dfb4feb96850fbc281b4207d23c7713"; + sha256 = "0x765j9vks8r34kkqr9chlfy7dng71rciighk12fgiksqsl82qb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake"; @@ -5340,6 +5152,27 @@ license = lib.licenses.free; }; }) {}; + blacken = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "blacken"; + version = "20180402.435"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "blacken"; + rev = "528527c832710aa1ceeb4c42ef85b5a37d2e213a"; + sha256 = "1my234bsv5db99hhr66n2yhh3knvv4xwg7q05y408qbhrcf3ya5l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken"; + sha256 = "16lbs76jkhcq0vg09x1n8mrd4pgz5bdjsprr9260xr7g3dx8xacc"; + name = "blacken"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/blacken"; + license = lib.licenses.free; + }; + }) {}; blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blgrep"; @@ -5487,22 +5320,22 @@ license = lib.licenses.free; }; }) {}; - bmx-mode = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + bmx-mode = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "bmx-mode"; - version = "20180226.256"; + version = "20180324.857"; src = fetchFromGitHub { owner = "josteink"; repo = "bmx-mode"; - rev = "2093e7041006aa8c142c151bb597af061419aa43"; - sha256 = "12h8h44ni8g6nzh9i2h9w4lmvkca3fxp8cybikln7x4hcnplkfj5"; + rev = "7450c29f5c1f5f67b02bca1c89f06cdf01855f41"; + sha256 = "0knxsmlp1agfs5sj5iz13b8igjx4gpk1lj36wzh1rdiwcxicnr49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode"; sha256 = "04g8l4cw20k3yhbija9mz1l4nx3bzhzj7nb35s0xdyvwbc2mhrwb"; name = "bmx-mode"; }; - packageRequires = [ cl-lib company dash s ]; + packageRequires = [ cl-lib company dash emacs s ]; meta = { homepage = "https://melpa.org/#/bmx-mode"; license = lib.licenses.free; @@ -5658,12 +5491,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20180108.41"; + version = "20180319.526"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "836f25c5baa363691a8d31712d07248c0d9a49a7"; - sha256 = "1jh6c6i1jy1f8hskqbpqj2babk9yvqyjxyxy0x11686riasc5vps"; + rev = "b4cf42bbc531032404da88e8671c7495f0f7a5b0"; + sha256 = "163j41j29nm29w567iq662k9anivqc20yxghm8w49w7i5hsbq9dh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5679,12 +5512,12 @@ borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "borg"; - version = "20180307.717"; + version = "20180325.1457"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "6b49136f37a04c5f0c328a83bb512b86f6159d6f"; - sha256 = "1nlxdapxqdikqicyp0mq394xs7cbdkyzfw2yx1h5qww33mjl4jja"; + rev = "b03e8d19874809e813c9631d29260bac73f51e01"; + sha256 = "15djx2c0agpmmy5ls61p0hwnv2plvb8k190xrrj925w9ypg2qp92"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; @@ -6438,8 +6271,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "8d27bb99463bc230a76dee96378dd337622988f5"; - sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh"; + rev = "4106adc5051965a3d066dfb5594e3d3ba0303b3f"; + sha256 = "01pvga1b54p7l9fjj388hdvjkmmp2gf5la7l74xjaxfk7v5rrifv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6599,27 +6432,6 @@ license = lib.licenses.free; }; }) {}; - cake = callPackage ({ anything, cake-inflector, fetchFromGitHub, fetchurl, historyf, lib, melpaBuild }: - melpaBuild { - pname = "cake"; - version = "20140603.2131"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake"; - rev = "a7c9f3bee71eb3865060123d4d98e5397c2f967e"; - sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/86ed5054ee2392a0e384443c945a5d4824238e95/recipes/cake"; - sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr"; - name = "cake"; - }; - packageRequires = [ anything cake-inflector historyf ]; - meta = { - homepage = "https://melpa.org/#/cake"; - license = lib.licenses.free; - }; - }) {}; cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cake-inflector"; @@ -6641,27 +6453,6 @@ license = lib.licenses.free; }; }) {}; - cake2 = callPackage ({ anything, cake-inflector, dash, f, fetchFromGitHub, fetchurl, historyf, ht, json ? null, lib, melpaBuild, s }: - melpaBuild { - pname = "cake2"; - version = "20140626.542"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake2"; - rev = "caffb646c86333b8747cefeba070d57ac4fbaf00"; - sha256 = "14q5hny3bdwcaq3ls6jlk8np4hf99jksxz84dhm2rdvnm18b1wk3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/18e38d9cdb9f1a8cc05545c52c3a76265a9aa2ab/recipes/cake2"; - sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x"; - name = "cake2"; - }; - packageRequires = [ anything cake-inflector dash f historyf ht json s ]; - meta = { - homepage = "https://melpa.org/#/cake2"; - license = lib.licenses.free; - }; - }) {}; cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cakecrumbs"; @@ -6854,12 +6645,12 @@ call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: melpaBuild { pname = "call-graph"; - version = "20180309.220"; + version = "20180403.2002"; src = fetchFromGitHub { owner = "beacoder"; repo = "call-graph"; - rev = "1c23b22b9e1a5e6484e5dfc2f4724e964ba64dc4"; - sha256 = "1mwxxn3m5jrpa9kwm4sg0famzgxqhqgzwd93nlidkbv1vjhj2gdi"; + rev = "31bfac00f33b8494fcf6c18a210dd7ed4b81a21d"; + sha256 = "00ajq1xkm9hmk92vrnvmgkrs65jlx1rl1hxghf9id4gx09yy011s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; @@ -6921,8 +6712,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "02326ad0f4d0d964be89434b9b43c4f19237ea35"; - sha256 = "09v1lasgnlv01cl1ayah183da90pcwn08fhwq0b36wk54ksymhyx"; + rev = "fe9a5215948b3636161262b275eca8b98ff1967b"; + sha256 = "1nkqrbx86j2mj0jsap12jfihpw5lnrsxy711qn4g8n3abng4lnza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7319,8 +7110,8 @@ src = fetchFromGitHub { owner = "andre-r"; repo = "centered-cursor-mode.el"; - rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8"; - sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i"; + rev = "00fb47d227f9e211ec1c58161a501a1550c3a60d"; + sha256 = "0yd78k28dp139a889q5nh8fdbc59jl227anasg5695bz8bkzavd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; @@ -7340,8 +7131,8 @@ src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; - rev = "56cb4a9ebc9a3bac7e00b4d5662dca4c39fdbb50"; - sha256 = "067pdyzdl193pjyia8lc69s5p069kpwsrar2y221lmcvs4s164wv"; + rev = "24f7c5be9def20879f46659082d497e67b55d7af"; + sha256 = "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window"; @@ -7424,8 +7215,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "03ccbd8a38eef55f0801c249fc278700c52d31ed"; - sha256 = "0ly4igpqdafmnijdlqzcrs4g4snmrp854j8vykvx7sn2wil5l9f0"; + rev = "bb460ccf2348873b7a84e99930feb038d0f9a95b"; + sha256 = "1wgf2lpcpplxdabz0xbzq9j5va5zhxl22ns63d4jj7v86a77cg2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -8029,12 +7820,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180315.950"; + version = "20180413.51"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "0ca04ebceeabda645dd9bc584b4683fe3b2ea317"; - sha256 = "0fxd77cls2g5iq1r09zgf7iqznldbyi3y989wh27sjzqnjdw8k7j"; + rev = "a01115242ba839465e16892383133c21c350d5bd"; + sha256 = "1b0p7dnrcgnjma4yk6fc3v21sxaz772wrc780sd5faa833z8wg16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8222,8 +8013,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd"; - sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl"; + rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6"; + sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8257,6 +8048,27 @@ license = lib.licenses.free; }; }) {}; + citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }: + melpaBuild { + pname = "citeproc"; + version = "20180325.2358"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "b15e3cadbcbbe777b809a32859e341e2ef212c13"; + sha256 = "1axl3b31ylp8y2vsf853j8d8wb1wsizwi605qfxj5aj8xafbgbb5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "citeproc"; + }; + packageRequires = [ dash emacs f queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; @@ -8512,12 +8324,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20180316.1000"; + version = "20180411.43"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "2648558b4c27fccbd71ca679ff4bf9b9150c6c60"; - sha256 = "1kfs1y3cwazz118ll18hyvw4wdms4byzj3z9i7kriys46lsgd05y"; + rev = "adffc6a4c61a9555744634598b47631760e91488"; + sha256 = "19bi7pnsyqaahwsy6gr55k8kgjfimrjn3lriyzjh7jkhfsmm77bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8692,12 +8504,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20180313.620"; + version = "20180329.2109"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23"; - sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i"; + rev = "58e909365c89a4e31b5f6c790f261be788cac409"; + sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8717,8 +8529,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23"; - sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i"; + rev = "58e909365c89a4e31b5f6c790f261be788cac409"; + sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8797,12 +8609,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20171219.524"; + version = "20180318.1222"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d"; - sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si"; + rev = "bfd5a5e4d32bc00e439c86f42859964d4fa91dc3"; + sha256 = "1ivdlabnkm5dsdjpi68mgvvif5bg8pc2igjyr2jrkwl7jnz51dz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8923,12 +8735,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20180314.1546"; + version = "20180413.329"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "4fe0a65235c3202ab6a5a6c72c91e20b43f9dd65"; - sha256 = "0c8xcrjgyk86zk18sqbknlihwblj53h4xjjdhrf26gp28j6hrbf4"; + rev = "3d4da16226e8d4e53613feeebb5e21e6a7defed5"; + sha256 = "1d0nxqhx6ssld92wlv8c40m655zpf622a0ns4v78397nfm135khq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8948,8 +8760,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "c824b6c667cdcb978d6ed52ca5d19fd0b6bfde27"; - sha256 = "0p2y9y2f238pns1az6ig204lj5cqq4ala0am6dc8sdidlf8m1x1z"; + rev = "ccd17a557cbf8ada18207a72eea78d2adcc9d752"; + sha256 = "1i85zb5j3ckn5b9xybczf6k42vpwsyq3xyzzarq3w775iyjlnkfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9284,8 +9096,8 @@ src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "e9705815cc547293fbb1c5cdac5ba90391a82878"; - sha256 = "10cqkn4y40qwzkv9vsa5zlsqh851xacjvccw4l34piasbvm7q0hy"; + rev = "2407ddea7873f55216d9512ca2fb5eef268d5eba"; + sha256 = "0zah7w0dhgzwlgspvlb3gzsg6d2dqpxnmqm1kjjjdh3y0qimmy0g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; @@ -9431,8 +9243,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "1d67e4a4da74323f42c1f70c8bb7dbb9feaaf4e6"; - sha256 = "0pywpvp1ak4qp98z81qwxdd67yz8sbk8n41hv454y7jnrwxjm0w5"; + rev = "6be4fea186f2865d6d027eade7d4a15d35e9a88b"; + sha256 = "1lil6n0fd3d8wajdr8qzgw5np1v3nzympsjrn3dk7zwwdf8b1zk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9721,12 +9533,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180315.439"; + version = "20180415.2135"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "67650dee565c57568d22065041326a58eb0f891d"; - sha256 = "1307v1b1dk0m95ds69b66jrpapz06mwq15awmyk6vf54h9hpbm6q"; + rev = "46680da66a3ba70c7b2371832f8b8d9734dec554"; + sha256 = "03q76dvjka0xw91gzin848virwpm9dv71y3y2p3m168y7chk4g7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9763,12 +9575,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20170430.53"; + version = "20180401.640"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "2c30c3bdb8316b27d5c1832b944cb146d00de456"; - sha256 = "183hyy5vy7xs6hwsk8nrylck8w5czcqwzfx0wik4ppx8011jzis1"; + rev = "42753d43333c6e4ad83797f0234149b76b463369"; + sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -9813,12 +9625,12 @@ company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-auctex"; - version = "20180226.2248"; + version = "20180330.1118"; src = fetchFromGitHub { owner = "alexeyr"; repo = "company-auctex"; - rev = "d98ac778658ce242e70bc30f1350a93582473bd6"; - sha256 = "0jfy96xyhsvpvwn467aq9fchz1wnyqrmr35mz4i76lykirsb93aa"; + rev = "f24de90a14c46fc3b924875c658b319c7f209aff"; + sha256 = "0izi2p8whif6nlbippjw0zxkd0zilmgj2n0arx6k0zi7k4vbfsb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex"; @@ -9837,8 +9649,8 @@ version = "20171024.1310"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; - rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; - sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; + rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; + sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/company-axiom"; @@ -9872,6 +9684,27 @@ license = lib.licenses.free; }; }) {}; + company-box = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-box"; + version = "20180413.1651"; + src = fetchFromGitHub { + owner = "sebastiencs"; + repo = "company-box"; + rev = "a27b632c1bb92de3415cea08c7885f3dc9ce30eb"; + sha256 = "1p71yalry5linxdb5xiyig8wlb9nw0c5nmlkdxc1l0gyhr8lrzci"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a54879f4dd4dcb6867680567731547d604ad02bb/recipes/company-box"; + sha256 = "0v39gja3jp8b2xfn9da93xsh8mihizwbg0gqp2yyczaxjm8ga23i"; + name = "company-box"; + }; + packageRequires = [ company dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/company-box"; + license = lib.licenses.free; + }; + }) {}; company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-c-headers"; @@ -10222,8 +10055,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "416643789f088aa5077f667cecde7f966131f6be"; - sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm"; + rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef"; + sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10474,8 +10307,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c"; - sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y"; + rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; + sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10516,8 +10349,8 @@ src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad"; + sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/company-pollen"; @@ -10554,12 +10387,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20170429.1052"; + version = "20180323.1200"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "c42610040ccfaacd8040f47c5e1c629a18987614"; - sha256 = "0j1fqyi97imv1zp0w0y51j2svs494r2bdi2q9jm11b9bdi3jmf7d"; + rev = "1580b107ebecb98cf5c21a5b7185d4bfe761047d"; + sha256 = "0d237si89c4r325zirqvivq5k9b59hyahnfjlgc3fy9cnr07xqg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -10627,8 +10460,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "4310b26e69dd9569582962d0013ebc8c372730e5"; - sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10662,22 +10495,22 @@ license = lib.licenses.free; }; }) {}; - company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, solidity-mode }: melpaBuild { pname = "company-solidity"; - version = "20180221.1330"; + version = "20180407.1344"; src = fetchFromGitHub { owner = "ssmolkin1"; repo = "company-solidity"; - rev = "9a57a4ff4cad1d423429c78457cd05c38826801c"; - sha256 = "1v9h85vb6lqjlb5w9g2i042zb3w3y916in7h8jph2b74187a9nl6"; + rev = "32bfe4c8fe282c30ebf4f5cf1f9285f151c8e6d4"; + sha256 = "0qgvxpij5zwwvdqzi2yf2f52vgmky4xwz9v4smrkcx29k88ivlg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6"; name = "company-solidity"; }; - packageRequires = [ cl-lib company ]; + packageRequires = [ cl-lib company solidity-mode ]; meta = { homepage = "https://melpa.org/#/company-solidity"; license = lib.licenses.free; @@ -10725,6 +10558,27 @@ license = lib.licenses.free; }; }) {}; + company-suggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-suggest"; + version = "20180325.931"; + src = fetchFromGitHub { + owner = "juergenhoetzel"; + repo = "company-suggest"; + rev = "e1679bd2cff0396bda0eba7dc48469332bd54251"; + sha256 = "00cy1lhnlwz99zmxhk7403qq4wi8abk483syw5z1xvhdx1fxgq04"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9579e3366db055364829e20d3ce228bf17060b0a/recipes/company-suggest"; + sha256 = "1w5fp4mydc4av14sjb8di6jjvzfqwnasnxpf9720pk0rsj05i972"; + name = "company-suggest"; + }; + packageRequires = [ company emacs ]; + meta = { + homepage = "https://melpa.org/#/company-suggest"; + license = lib.licenses.free; + }; + }) {}; company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }: melpaBuild { pname = "company-tern"; @@ -10791,12 +10645,12 @@ company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; - version = "20171111.1049"; + version = "20180402.455"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; @@ -10875,12 +10729,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }: melpaBuild { pname = "composer"; - version = "20180111.942"; + version = "20180415.743"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "e34ebe795d267e28965c85bd84cbb16b18165bd8"; - sha256 = "1vqjraldl2an10q1w91l7rx66mpsvqvjgg3j1k7xcvw07570aabl"; + rev = "1d43edd8079e84df5e1b46c65e6783cb3ff9debd"; + sha256 = "0k6345mc2ppckbbmji4wkynlfgy00kr945ah8j2b62hqgm73h575"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; @@ -11295,12 +11149,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180308.1121"; + version = "20180415.905"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774"; - sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11379,12 +11233,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20180304.58"; + version = "20180324.2005"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "e97902f9947c663372698affd1577a8d23876561"; - sha256 = "1i0gb11x70nj4zp6mdqc91nd9812wsbfkpg94fssgwyqa0dqkb29"; + rev = "267c071724fcc665359f2f4472392507facaab2c"; + sha256 = "0039l9pdndl0y06xjvxpgcc71kqpwhny2lhy5a68p6n1ndi958z9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -11505,12 +11359,12 @@ counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-spotify"; - version = "20170612.1132"; + version = "20180319.2022"; src = fetchFromGitHub { owner = "Lautaro-Garcia"; repo = "counsel-spotify"; - rev = "dba8c1bf92e15f34f12a9e22b5958a93f10b46c5"; - sha256 = "1j7rzf8mws2yzdvfz8a6k48b5x6cn11lfvfya5s4c90kyy92j8ag"; + rev = "9033e207dccdfea7fe590d2e102d50fcd2bd22e3"; + sha256 = "00mjcp3x558gh7f8yrj8y4ivq3pvml7y46rms8xah5zxavg6q52b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify"; @@ -11565,22 +11419,22 @@ license = lib.licenses.free; }; }) {}; - cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cov = callPackage ({ elquery, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; - version = "20170405.1508"; + version = "20180415.1331"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; - sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; + rev = "e6731ddf16be343a24449cf7dca92f382c8a831b"; + sha256 = "09p61ni7vkwl679ysl9aibw0b7qi5v9vpgvg08vj00fp5a82rzsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; sha256 = "02wk8ikanl5lcwqb9wqc8xx5vwzhn2hpqpxdchg5mdi7fifa1rni"; name = "cov"; }; - packageRequires = [ emacs f s ]; + packageRequires = [ elquery emacs f s ]; meta = { homepage = "https://melpa.org/#/cov"; license = lib.licenses.free; @@ -11715,12 +11569,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180314.2158"; + version = "20180413.938"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "f38c4b996877b5a0f5f7619bf46b268b64ef4e3c"; - sha256 = "06s4qjwj9ikbxip84kjvs7yzdax19bp56hikzlmayzg6idbn9ld2"; + rev = "7f48de485c5f4ca0d55b93307763889ce2d7c5c4"; + sha256 = "1cb41f0can8mslg80v1np5wvq9c0vl0px5mgy0zyzhajf9zqszgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -11904,12 +11758,12 @@ cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cryptol-mode"; - version = "20180118.535"; + version = "20180321.1108"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "dcc9498813a77ffb83010032e0e5a540f00f3d33"; - sha256 = "0w73i9a6qpab2h58mblhcjqs7xcyr9vpx9mczj3sxzygb2lhzwxw"; + rev = "91f8ad617e5db2fad57a7be1da211f22f3b51550"; + sha256 = "12jd2wc5icnkbvxjam7kgr8bdjavxjsy79vwi0hi3gzwiirx4ifg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; @@ -11988,12 +11842,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20171211.2238"; + version = "20180315.203"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "ba7a81a85ee5fd234f24333ab156ce897cb20cc7"; - sha256 = "1jb0aq0fs1l3djb0cjfk0b2igvdd06l8lz0g94f63p324jn8rl62"; + rev = "79e0a606f60a2620631623285dbbbd8591cbd2f8"; + sha256 = "1h36ns0kcz8p7nafczdyz1bvbz8fp3ci72c7ikyl703kkyqpk0px"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -12223,8 +12077,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "7f3c7a7cfe60f98da46e6958bec62bac4675ccd2"; - sha256 = "096523m3spfqw72zp2rzcf1b54997yzs7qxwvr3awhicah1z6mv0"; + rev = "bf8253f482917e390fe8b44ceaf308405afeefc6"; + sha256 = "1ff4gq1bjm0j1wi58lsv5fazkjcq4ay01n4k55nhd34pgk0rbnv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -12475,8 +12329,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "93843b9469d164a7e98962f8f0645b93b2f7442f"; - sha256 = "1n9g9h3pn09mfbwlq2grqjxmwhrm34wkchshhpbswngbpc0m10gk"; + rev = "29961acc1c64710127a5191af6c039cb1fa22203"; + sha256 = "00qwi8frmhas5qgs9i8hx067d60zpycnw3pbd4xgn9nis8fjjnw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12510,22 +12364,22 @@ license = lib.licenses.free; }; }) {}; - d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + d-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "20180215.727"; + version = "20180409.1043"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "8d0ed0460189d0e91fa454866c1ed7b9b36f99e2"; - sha256 = "0pdg6s10vcr95r2azin1svkdgn8grlgwi4di30d0f3vcq8jmmfhi"; + rev = "09745ba713e08a02fd81c01824aefa6731992a6f"; + sha256 = "0l1rpdfjhwbhzrs1z54s57j4zahx62mym9rdld0rb41ph3k4l49q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2"; name = "d-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/d-mode"; license = lib.licenses.free; @@ -12576,12 +12430,12 @@ daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "daemons"; - version = "20180310.1147"; + version = "20180408.301"; src = fetchFromGitHub { owner = "cbowdon"; repo = "daemons.el"; - rev = "75b54be70a909282b20c872b5f01d30e18e19f84"; - sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c"; + rev = "9e6868e2559ea7d70fbad8c419798124f406cc40"; + sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; @@ -12639,12 +12493,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20180221.541"; + version = "20180327.254"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "7b32dcdad3933e0eab03d2702014c0b56fc73b9a"; - sha256 = "1sxqnf8c48p8jnrxabjikijah8d7v11c4k4mvmc67vvn92p20ag5"; + rev = "ae26f45800d9e2ad5d76d50bf1902edc1e36d0f7"; + sha256 = "1b8mp4xhcswhzk2r5w0s84kkiil1wzl2s32nfbiphpqg7f0863dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12660,12 +12514,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180224.1246"; + version = "20180414.1306"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "33c8c4afac616e6de30111f8a7f11d572496a838"; - sha256 = "0zv6vqzw299ydgwxiky8b2nlb8cyzzw9zsx44ixaqqf73f63bv1n"; + rev = "18a2c4a833f9ece01ccfb5910455fc2f0b0de986"; + sha256 = "09a8gwnh2281kjc1rk6ba5clk020hmz11pz36iy99y1bya043794"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12891,12 +12745,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20180310.1317"; + version = "20180413.30"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08"; - sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12937,8 +12791,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08"; - sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12954,12 +12808,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20180110.1153"; + version = "20180328.807"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "e3fc28a6d3626c8cae9eb2e448b2f2e6b1a98f52"; - sha256 = "0kfdx5za610v3s8hmvy39gqn5w6xc8yljz6ybxzbg09byjinhxmn"; + rev = "5be3f45b0f5e84aa7db3988827c5cf0a8134176d"; + sha256 = "10ac6d2b97jpqrkfd3rnxj1n6a0lzh1n2dxmmz5i2yy5pjfabc5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -13017,12 +12871,12 @@ datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20180205.1445"; + version = "20180325.1004"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b"; - sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j"; + rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5"; + sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; @@ -13332,12 +13186,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20180128.725"; + version = "20180327.1935"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "06d094f070b5d675441f74e05a449ce4941529e8"; - sha256 = "0r0lihmkz802ik9qlbs41wfw86vj23mlm7z41zw8h845drxc8vl6"; + rev = "f0da313420a3b27f761fcafd01ccd9e32b71bd0d"; + sha256 = "0xvsv2wzkgys99vx1x2by9isagihi97bwbxmrwhfrz47pphdmj5r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -13437,12 +13291,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20170628.1503"; + version = "20180403.2032"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "1e8b42ff6479fa541eeec5699b4727af136d40da"; - sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6"; + rev = "4f74e6f1bb6519587303e20fe59470853b1a0352"; + sha256 = "15j4f7jjjhrcjycxwzqnwqhm3fyvjnisd41k5lw13dnhbmp1gzx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -13563,12 +13417,12 @@ dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dhall-mode"; - version = "20171204.1327"; + version = "20180409.1255"; src = fetchFromGitHub { owner = "psibi"; repo = "dhall-mode"; - rev = "bc6aec777594beeac6ba4c6dbfb1c889341589c9"; - sha256 = "0vfkdj1fyykmylh6gg9igpiylb2n7bd4iqq1gl5mdqid8gsv4sgl"; + rev = "7c9bbb7c1f8ca7f700b45c26a64ca8e0143543ae"; + sha256 = "12swhpsl86pi21smvggqszn1wl71wrw15x7nybcmfgjb4d403716"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; @@ -13793,12 +13647,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "20161023.1329"; + version = "20180318.1327"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "c91edab065f413910354940742b35bdffeb52029"; - sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; + rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21"; + sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -13923,8 +13777,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13944,8 +13798,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -14024,12 +13878,12 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "20170413.747"; + version = "20180402.2308"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "f55b69e5cd1d45699a0f37468ac8e20fa7a0cff6"; - sha256 = "193mf90d5vds8hswkxasda267ifr6w55vn4pph15lkbmp33wa50n"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; @@ -14070,8 +13924,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -14091,8 +13945,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -14217,8 +14071,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -14238,8 +14092,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -14280,8 +14134,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -14297,12 +14151,12 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20171229.753"; + version = "20180401.1506"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -14364,8 +14218,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14465,12 +14319,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20180307.748"; + version = "20180410.203"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "78bb6894348b1d958aa8947837db4b3bceaa55bb"; - sha256 = "1i37pylq6gh9144vhf0lxqnkzcwqhaq7vm18f64qajvcv3rj5s84"; + rev = "bb0de5e8f662c3f522b931c6e2c2340e4ed682af"; + sha256 = "1mk35k0iiyxk5s8ymcx94fhyz188i8r51r73vnndm868g86yslzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14986,6 +14840,27 @@ license = lib.licenses.free; }; }) {}; + djangonaut = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, pythonic, s }: + melpaBuild { + pname = "djangonaut"; + version = "20180403.302"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "djangonaut"; + rev = "501ecb3cd927975a19ed8beeacb326e01715b78c"; + sha256 = "1h47skyx9yfcgvj5k53h3c40am191dwjw5hyq9jgmc3fkg2dr95j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c/recipes/djangonaut"; + sha256 = "0038zqazzhxz82q8l1phxc3aiiwmzksz9c15by9v0apzwpmdkj38"; + name = "djangonaut"; + }; + packageRequires = [ emacs f magit-popup pythonic s ]; + meta = { + homepage = "https://melpa.org/#/djangonaut"; + license = lib.licenses.free; + }; + }) {}; dkdo = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dkdo"; @@ -15157,12 +15032,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20180222.717"; + version = "20180416.911"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "ec2b07255e273639ff76303778661f81c5b74000"; - sha256 = "0nlf3rw9xa9hggqkw6nxfswbqlnsgbliz9z652kp7c9hfikfmcsj"; + rev = "6df5799e358cfd8714bf9aff8368865a5bcf9691"; + sha256 = "091p9wvrnhz42azg9g9ybc08s4gf1fxwjzxc3ar530wc56kdmd7p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -15207,12 +15082,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20180311.611"; + version = "20180324.1052"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265"; - sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj"; + rev = "c9f131d2c90d652435d407fd36c40feebfed1dad"; + sha256 = "0d5d46i6hplmy7q2ihbvcrnk9jrwa2mswgbf8yca3m4k44wgk6la"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -15249,12 +15124,12 @@ dockerfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "dockerfile-mode"; - version = "20171124.1647"; + version = "20180410.936"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "4ab78f678e9ee40c7c5729dc8f1f5c1a847be2e7"; - sha256 = "0dc3pfqf6nrwnqsiyn49l0pgq7rm31kciwsqagnrjnc85nnbpf9m"; + rev = "818e6946fcf2d58438ab78ea06761a372cc5435a"; + sha256 = "0mqb09jcqi74hbn7869gng85sac38mc1hylzcwh7d5qlsyl9dg08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -15354,12 +15229,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180312.1228"; + version = "20180328.1556"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "933bf2a006c5de611e03d377b967f213e285c296"; - sha256 = "0lcxglnq5zic2hbjwc67x60dqk3j65rsschhwvxcmcmcyfg0whfi"; + rev = "179c0836a12a37957569f904024b6e65597fb4b6"; + sha256 = "01jhds2si4bdm05vjdb9azd8ix75p9xi80qqrhcmp3asml50ha39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15543,12 +15418,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20170412.845"; + version = "20180416.652"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "62df5de68c73d34faaa0191a92ce3ebce589bf24"; - sha256 = "0wpbscqaszr2mg0hijamcz6l9nknsi12mwdbib16ghlh6y9mj4ia"; + rev = "74094e6fd5d0f15b92d82c73b3b3d9f13949d5dd"; + sha256 = "0apimfivs0g4m9qy1m3c8id6ycr2lwxdpd00crxbka284g440nzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -15774,12 +15649,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20180218.1123"; + version = "20180319.648"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "7019ecd7f20428cd33d96a25934416adc28e4159"; - sha256 = "0vb3fhi361v4kjyhvmax60550f3xkkkm2fyhi3ssjq21cq0k923g"; + rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1"; + sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15858,12 +15733,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20180228.2206"; + version = "20180323.1942"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "260054500d4731c36574b6cbc519de29fdd22f43"; - sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"; + rev = "9e4090ac9108da9a794194b831dc6226998c623b"; + sha256 = "1hablgysv2a2jlwnp7hgxglraznbc992ikd3myxfspqr3f6rzm9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -16043,22 +15918,22 @@ license = lib.licenses.free; }; }) {}; - e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + e2ansi = callPackage ({ face-explorer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2ansi"; - version = "20150220.1513"; + version = "20180403.1215"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "e2ansi"; - rev = "bd047d3d6ad02a0679582d5786afe9aee656da90"; - sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w"; + rev = "f886e687d50ff58063a92d40623f2400fa913af0"; + sha256 = "0wg16hdmhbhll0ffp2hrqmr12ddai2s6gql52q6pz9k3lw6v0d5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e/recipes/e2ansi"; sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94"; name = "e2ansi"; }; - packageRequires = []; + packageRequires = [ face-explorer ]; meta = { homepage = "https://melpa.org/#/e2ansi"; license = lib.licenses.free; @@ -16298,12 +16173,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "easy-hugo"; - version = "20180312.352"; + version = "20180416.749"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "b14dc7f9d0da804daf8219fea48604b192a4389d"; - sha256 = "0y1d1vpqbdm86y52fd97l64zfnl4g428h30152mamhmbjzjsi0v5"; + rev = "b01585991ca1885e9cf10dc41481116feb091c89"; + sha256 = "1nac2al4hi4lcarj325957jgkkfgfkgpw6mzmbcqzqvy02r2v7g4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16319,12 +16194,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "20180108.559"; + version = "20180416.811"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "e7016084c6212e393496cf19fb5e519c380227ba"; - sha256 = "0jpg31z7f2him4lcnazknx9lpipf1nbqvhaqr5razkckq71llq18"; + rev = "670c289d7dabc9e991ba78cdde17fb659f23eb50"; + sha256 = "1myqhny6v5xdz55xi1ayfash5r3ihkyy2cykwhjkrpp339695bxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -16407,8 +16282,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "b7e5f2c730036197cfa7d819006b91b4dcc2efba"; - sha256 = "0zbcx5ksf02kv7vavdnixblb8xk3zipwp5nrlyxyshmksw7qg3wh"; + rev = "1740118125ae7aa6ba82d36e1fe0e69065a6fcaa"; + sha256 = "1i5r8m34zf7ya1kzgm8hsx707phq5smf2x6y2a1ykbnfkk39gmbf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -16445,12 +16320,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20180213.531"; + version = "20180416.350"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "cbad0a51d7905712201d83e9f4f52a7bb047652f"; - sha256 = "1jmg63q4msy83nr0xzivay9n8nv48kawqj5jxlfq83fwkvnk1szm"; + rev = "22709d2b5e973b321dc8412f9a26acb156a076e1"; + sha256 = "1xh7gmshn1ra027pqbvc06qxjs49ijby0kiz37qdqz7rvq2xgl6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16869,8 +16744,8 @@ src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "f01f5775760d73a8b0975d8caf009c3b1e7b2229"; - sha256 = "1rri1h1ilhmyspp8krbqh2qz4f4wigmxk8kwvg39pr4mmma3dz4f"; + rev = "e1f86b4ff0b8b872a121287bde4875a7c3c4f8e2"; + sha256 = "0vxahv098bh3bk8iphj7nvvajf31mc5yr9l1fzs127qvy2x62b0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16907,12 +16782,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20180211.2028"; + version = "20180408.2210"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "f52d2133f3948221ba84a396c693eff958fc0eb9"; - sha256 = "1ml9hgsyndzn03bz4a81yhalfg34mk5il56kqv4bhqkwjkl1axm7"; + rev = "35e94de8223c407901548989cf4c9547ba692ffa"; + sha256 = "16d8njpvcsc845mbjyzjskkdgbvcy7m4lvy87sl14fznb12fims6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -17108,8 +16983,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "9948d6a1933af7af45621c9521d7a124c715191b"; - sha256 = "0j2026bnz5wjcw9g1kbgjddapv0hnfmfiv1aab24ffh5s1mr8gnl"; + rev = "2f8f744bd0a8d1c307922c6636f1c337d45a55bc"; + sha256 = "1ds0fxi12z3cls0wavyq5anw2jfhmc2a6mx3g4mnxfr39sjr4q2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -17145,11 +17020,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20171229.1435"; + version = "20180330.1330"; src = fetchgit { url = "https://git.tuxfamily.org/eide/emacs-ide.git"; - rev = "faae6f1384826d18f70b28826dc528d70e91a5c9"; - sha256 = "02hylmgs6il59kkq59i9lpdg9gdirpb2y37xzybh7n5lqyzdafai"; + rev = "4023c7b19ed75e0e2a58af7b737aff23589ab6f9"; + sha256 = "0j3gdsnk64xnk028rrc3ngyzjrzsyafpdg1kxnf1p10jrig6pwyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide"; @@ -17186,12 +17061,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20180311.1029"; + version = "20180414.1838"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "115c16eb9f38447790a75c71e67036c5f4be15e0"; - sha256 = "112wnfhn468gfgac1vhclm6lycsp904wmf60akcng71fqgvyzcda"; + rev = "ed4ae8006ca58c39c5e09925fb51c0f3529cb199"; + sha256 = "0clww9329ysipdby8d3qwkx7pmrls075j0kpsqw3h8mm9hb48wgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17259,12 +17134,12 @@ ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20180305.1047"; + version = "20180328.623"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "dad0777b7dbcdee8d16134b565924a9081806ae8"; - sha256 = "0cmkcnz2mqi3qdcl6srrdzp1yxk6qvm0dk413wkx1grx5gqs1vpr"; + rev = "dac78aa9fd1979a0c6caccbe3698cad5f0e32d9f"; + sha256 = "099lkldwxnw7ghpj42z07i1bv7jz8438xq7mv4vz6s2d6qwc07lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17305,8 +17180,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "93fb44441b18b67d61400ca5f63e3194c34181b6"; - sha256 = "0w9iiwnbrk18si064q433f89f8xf5b2lk5zxx1b3nrawbbk76k1r"; + rev = "e065feaa545087dd49f690a838237fe6239b00f6"; + sha256 = "18hd7x3rk335r8ps1mpg1lpymywaswpg3w2s3m36khd56m3vd4yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17616,12 +17491,12 @@ elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elcord"; - version = "20180306.1515"; + version = "20180411.1207"; src = fetchFromGitHub { owner = "Mstrodl"; repo = "elcord"; - rev = "3071250488613d8dbd79daf81ddbe3bad4b87001"; - sha256 = "0lcs0713r4vcln2im53mkfwcibr3j7ygs467rfgf163kd979gp5c"; + rev = "0cef4ca13b00d79507292d5591be8ffb7df5a9ca"; + sha256 = "1571r8iwrf4dagjr2pv7dgs1i0f20nq6jdkxm2dlwvkblcnlx3fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord"; @@ -17700,12 +17575,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20180204.1405"; + version = "20180322.506"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "478a976db3ea764f9c88c3302fb3bea1ab41f1ca"; - sha256 = "08qzi8wvlf64xfhhndnmr9xksk3n9whzvjqaikf5kz1jrygncnrp"; + rev = "d47149a8027907b67dfe4787a53b247be34ad4cb"; + sha256 = "0ipzhmv105621lhwjm7dvc12ap38hcg62z8z805czn6yinw6wydg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17854,12 +17729,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "20180204.2003"; + version = "20180409.813"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; - sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -17938,12 +17813,12 @@ elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elisp-def"; - version = "20180309.1434"; + version = "20180410.224"; src = fetchFromGitHub { owner = "Wilfred"; repo = "elisp-def"; - rev = "4c300ea67594892171076f49df7c56f25e35d0ff"; - sha256 = "15kqlf87nxy5vnny5l6jrfj28mxz97w07h6bmj1n1x9lwxbd830n"; + rev = "ff0730b8110f776862b29bf0b66e396fab2aaafb"; + sha256 = "1zdbb1mgmb8hkzsmp6l4mv61831bw8ybfsfcwalnvrw5fvfwpaik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def"; @@ -18043,12 +17918,12 @@ elisp-refs = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20180111.1431"; + version = "20180331.1206"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "eee751a6120f925cdffcfbb6a4545e599b953e94"; - sha256 = "01gckl8fwmwr5kp1qy4dcmvm7dh4677brwjy4xpqwhiq094fw9b1"; + rev = "788f6f65d5171b1887b3ff9e4cad900e8046b2b1"; + sha256 = "0c7hcbjqynw6k5idpmfxn6xbr192ahhk8a2g72npap97flpw6cdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -18379,12 +18254,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180314.1340"; + version = "20180415.1232"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2f4388f949482a4dd83b2dfc408dd94f72edd3d4"; - sha256 = "1mbv1xr015pimfqx108gcnpq9ah974h8lbhc9rkb866rbwsfrnss"; + rev = "911d1c58df1c0ff9ce8057d07b13c06759f2e0e4"; + sha256 = "0cyk2467gcxz0vf63p0db9y6rij9hb7251lv6s054mzy3kbcn7zm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18447,22 +18322,22 @@ license = lib.licenses.free; }; }) {}; - elscreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen"; - version = "20160613.251"; + version = "20180320.1902"; src = fetchFromGitHub { owner = "knu"; repo = "elscreen"; - rev = "35c68a7503179fa618639e1c90b43bec9812a988"; - sha256 = "0gvhnhcchrzlj0kbi48rzmqx2nz68d5lyp7f8jk0lbbbdrdv36ka"; + rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772"; + sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen"; sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s"; name = "elscreen"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/elscreen"; license = lib.licenses.free; @@ -18618,12 +18493,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20180202.958"; + version = "20180324.936"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "99840665f3ffff36633d52b9970352fc523434a6"; - sha256 = "0hfpbfvk2f20sy1gia77aw7ndyxpc268bk4n2n6zlfb4j9jcp2sf"; + rev = "cf1000f5d214363fe545a4ce849166194b8fb2c8"; + sha256 = "0k62qcmhav7pshrn1f55sar6lz37l26aqaqlkkd20h60fhbqp9aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -18996,11 +18871,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20180217.1219"; + version = "20180412.639"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "0459003a1686b5742e660d08e7c936d1b06e8e7c"; - sha256 = "1gym522bhxbip4vfg0lxkpjnb00nb4rh08xdmz33r71rclh4vrkv"; + rev = "9b7b50a89bc4f9df7f9edd6e939508288f0ffa9b"; + sha256 = "0v271gk6q77zs0gdp9asbqd8alrn6ifxzzjkqb3hd4xdafv35sf3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -19100,12 +18975,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20180210.310"; + version = "20180415.1958"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; - sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; + rev = "c7efefd0b41fa910436a91eb3bca4db3a85ad940"; + sha256 = "0h40nhrzndzhdq3ra8bzqg3gczbmjf010n0nan6dril427qvxdjw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -19121,12 +18996,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20171211.609"; + version = "20180325.417"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "686be9b27537bdc7987f1ab0525393208bfc480b"; - sha256 = "0c53mbl53ii0h64a1vdvskm29wjr7v1ms54ax5d588bv4c67wsms"; + rev = "f6b37f5878c741124d5fca43c5b80af873541edd"; + sha256 = "1sxzh1bhdwln7kcn07agayyhmgyrbmmhgc3f85336xybc6ljpqs8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -19142,12 +19017,12 @@ emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-simple-mpv"; - version = "20170930.2216"; + version = "20180316.849"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-simple-mpv"; - rev = "1af7838037c86872e897bea872d279ff080c28c6"; - sha256 = "1xgkpw89pyn4p37l5rz9dw8yg065slzq8l5z69n6nam9hndcnjsh"; + rev = "101d120ccdee1c2c213fd2f0423c858b21649c00"; + sha256 = "1i6rxkm0ra0jbkkwgkwxg3vk5xfl794h1gkgnlpscynz0v94b6ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; @@ -19289,12 +19164,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20180128.607"; + version = "20180320.1933"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "8d89c10a5eb975544f8475261e758de390d141ba"; - sha256 = "1aa9kvfq6vh5rjwg5hif9lc7c886893f9ayl5nqgpxcdjvlpnvc9"; + rev = "a86afc14e20ec7287c2b37f5b64318c209c9bbd3"; + sha256 = "08z699ycyidm2c1yi0zhrg6nhhdf3gqx3yi6h9z4n61ns0irg8r5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -19427,12 +19302,12 @@ engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20170812.2007"; + version = "20180401.946"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "408932727bb723017eaf6338e50cb6d1266b8df8"; - sha256 = "1wl172ldmdw6gcdzbbf7dln7m55112kq42jzs42xbihm0v1x8xlb"; + rev = "fd5a235b2c93b95143d676e6b654e388d7cdd956"; + sha256 = "0lynwd7s1mjppynh8424qk30jzcr384wvr21bqy6ylsxs19kqg0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; @@ -19448,12 +19323,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20180123.1835"; + version = "20180403.1251"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "989f7191078c8c1c46921167f5f96119fad930a5"; - sha256 = "167b34cgp5f7nfrcp9jn8phzs125jx8mkbni8yshfb5i2mf7g0ml"; + rev = "fd50e71913e4dc714f71020701ab398a18b524b6"; + sha256 = "0al8bbhfjxqh40hkpiaziz5vsfy2m5saj7wcvs6xivz1ph5ass0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -19532,12 +19407,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20180201.1340"; + version = "20180320.230"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "2819a9c2ae2bc6d095887c2cbb6f9bd8617f1e52"; - sha256 = "1cfr9xs268nwjjhx7n00h5sssm479bzd5f7c847hg6x2hyqkfzxb"; + rev = "4ee365c35a34a41c31c262d4360132037461a60a"; + sha256 = "0919ifs4xm7s7axpjrlb6ymv5xy647pbfczw03z0xwm5gx7fmra3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19645,12 +19520,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20180222.1622"; + version = "20180318.1221"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "bc78f600b2c451bc8df1cf73bbb14476c11ece1d"; - sha256 = "0w4c3j5pnzn6yisfb02s2aw8pzhqlkmidzk0yxfalgn8gmqbz57r"; + rev = "432312b9583ed7b88ad9644fd1bf2183765a892e"; + sha256 = "0d882kahn7a0vri7a9r15lvmfx1zn2hsga6jfcc6jv0hqbswlb2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19833,12 +19708,12 @@ erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-hl-nicks"; - version = "20160202.1150"; + version = "20180415.1246"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; @@ -19854,12 +19729,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20180206.941"; + version = "20180407.1545"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "9f4d7b93a3c7e12ac935b50943177923a8c01d22"; - sha256 = "0dd2v91rp3lai10258bszpd9wsa1lvx08xspsnijv64axh73yf7r"; + rev = "4ad26a06c8faf106172a0f8e472c677adca60542"; + sha256 = "0280pijlnm071c2lh9z55w1xzgphfjq4zbl29r7igscy7q5dc60z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -20211,12 +20086,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20180302.427"; + version = "20180323.612"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee"; - sha256 = "0f93f2w0c8gclvizh4vlkfii7y07ca7fqr40wqgs1bqjdqw9b9cv"; + rev = "40dc6b9fed7d51a204e0d69b7bba7e8cb6496ae5"; + sha256 = "1ndzx4alfwc437d4j0bifgc0pignxs0nvwp4i2fdrpljcf0x0nxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20232,12 +20107,12 @@ eros = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eros"; - version = "20161221.826"; + version = "20180414.2318"; src = fetchFromGitHub { owner = "xiongtx"; repo = "eros"; - rev = "a42e45c9b2397156c684330b0fc90ee0eba773f5"; - sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"; + rev = "dd8910279226259e100dab798b073a52f9b4233a"; + sha256 = "08chj3a0lw4ygi2sv7wj0i6ihfbi8jhylr8p92inif8b88r6wg3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eros"; @@ -20295,11 +20170,11 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20180208.935"; + version = "20180407.1243"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "e0cd3c21292e4a80fa8a9648981b61e62a996e80"; - sha256 = "0i6962j2k6qmdlrw2m5jv2pyxvciyawd954q462nv64cddaa5581"; + rev = "8d7d703332e3a41bfc59de44fa8832435ff1633b"; + sha256 = "1mbbv18pviirf220wjzfjlig8i3jwcl1bpv5awzvyzg2lm3h1nbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -20420,12 +20295,12 @@ esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esa"; - version = "20170427.845"; + version = "20180403.825"; src = fetchFromGitHub { owner = "nabinno"; repo = "esa.el"; - rev = "8bd011cd1861113f54ad155d3c62725e1dcd37e7"; - sha256 = "1a5mrz3m0gy5r7dcw31s488jgfhrp4axcnsmma40q2x3harp0hsk"; + rev = "417e0ac55abe9b17e0b7165d0df26bc018aff42e"; + sha256 = "0hib8q9fslvw02i1y19z78fv6yy88q09lhfdfmbdyn6yal21855q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa"; @@ -20438,27 +20313,6 @@ license = lib.licenses.free; }; }) {}; - escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "escreen"; - version = "20170613.1534"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "escreen"; - rev = "153dc05b2b7e6e2d4cbd7b6cbe8b10d6a70f73f3"; - sha256 = "0xz3dkvgrbgv91dxgdfcir9zld5qsqpzrmp4q6fxqa548advn9ak"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c64c21a42fd8436bd60e490980ad4ed824b212d1/recipes/escreen"; - sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54"; - name = "escreen"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/escreen"; - license = lib.licenses.free; - }; - }) {}; esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-autosuggest"; @@ -20735,12 +20589,12 @@ eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20171128.453"; + version = "20180407.911"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "3efb041c9ad0116e745efaede7f7972bc2179a72"; - sha256 = "16siwr2d930kifdhzgbyiszphp6i5ggbyi76ya6gkzy6wh1s9b56"; + rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec"; + sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -20840,12 +20694,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180314.612"; + version = "20180416.631"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "87034e808c5279d73d666797971fac505215fd7f"; - sha256 = "0ycgid2b74f07wc97ywwr5rkk4hxxwhc4zly9xfqa75ngrj993z4"; + rev = "27b55440d15ff532da86dfae6d030e76d1e6d518"; + sha256 = "1sjnky11lhmiqcqrmdfi8xaf40jlm43kzbnviq031apwfxrvifi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20945,12 +20799,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20180226.254"; + version = "20180325.2152"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "d4db4f3023afff4321cd3f99be75ad44e77cd0b0"; - sha256 = "1z8ban35vrkibr07awfg6z4cy79irjiz6hchcyid94l6iifbwf0y"; + rev = "fb061cf49bea47ba80090775d93388dc9b1b495e"; + sha256 = "1ygn927d71dxh07si38ii48l4myg42vb7xl09nbbz9c0df4m8q0a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -21197,12 +21051,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20180307.109"; + version = "20180408.1423"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "90b41a21a31e99d4153c536f1a04a69b73d96360"; - sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92"; + rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670"; + sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -21341,22 +21195,22 @@ license = lib.licenses.free; }; }) {}; - evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-collection = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180313.1759"; + version = "20180416.146"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-collection"; - rev = "4d3f755884a93132659976c510fdc90b2b98622c"; - sha256 = "05lwd9c2hdd8pdd5vy2f8h3q2djj4zpp4dfwbqqrgqkhw0wavg7s"; + rev = "aca031a7f313d4380a1dbaa2158a9908a2ce9415"; + sha256 = "1mzgi8bdd767g6xfkznpm5v8gjx8wp99drlxggi0vgp1rm3zslsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection"; sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy"; name = "evil-collection"; }; - packageRequires = [ emacs evil ]; + packageRequires = [ cl-lib emacs evil ]; meta = { homepage = "https://melpa.org/#/evil-collection"; license = lib.licenses.free; @@ -21596,12 +21450,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20180210.938"; + version = "20180414.2306"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "deab4966d75321a9172947ee5cdf2329eb2c5a6b"; - sha256 = "1b4w40x23kbzry80d4rxxynasmrkbry9jj5jkc4l4rcj8lk3vbbi"; + rev = "bc318ad4b7711837c21405d49a0ce4097f3a70a9"; + sha256 = "0vy6skhp6skr3hvkc0dzfn1dridwzybjm9mg2h90srvg76c8966p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21785,12 +21639,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20180313.931"; + version = "20180410.804"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "69dfa5a06e8a4024803223b9873ea5d591a97294"; - sha256 = "1kd09z4qxcanvxnawhczwp3y61kn4gnaaji9chqrny633r8j64jk"; + rev = "9bd91561e7d0bfe3198d0860bae1785a543f2eee"; + sha256 = "1jhna9lyic4c28kcdhbqid6gyv9gawznf2ga470vnfnyghd4f757"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -21827,12 +21681,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20180131.502"; + version = "20180328.2351"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "20270ab6b0a3a398942609f7acc3d0162b954591"; - sha256 = "0vnaplchyl1z9d8fhrc83157a6d97dgwdja4y0nm7bkgm1jqgbdc"; + rev = "51d8b268e597693aa9d02f2dda66840562998621"; + sha256 = "1b1iymyb2f8913xgzr13pslqcvhwyyl3370kjs43acpbgnhn2zzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -21929,22 +21783,22 @@ license = lib.licenses.free; }; }) {}; - evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20171206.441"; + version = "20180411.640"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "41d43709210711c07de69497c5f7db646b7e7a96"; - sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; + rev = "34d411715ead5829d6d8969511047feb703b067e"; + sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d"; name = "evil-nerd-commenter"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-nerd-commenter"; license = lib.licenses.free; @@ -21995,12 +21849,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-org"; - version = "20180309.252"; + version = "20180323.1606"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "79c8e067bbc31ead51894a28492f28cf3a103808"; - sha256 = "02qdsc6fzcxmblvlg0zpznzfi8xkmc4rr44zdxgw462xyfk2fwrq"; + rev = "b6d652a9163d3430a9e0933a554bdbee5244bbf6"; + sha256 = "176hrw7y7nczffbyhsa167b8rvfacsmcafm2gpkrdjqlrikbmrhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -22079,12 +21933,12 @@ evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-replace-with-char"; - version = "20171223.906"; + version = "20180324.1506"; src = fetchFromGitHub { owner = "ninrod"; repo = "evil-replace-with-char"; - rev = "b08293f380ca8809ef12df572d37f977bed0ae52"; - sha256 = "05d505scnmhplaqrcj7fpb107bfgh4zpxrrq942nn035yw07yjjx"; + rev = "ed4a12d5bff11163eb03ad2826c52fd30f51a8d3"; + sha256 = "1nhnwl39wsi7akzcjqszxxw2b6j9i5y4qabcd8p387zajjpgscwk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char"; @@ -22184,12 +22038,12 @@ evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20180228.2218"; + version = "20180317.233"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "5de756fc02108cb2360908f6ec5e9630492ef422"; - sha256 = "10ch2xkw3ca3g190344jw9wsq297sip9nh12wmd8wxgsnqjlfzfs"; + rev = "37ca9749bf5604040e745d65143cb0667f052542"; + sha256 = "172zqf7qmdhyhlj48nxyxpn0cnqb9v045536sf6gfvcrv81wps0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -22335,8 +22189,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "90b41a21a31e99d4153c536f1a04a69b73d96360"; - sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92"; + rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670"; + sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22608,8 +22462,8 @@ src = fetchFromGitHub { owner = "ninrod"; repo = "exato"; - rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6"; - sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm"; + rev = "88266fa7fcfbef704032f671b94f756f2f98bd4f"; + sha256 = "0nmm7pvs81429a4zpal6aidfd1n58yavv3skscrav5r0wnlbz773"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; @@ -22625,12 +22479,12 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20180224.1916"; + version = "20180323.1904"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "885b3de9bb6365771dd09f5267f6ff843d5109e8"; - sha256 = "0x5a0v4z5hgvi7biwbsbxw9l8in0gxwrz77g9vffz9djvlr70r1h"; + rev = "54ea2f9c3c81d18b96e4d33c4c547e02eee420dc"; + sha256 = "193d9wf8x1cl1q5bzpdm9508a37m6nwlsjzn2mxbiqkb8p9psj73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -22947,12 +22801,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20180208.628"; + version = "20180414.329"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "8891dc05b54c0ea848ee3bf7b42e759f73c1bb1a"; - sha256 = "1wi1qqzf630ffz0kkk12f81jmm8ii7cckf1wds3phpb67msn5ial"; + rev = "96595833110cd64c391e0ccd5230782a8f0a4e08"; + sha256 = "0nvwgxlrbfhchb7z2qnw1lj66xpzn2b6yb6mhx0k31xdfr173wch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -23094,12 +22948,12 @@ faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faff-theme"; - version = "20180315.1304"; + version = "20180322.1005"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "abbfde9311a2b0562541d2bf455182d6197f8c48"; - sha256 = "15x2lb41df0kvlvncqp7m4a97yb7m4jhpgb8hp35if5cgp99xmbj"; + rev = "d123161586397fb74a928bb1b22e2b507f1beed5"; + sha256 = "136gq45c0w0c3i0fzk3js67z8p7r9k81d31s48flpsb982bf7nfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -23387,12 +23241,12 @@ feebleline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "feebleline"; - version = "20180202.1420"; + version = "20180322.1401"; src = fetchFromGitHub { owner = "tautologyclub"; repo = "feebleline"; - rev = "c6a8a955c0f441d4b4663fabd5cecdc92235b74b"; - sha256 = "09g67mkschca2vp73263xm5zf48831zfxlyyfcmkjpsvrgm83ii2"; + rev = "56cd8fe336b619840991dc66d9cca973ddd8500c"; + sha256 = "0p8d31942c3xlymjm2r9qppr07c8vg0842f87lzqh84sc3z7r5ql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline"; @@ -23508,6 +23362,27 @@ license = lib.licenses.free; }; }) {}; + fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + version = "20180331.1023"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "50ea2e4ec943993f54ef72a5deccd62dad5bb7a4"; + sha256 = "0s6kw87p1w3xwk354lbj5br07x0l63x3dcgfcxcvmy7k820f0iq6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "fill-function-arguments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fillcode"; @@ -23574,12 +23449,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20180224.2103"; + version = "20180405.713"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e"; - sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my"; + rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361"; + sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23826,12 +23701,12 @@ fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-completion"; - version = "20171209.508"; + version = "20180329.2137"; src = fetchFromGitHub { owner = "Ambrevar"; repo = "emacs-fish-completion"; - rev = "12e5db70b5efe7a3cd37e8fd25eb526d08007aac"; - sha256 = "0p06rahi66fa3i2gfkf6nzf7hnysdpz475d5dib2wps7labfh9qd"; + rev = "3e3ed1f19fa778b7c35ad88e033dce5a6b1fc153"; + sha256 = "1zi5cgzwy1wkvc8352s3l24p4i4fh87f9pyir6jji3hy424pm6w4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion"; @@ -23963,8 +23838,8 @@ src = fetchFromGitHub { owner = "mschuldt"; repo = "flame"; - rev = "2cfb860a483197e92a4c20d7b9b055d586e76fe0"; - sha256 = "1h6mm2zjv03y2d6dv4gq7iaz6r2glgcljzgmi6m4jp6flvyqh09g"; + rev = "a749b2a77b87e505572d0f1f5d59fac76348bb73"; + sha256 = "1l9jbzavyi75li64jqfs000s1m8iw9xvsv8mg0bw1div6bc7vq7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame"; @@ -24168,12 +24043,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20180118.522"; + version = "20180328.1624"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "e969ab24f729835b6f8dd71d57cee1aff345f959"; - sha256 = "1gs3f2dvqh0pfc2mdz00l66wm4hsl2qb7pz29r5yfzjbk5inwqry"; + rev = "faaa2b1f2bb8fcf835ddfb8981654e4d3b2bdbc6"; + sha256 = "0hr4qi5vhq3ravgky95k2n7hin97jln7fmkgbx45fcyiz8jbpz2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -24378,12 +24253,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180315.25"; + version = "20180415.1527"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "3cdef22f638a3d66b6d98ef5c51f28dcd1651e3a"; - sha256 = "128bmgbjskgamwi6w25vjay19kd8bfq4k1rkac62jl0xa5c3kvs8"; + rev = "1eecec814debc6994b1aa8b6760cbfbbdf71e219"; + sha256 = "1in3sanhyd0cmivq7c5xxqpb5frzq77zp7rdyyki9pczpf9yv58a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24861,12 +24736,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20180316.746"; + version = "20180321.1546"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "7e975ec648b048d6dc11ff3e41ec5b2cc201a958"; - sha256 = "0k2pzfx6iia74cfjgf59dv5d0dsqi5424v41lmdigb7daqw0rbw7"; + rev = "995132ced9c0e4464a36c4435ae8248c23fc0511"; + sha256 = "0k0dlbpz3vys373cng2gqlpbzlzbls9dl613rxvnba8d8ndz7ri4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24907,8 +24782,8 @@ src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "flycheck-dtrace"; - rev = "0b03e2e50c5d706a4fd4bcdc0ac643425d64d51b"; - sha256 = "00ld1aih6axdh7zz5bhlgxqzbh80vla08hklmf5lz7mq3v7aizz7"; + rev = "a328c38aea855c0fd02f901c141c100c24b27d7f"; + sha256 = "1cl50ckvjjgx9m7p7fpijk61mw737qigbh9glm5b3slmgkyfq2mq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace"; @@ -25050,12 +24925,12 @@ flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-gradle"; - version = "20180306.1809"; + version = "20180403.33"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-gradle"; - rev = "3710464576f423ae4825fa18826c007adcc6aa5b"; - sha256 = "0dislqlr4h5p85kkfhi8fnq86176xkgxdsvypr8l027svbb9aabi"; + rev = "a14b45183e50993e8b28a4c57ad5db82b789faef"; + sha256 = "1n3i0fh0rvy29gykqamxayfbbv5jy3h6l375pw4ckydcqlp0dgxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle"; @@ -25071,12 +24946,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20180209.1357"; + version = "20180321.1340"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "cbc4a54c0bb9ab0b9559a1e2b7eb1c02c2f38f14"; - sha256 = "1kxcc12vrxbcpc8wjf9srczlhqjqs8nxdi8z01zd7d5fxcafikwh"; + rev = "ef91cfd2766724adf6dd48f7d1dfaeed46dde570"; + sha256 = "0qv2kzplqpnhgalqibb7ligsbxanv07wjjb5cshlsn2l0dimq4w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -25155,11 +25030,11 @@ flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-jest"; - version = "20180307.1"; + version = "20180410.2028"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-jest"; - rev = "2f524e275338e46edb9c1c9ab543020f9031b030"; + rev = "08f27c5ed97c83c445f99fab58f0b6c826f14449"; sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98"; }; recipeFile = fetchurl { @@ -25428,12 +25303,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20171231.453"; + version = "20180410.422"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; - sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -25617,12 +25492,12 @@ flycheck-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, posframe }: melpaBuild { pname = "flycheck-posframe"; - version = "20180313.450"; + version = "20180321.2307"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-posframe"; - rev = "93a8c590ac2275d754b4ca57f64e8335620ae789"; - sha256 = "1n3nhv13wwkqw2wmajgkvmykj1s4g5jx9gjyv5k8qxc5pmf2b3f8"; + rev = "61bdfd4b04e1651163fdcaa7dc631ad073b3e513"; + sha256 = "1r5cwmrszp5cvzlcc4dyhajxd0zrgxjpc0arhr2jkw1fc3d611x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe"; @@ -25659,12 +25534,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20180316.1028"; + version = "20180402.1039"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "88fcbed2ab07dc14724d728dfe5ac899ced67e04"; - sha256 = "1nz0pbafrr41sz2c7f07p1kagqqwkk6p7vkgxjw9vp5ik85a1hhf"; + rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7"; + sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -25726,8 +25601,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "4310b26e69dd9569582962d0013ebc8c372730e5"; - sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -25743,12 +25618,12 @@ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20171021.151"; + version = "20180327.945"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "962f18603c45e3f9a84d059886c7d13178cbf31e"; - sha256 = "0c3lnfj1z27q1pyhfzwxh26ska1wvcnmqmdzpc6zps72prjfdknd"; + rev = "a722204cff5bffe26b8f127c7003cfc9ed00e34b"; + sha256 = "1z0zkf4dxkma6qz83ysyhbfvr0sg2cwxvsapc9j9l1x9nskybv2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -25785,12 +25660,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20180210.1000"; + version = "20180330.1625"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "ca3d3993cd30d8881dabebd1c540d819967c0212"; - sha256 = "0nqw77q31k6y0lc5v7ly8vnnyl72k8y0jxj9dclqfiq9ch53y3c3"; + rev = "61e93ac41847d27b8eea3a334ced2d1783687b77"; + sha256 = "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -25827,12 +25702,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20171231.452"; + version = "20180411.652"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; - sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -25866,6 +25741,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-tcl = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-tcl"; + version = "20180327.559"; + src = fetchFromGitHub { + owner = "nwidger"; + repo = "flycheck-tcl"; + rev = "7ca23f4673e178b9f5dcc8a82b86cf05b15d7236"; + sha256 = "17mmj0yx7d7cwyq35ll1lw4j0yyha172375apvanrkpgpzjpnvrq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fafc86df6c15348711f16302bb86c0ee08c08454/recipes/flycheck-tcl"; + sha256 = "0rmc7rk0n4mgk11jgza1dn1nkjyi7rqs79d3p0cj1081znyj56f3"; + name = "flycheck-tcl"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-tcl"; + license = lib.licenses.free; + }; + }) {}; flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; @@ -26671,8 +26567,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -26692,8 +26588,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -26713,8 +26609,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -26734,8 +26630,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -26790,27 +26686,6 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "20130126.1618"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "555bcebdf47ea3b1d9d1e152af7237b9daa62d59"; - sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fm-bookmarks"; @@ -26916,27 +26791,6 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fold-dwim"; - version = "20140208.837"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fold-dwim"; - rev = "c46f4bb2ce91b4e307136320e72c28dd50b6cd8b"; - sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fold-dwim"; - license = lib.licenses.free; - }; - }) {}; fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: melpaBuild { pname = "fold-dwim-org"; @@ -27091,8 +26945,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "3059378379a6fbd0363cd14fe6227c27739af4e1"; - sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -27276,12 +27130,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20180316.914"; + version = "20180410.732"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "8269066a9035fcf50eb835de3745a62c1cb96660"; - sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd"; + rev = "1efbdbba6cb52c8bc2e70ca2636935d2b1ea8d98"; + sha256 = "16hlywji8ny8b7dc6wq9vfxp6b1fbm1m4f3mzxgngs3gjv6vic82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -27364,8 +27218,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "4dbc6871d8220cb95d287dd35475725a1b7662ab"; - sha256 = "19y23jdfp9i950vl8ahywfh6gkf8cmy0nd3fk931xkx0x5kp64h9"; + rev = "0f42139a41e97bb0a2ebc320d41cec071c034ca0"; + sha256 = "0bfgqlfdjmxz8fq34ad9m6avja5z5pvw9cjxlfxd3k716ga1nc06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -27385,8 +27239,8 @@ src = fetchFromGitHub { owner = "tarsius"; repo = "frameshot"; - rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8"; - sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q"; + rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a"; + sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot"; @@ -27557,12 +27411,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20180315.1927"; + version = "20180324.2211"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "57d00abf5f4087fbb52f4072513672d6258f4656"; - sha256 = "107pv959hqpd05w70i5klabkcy52kcfz2y6c9xb98m75c9i5bzbb"; + rev = "9b948a4ff5d54b5f72c7b004146121ab7d1b9018"; + sha256 = "1r6dgi029hybsbkjbgb2bhsr4ashpfcx3x3sp3gb1ypg2nlck463"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -27590,8 +27444,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "e50be2a1ca65e9d3b3c8116fd71f743ab59fcf65"; - sha256 = "19g188kniikjw2pjszj4shsad9iwr0z00fq1ias1yiq529z2pmri"; + rev = "9b2eac2942d777572e330ba5231e1ee3c0a4eea8"; + sha256 = "1sz3n3dfrga2zgwmn7fy21vhgfw51ma8pbgr459hfq9ay96yvd94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -27733,12 +27587,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20171026.722"; + version = "20180416.830"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "1c8650d39a16ead77df9f5f741d21d148818ed82"; - sha256 = "0wifcbs5m4q9vvb0ch7x4ki05mc1babi35vqpc4pp24axm5b3c3s"; + rev = "314e43c80fc31e15741136e61f3ee5f793ba190c"; + sha256 = "1i9rs9cb9l7hp678rf4w9r47zqy1pakyy7alfli192mm650w07l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27796,12 +27650,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "20180206.1549"; + version = "20180318.1519"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710"; - sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d"; + rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f"; + sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -27877,22 +27731,22 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20171117.1815"; + version = "20180416.206"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "900e1788695d91dde2a3d7fee97681a3380285de"; - sha256 = "1lix0x2gj6lrcx6imr5w3scyix99526fwpx0vzs1dzxfzglscjja"; + rev = "3022e9f8411628e6a210fb5843d858b15a7513f5"; + sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; name = "gams-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; @@ -28046,12 +27900,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20180313.1902"; + version = "20180413.1646"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "e357eae8fa8c7d6a59f22a1c97cb90a386762089"; - sha256 = "1ayy3pg0af5bhskkr03dmv0vad6zmlk89sn8304s0mq5barmmfi6"; + rev = "ec3d0ea34081789da44f0b11b2cf05627a1e9b8e"; + sha256 = "0g79vz9b73p7g2zy8ml0glwiivq48d64yq3kd6wmq1qpx3zflrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -28067,12 +27921,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20180215.1455"; + version = "20180406.944"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "de82992bba6226f1be3aac9ed6568f1a3b23295b"; - sha256 = "1693mrknq0mwzgwrh5z92nv7c80g6ynlymk5qfq8icpii4rlz5n2"; + rev = "d8fb9f69c9d66279316b096929454ebf242aa721"; + sha256 = "025dakpmp2232n15rjz6kbs0vn1gazi4qkaagkm8fra703sx4v4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -28197,8 +28051,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "92418cd1b67ff6e8fb0a64478444975a4b8581a3"; - sha256 = "1vl6wy904jw1mqdic54ssvvbs4xqxhmgacldnfkdkx586vwf0hqi"; + rev = "f029fc11f345ef04ab62ee91c38657e29c462fea"; + sha256 = "1rgdpi8ld5hi2rp30p8sxbrl6z95nvq80jfp3zsr7cmsniwz0vv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -28361,12 +28215,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20180316.1351"; + version = "20180414.1654"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "18bab447b69507802f0261dc284376276ae8a5c8"; - sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc"; + rev = "27e7b17473d17b684ddf873e4281f2595c05ca65"; + sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; @@ -28382,12 +28236,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20180203.1017"; + version = "20180330.1738"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "80a8e9480839eddf1e4e48a23b03ae17d4dffe0d"; - sha256 = "1wdkniszcd5zaqvhfw5j82icf7hh6jy0fg0sifmcmfssvb7xx97n"; + rev = "3f609f5d8277e4282bf2b93366c9f911e0f721a8"; + sha256 = "01a6sgzmyc3m4adik1sgvp19z12rap51xj72hjywgh116l9cqn52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -28470,8 +28324,8 @@ src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "b2712a61d04af98a05cc2556d85479803b6626be"; - sha256 = "0zpdh7j0nm9qgzgp55kim04r9hi8cyi3f6kflxrs8srzxwb4gs6k"; + rev = "314fe6ab80fae35b95f0734eceb82f72813b6f41"; + sha256 = "0vbyzww9qmsvdpdc6d6wq6drlq1r9y92807fjhs0frgzmq6dg0rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -28613,12 +28467,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180202.321"; + version = "20180411.1649"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a"; - sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n"; + rev = "16785d7962cf84df12cf1e498b2c96519e84d235"; + sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28760,12 +28614,12 @@ git-io = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-io"; - version = "20180223.112"; + version = "20180317.1052"; src = fetchFromGitHub { owner = "tejasbubane"; repo = "emacs-git-io"; - rev = "e141629f3133c38fdb0dcee58b205f9457d0f802"; - sha256 = "0vvnifx9cprdr4dbi2jm6j18h2wj7d1dysbaz5lc62c3kwxz3dfp"; + rev = "48753acba73b48b997bb678fb5e2a938ae63b5d6"; + sha256 = "1zw24j6l0ap761q1knxjaxzdfz11kmfq29aag5av4n87m86rxzr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a713197f227e3c43de3609dd505cf7cd226d94b9/recipes/git-io"; @@ -28781,12 +28635,12 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "20170517.144"; + version = "20180328.717"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "91bf19d6dd7368de5cad373a8155c48c4e254723"; - sha256 = "1gszcsji3n42xpshz1pzyvlrd0hxjh14fr4n0ixqv2igk3fywxr3"; + rev = "ea49e2e005af977a08331f8caa8f64d102b3b932"; + sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -28865,12 +28719,12 @@ git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-ps1-mode"; - version = "20170102.1944"; + version = "20180413.247"; src = fetchFromGitHub { owner = "10sr"; repo = "git-ps1-mode-el"; - rev = "e41c630f5d04cb1a4d38a4b500d7a154a96a4655"; - sha256 = "11bg953nk5x501vkr0jrz710pz3qxla27bgrd4gp503fbygnixkz"; + rev = "6a06bf57cbe614ab26032b153d3dcf4fb4bfa7ee"; + sha256 = "1lgvzla1bg7gmkj41hmzhiqcbdmdw9ycpzfvpl6xl0sm0fk3j3rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode"; @@ -28928,12 +28782,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "20170118.1613"; + version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; - sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -28970,12 +28824,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "20170627.854"; + version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; - sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -29156,6 +29010,27 @@ license = lib.licenses.free; }; }) {}; + github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: + melpaBuild { + pname = "github-stars"; + version = "20180328.433"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "github-stars.el"; + rev = "15cbf15cdd3fbd2139b5c128a173bb8f6a4ef496"; + sha256 = "10hyjkdbf5b792vfm072g9wizkszwghxs2x5k1hi1q0c4gw5w518"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58df7d536f9711e10ecaa6e0a37b9ad255e8fca5/recipes/github-stars"; + sha256 = "1vljmrjid5xxmq5yfmsaq09js7zd75nmm4gd0kwm3lf71pb3lp6f"; + name = "github-stars"; + }; + packageRequires = [ emacs ghub ]; + meta = { + homepage = "https://melpa.org/#/github-stars"; + license = lib.licenses.free; + }; + }) {}; github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; @@ -29180,12 +29055,12 @@ gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; - version = "20160319.302"; + version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; - sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -29198,6 +29073,27 @@ license = lib.licenses.free; }; }) {}; + gitignore-templates = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gitignore-templates"; + version = "20180327.626"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitignore-templates.el"; + rev = "b0705b8de4cbdd631c64c4e0024d62ba4ad68052"; + sha256 = "1f0lcyw7yrdfmv0h8b87kz0pdrzhy28fzv688z4aaw964qn8jz0k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c9aa71eac2e68eb1925ed00a2c659c4375bd39c/recipes/gitignore-templates"; + sha256 = "17zx52pmpd4yqlnj39v7ym728i710mdl0by3lc8zk6ljfz77933w"; + name = "gitignore-templates"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gitignore-templates"; + license = lib.licenses.free; + }; + }) {}; gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; @@ -29222,12 +29118,12 @@ gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "gitlab-ci-mode"; - version = "20180314.1704"; + version = "20180401.252"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode"; - rev = "cbad305987ff26fd604a8632fc7ee2f1a733417c"; - sha256 = "0kcffrmww03lbarw2q4fw0sghncfiqw067wv7j1k00fyy7fwlrad"; + rev = "19a377aa42cd8a8bea74ae900fedc2ac74a323a5"; + sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; @@ -29243,12 +29139,12 @@ gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }: melpaBuild { pname = "gitlab-ci-mode-flycheck"; - version = "20180313.1157"; + version = "20180401.255"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode-flycheck"; - rev = "11293547385b8252ce1776bfc6455630fbc669d4"; - sha256 = "1xfhdnny7gyxqpccss0qsmialrjw3dm8x80s7a7ahfyrx5f77yxm"; + rev = "adc5658fe3c90ff944b6ca481773b316a6016e86"; + sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; @@ -29348,12 +29244,12 @@ glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "20180218.652"; + version = "20180319.828"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "18bab447b69507802f0261dc284376276ae8a5c8"; - sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc"; + rev = "27e7b17473d17b684ddf873e4281f2595c05ca65"; + sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; @@ -29730,8 +29626,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "416643789f088aa5077f667cecde7f966131f6be"; - sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm"; + rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef"; + sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -29919,8 +29815,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; - sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; + rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; + sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -29957,12 +29853,12 @@ go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-imports"; - version = "20180107.1423"; + version = "20180325.1918"; src = fetchFromGitHub { owner = "yasushi-saito"; repo = "go-imports"; - rev = "5b3a1d520c599553f621efaf9aec71609d2b9bb6"; - sha256 = "19v05qc9fmrbdcrjliw02hqrl29dqsg3l57qp2rn8z63n3s17rqq"; + rev = "7955b820668af7380e65b418e66e445729ea8ef3"; + sha256 = "0yykpnnrxjp4zf66l6pcx9xx4v26b6468gyqyf77kr5890ry9sl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports"; @@ -29978,12 +29874,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20170726.555"; + version = "20180327.830"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; - sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; + rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; + sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -30066,8 +29962,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; - sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; + rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; + sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -30318,8 +30214,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "46530068cce6db92aaafde350b5059841861d5be"; - sha256 = "17wwvcmyrmi654jkbg6787kc3k0i5w99byk3g69a1rw90gx87gbr"; + rev = "85993ffd0a6cd043291f3f63d45d656d97b165bd"; + sha256 = "0kag4ki3dx9xnm41gj4q77wcl77785id4qqb8kb7k5rhfrs29psz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -30381,8 +30277,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "89be4df26da2a8c50853d2e82ed4b3cc29abc8e2"; - sha256 = "0ih82n619x7k39y0mv6mcaniv3s418b4nq5ql04rv3r4xk5z71gl"; + rev = "1b206ee36263b16ec18f7b2f86a2b770b7490844"; + sha256 = "0vwx5h7b0f4yv5aqznw8zq2fnwwdmrcfa270v16dzdfr5a7n3pj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -30545,12 +30441,12 @@ gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "gotest"; - version = "20170823.141"; + version = "20180319.137"; src = fetchFromGitHub { owner = "nlamirault"; repo = "gotest.el"; - rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9"; - sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7"; + rev = "ad0d617887eed837eed72f7d3daba40d1bb7cba8"; + sha256 = "1lsc6bri8rqkqrmhdslqpph2rdad4b3x8zabg55d9msc4fh25jlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest"; @@ -30650,12 +30546,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20180129.905"; + version = "20180402.2025"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "af9d8fad593242a5ff7e6de55f5d3dd677fcf227"; - sha256 = "129rzpffxsnnnsmb268j028vwd9m5pb042skp829883mxk8gx231"; + rev = "d3ae3004773719bcc413ff8e3396f2ce6bf0827b"; + sha256 = "0l06li4d7mppj7r7xvx4dpvi0asdcazwj3nil6kd1in2pfq3hh4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30692,12 +30588,12 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "20180116.251"; + version = "20180328.745"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "19369badf8b0621eb03ea9e3adeecb22b9710c23"; - sha256 = "0bp4x8s16zj2v7z0i5sxvqafka9v27riizjdrgfbvlvw9idlnsq0"; + rev = "35edb57d136c2a9726fd14e6a59cce4fc0248771"; + sha256 = "1c3g6ygi71qm3lqvhjjzxkpdhwkpx4qwm8mhinwffcib5hagrafn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -30780,8 +30676,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273"; - sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn"; + rev = "0aea74def58791b2343a8f0139c2f2a6a0941877"; + sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -30997,12 +30893,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "20180228.206"; + version = "20180322.1903"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "8eb51dff843f39552f009e34efbf831052557188"; - sha256 = "1jrlbp93qjdb7mfsq1x0n45j7n3zq5q3dzyifp7767bd7ng3srlg"; + rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; + sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -31102,12 +30998,12 @@ grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-context"; - version = "20180311.807"; + version = "20180415.435"; src = fetchFromGitHub { owner = "mkcms"; repo = "grep-context"; - rev = "9602b7b9582d5a5cc036edf0877533b23570ad2d"; - sha256 = "1ybw0mvif1cfkw7vr9kvb9naz06rjmcnyh6l8lk20wfpmcc1rz2r"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; @@ -31205,12 +31101,12 @@ groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20180305.352"; + version = "20180412.538"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273"; - sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn"; + rev = "0aea74def58791b2343a8f0139c2f2a6a0941877"; + sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -31339,8 +31235,8 @@ sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator"; - sha256 = "0fg227yhj85xy0s32xzwg2ka9kc9ygl0wd33wypp6jban13ldasr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a58f1acaafc459e055d751acdb68427e4b11275e/recipes/gtk-pomodoro-indicator"; + sha256 = "1lkz1bk3zl51jdgp7pg6sr57drdwz8mlvl9ryky3iv73kr5i0q6c"; name = "gtk-pomodoro-indicator"; }; packageRequires = []; @@ -31412,22 +31308,22 @@ license = lib.licenses.free; }; }) {}; - guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: + guix = callPackage ({ bui, dash, edit-indirect, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20180207.952"; + version = "20180414.1025"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "1d400fd2f4b21e8fd834887198fe6587933a9cc7"; - sha256 = "03q8rq74zxil5aws18wysiyk8zxyp9w0sqxcnk79d1p5hdgn09p2"; + rev = "00c87a9cafa3d74840be02efa2516286515b6f93"; + sha256 = "0mbri7p7hm5bfqw8i8wl5yc5av13sd77bs15af44nv8p5gqx7wng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; name = "guix"; }; - packageRequires = [ bui dash emacs geiser magit-popup ]; + packageRequires = [ bui dash edit-indirect emacs geiser magit-popup ]; meta = { homepage = "https://melpa.org/#/guix"; license = lib.licenses.free; @@ -31919,12 +31815,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20171022.26"; + version = "20180406.2222"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a"; - sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl"; + rev = "d71cca7f5ddc8178f5fe331563edcefe91cc0bcb"; + sha256 = "1amg9k50nw90b1dci6bylhrdkfmwminxcx3hlxxwvfvdgszfs2s4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -32002,12 +31898,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "20180311.24"; + version = "20180331.208"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "d162ec82f4da80f72de0d28c84a4e7ef93197a8b"; - sha256 = "1b87i8c4i5801vsx0wwii0mk4l7z9cp5a58bj2pa3d8yy8qnwriy"; + rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947"; + sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -32190,12 +32086,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180315.2354"; + version = "20180413.335"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be"; - sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3"; + rev = "b72baa1183fabf5213e4d50a38358288f7af5a86"; + sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -32334,27 +32230,6 @@ license = lib.licenses.free; }; }) {}; - helm-anything = callPackage ({ anything, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { - pname = "helm-anything"; - version = "20141126.231"; - src = fetchFromGitHub { - owner = "rubikitch"; - repo = "helm-anything"; - rev = "0ec578922928b7c75cf034d1b7a956b5f36107ea"; - sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0d844b790661258bc9b73985ad7a7da37ba339ab/recipes/helm-anything"; - sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx"; - name = "helm-anything"; - }; - packageRequires = [ anything helm ]; - meta = { - homepage = "https://melpa.org/#/helm-anything"; - license = lib.licenses.free; - }; - }) {}; helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-aws"; @@ -32400,12 +32275,12 @@ helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bbdb"; - version = "20180314.1527"; + version = "20180412.807"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-bbdb"; - rev = "f4a0e9bb882febf126ec95af65913c6c23f8e826"; - sha256 = "06a2930mhnwzgl97salqccnfr4p6nx5rj94xf4dc844kriqhzy1w"; + rev = "1f182900207cff383d62d91e839b48dd4874f2a5"; + sha256 = "0m08zb1i6m8i0n590f1717p8dxb7w9d4mh3wnkd829zjhycradrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; @@ -32421,12 +32296,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20180316.447"; + version = "20180328.1147"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3"; - sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj"; + rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043"; + sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -32820,12 +32695,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180314.947"; + version = "20180414.2257"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be"; - sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3"; + rev = "b72baa1183fabf5213e4d50a38358288f7af5a86"; + sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32925,12 +32800,12 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "20160916.713"; + version = "20180411.2215"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; - sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; + rev = "cc000b1bf580577d032c9f0563168b6bbdd6d290"; + sha256 = "1z5z0yfj1h3852zn4sh0p9dl3viyfiqpw28jczqgm8rcng94rvbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -33114,12 +32989,12 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20180124.1023"; + version = "20180405.2228"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "6e05efc4612262b39732d2d82d606c48fd6bf46b"; - sha256 = "04iaxzx3r5f7jr42nycnvrrs3rx51nf9a20l2zpyz14i2g4pqjvn"; + rev = "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec"; + sha256 = "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -34059,12 +33934,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170727.1238"; + version = "20180415.2336"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a"; - sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; + rev = "c63c27f10d0cc409ab528d20700bccc52abbab26"; + sha256 = "1xmrg49b7r3ry85gizllnll4v6wk3qxmhwrd7d0jifx5df9v13f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -34122,12 +33997,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20171103.1155"; + version = "20180322.1251"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "feae8df22bc4b20705ea08ac9adfc2b43bb348d0"; - sha256 = "1y2v77mmd1bfkkz51cnk1l0dg3lvvxc39wlamnm7wjns66dbvlam"; + rev = "51dfe9871ae2851d8d82530346c8e0a846cdfd94"; + sha256 = "0zipg6zv62839n0px8sil86jdv9qlqy877kj1m8x3dln3c7pf0x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -34315,8 +34190,8 @@ src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "81a84a071c9ec9313b9b13e0c89b9e499268436a"; - sha256 = "0ipz4r2cdvxsrzgsrcrxchj8vvgfqz7whd61smfn7h6sakljk2xm"; + rev = "f4936509b4a5658ea325fc9f941f2e2e9e3018cf"; + sha256 = "020jg7mwyibd6c3lrzdsrc5jbn7vh6y6iyxfc6r28k8bwv4fggv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -34371,22 +34246,22 @@ license = lib.licenses.free; }; }) {}; - helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: + helm-pass = callPackage ({ auth-source-pass, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20180311.959"; + version = "20180415.2038"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "3171a90c33ea7baaf01da37ca048a538dcb58381"; - sha256 = "01wcc5lxnym66qgnviwsdbnzdmp4c1hyw524ii2jphhm8vyvd1k1"; + rev = "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb"; + sha256 = "13far24blzmcjyxkwnsqbx0g865p233bx21885nw59rp28frg538"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia"; name = "helm-pass"; }; - packageRequires = [ auth-password-store helm password-store ]; + packageRequires = [ auth-source-pass emacs helm password-store ]; meta = { homepage = "https://melpa.org/#/helm-pass"; license = lib.licenses.free; @@ -34500,12 +34375,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20180228.1125"; + version = "20180407.1842"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "20eb422df057533c6b2728f2a0871eec4f837d53"; - sha256 = "0iba3w6kir9ymisbv7bjsb0vmmai4m24kh34693lsh4x7m8mjyz9"; + rev = "213339b896eebff6d61778b2b1816301ab583081"; + sha256 = "1wjlm3i0ygcgy37nn1ljaxx9w7nw3pfczrmv5ibm2dyna88kafr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -34819,8 +34694,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "4310b26e69dd9569582962d0013ebc8c372730e5"; - sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34924,8 +34799,8 @@ src = fetchFromGitHub { owner = "takaxp"; repo = "helm-selected"; - rev = "d2609cdfce14052ab2d9c23761d4fe56966a8ed1"; - sha256 = "0nbfs5s6lshxib6kp20dzh1qbmq079hwcqwi1n61ank22qa9qw5x"; + rev = "6743ede584571319e4c29204197e9ff6b7ee97cf"; + sha256 = "199a1ycv6pi4kljv7ln0i59l85yr6ngvd3acjakq3416nnjlvhzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc087661e614d9f30c23fe4a65c020bd3656a29/recipes/helm-selected"; @@ -35088,12 +34963,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "20180309.833"; + version = "20180412.2325"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "497d53a81fe989c341a24c3e4a288f8777b0c6e0"; - sha256 = "1gil4y4n0glj5kksyh7r81ih9hlywx9rwp91a74g93zml0yf7rrp"; + rev = "986b7bd360a705053500c4ce2c9bea03dd7b24a6"; + sha256 = "19iklhpxgh5xx6h4dysf58nd46lmyb46xj601lf7kbwl6yq0y61f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -35361,12 +35236,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180316.1421"; + version = "20180407.351"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "b42bd5adcbf910bffec44022d1c99df7322d98f7"; - sha256 = "1bmf2cw3jj5yq2ggzmh8dmsv2wq0arikn0hyfdbsxh8qzpkxc502"; + rev = "5e9f90776ddfa64e11823c98406362bfabc03a3c"; + sha256 = "1zwnh03ifkmq5r78m714yxha9d0j7bflb78f5jak58f3ympnms76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -35781,12 +35656,12 @@ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20170516.1355"; + version = "20180404.1216"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "b51744bde1287979f2d948f46501bd6ed0897f69"; - sha256 = "17xbd1kiww762dibws48gwn682g1bxy5rb7np5alqhiiw1l13wdw"; + rev = "a968436711520d4728c0b6c64279eb5eae7e0e5d"; + sha256 = "0cbdhxmd2a2pygnr4fb246dxyqggv2h8f5q2sflbq05jb81k5fal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -36323,36 +36198,15 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "20101130.443"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20170621.1257"; + version = "20180327.1716"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; - sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; + rev = "54d6562ba33182b16a7225c5fe6bb17a68025302"; + sha256 = "1jkxvik625rqbazbm8r83pcdmd288g26a4vvchsp4717k82sklkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -36511,6 +36365,27 @@ license = lib.licenses.free; }; }) {}; + honcho = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sudo-edit }: + melpaBuild { + pname = "honcho"; + version = "20180319.1441"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "honcho.el"; + rev = "fd3306f5cb870b557fc7d700fcb0a560feb3fbc7"; + sha256 = "0pdpnn206nfkc8pl36lxc2jfrmii8ai1gvf21ycx0r37g9q64qhq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/76487b6776d148325c0200d2f788815f115feac9/recipes/honcho"; + sha256 = "1ywx67dmvackfx19p4fvrb8mm27a7pri3m3bwr2acwd29lrrid2x"; + name = "honcho"; + }; + packageRequires = [ emacs sudo-edit ]; + meta = { + homepage = "https://melpa.org/#/honcho"; + license = lib.licenses.free; + }; + }) {}; hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hookify"; @@ -36532,6 +36407,27 @@ license = lib.licenses.free; }; }) {}; + horoscope = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "horoscope"; + version = "20180408.2341"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "horoscope.el"; + rev = "f4c683e991adce0a8f9023f15050f306f9b9a9ed"; + sha256 = "17k4j4q19l4ahxlzzic1jlbbh7l378j9vgnrcrvpm0lxa9ipclk0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/180248c19160940a208b32fa7a9660a838f68de5/recipes/horoscope"; + sha256 = "1y2nzhdl7ghi5l3iyzb04xics7gr5981jmb5z5y8y1z04xhqpfs6"; + name = "horoscope"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/horoscope"; + license = lib.licenses.free; + }; + }) {}; hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "hound"; @@ -36744,12 +36640,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20171017.141"; + version = "20180412.1244"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "a0b55cba65a225df8d9e17a3ac448ce9e8ec962d"; - sha256 = "0k23xz34ksd6n9xa8anbpvx07fymflyxdggy2is2kp0vqg66pv5q"; + rev = "315a8f23cfd3e87642ff9e30ae3300c7a84244d5"; + sha256 = "0pjiid5a16xx9n5bvfff612mpli00y9nbzjapn9f1y79yl99yvxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -36933,12 +36829,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20180308.2201"; + version = "20180411.1231"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "ca874a29eace152027f982b9720e3962c57a06b1"; - sha256 = "0s1z53v95dnygjp48gmny6a9wq4740rmsaa7p99hlvgqnksx0mzq"; + rev = "d72192e36aeeae1c7784c95569cc330981465714"; + sha256 = "1ld1q06i2srnwz1vkwf023vmcranb76xvskhclb8bmwk7gimz95s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -37078,12 +36974,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "20180303.1356"; + version = "20180322.848"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1"; - sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc"; + rev = "0f3b412dc7688d99ea8c8810dd5e57a70d580b59"; + sha256 = "1hqblgk14qrjd339p9hm640q11mixkhk5jd72sjja74xhbaxciab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -37141,12 +37037,12 @@ ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; - version = "20171222.2000"; + version = "20180324.2025"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "bfa02c76dabdc02557b67fa556969bc74e255023"; - sha256 = "0isgy5nkcbcf56p4f7xaf0shi4ja99s23gbvan6fimf6ra7qw4i2"; + rev = "1e89bfa7cae0629d29f24af3d81774b88b3cede0"; + sha256 = "0y0pvjic5n5wmkrjzjjnhz2xaknib6w5p01vgv2jf5ylwq84wray"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; @@ -37477,12 +37373,12 @@ ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }: melpaBuild { pname = "ido-flex-with-migemo"; - version = "20170319.431"; + version = "20180323.456"; src = fetchFromGitHub { owner = "ROCKTAKEY"; repo = "ido-flex-with-migemo"; - rev = "c620934f50b9713693eba8e23f88c2aaa8510708"; - sha256 = "0aymvbf36ph0zaff38r5vd7q0z3kv8wl3ivakhaybpsa2zvsgvxf"; + rev = "9684ffc47d838e82d611d0955b390d8387cf5741"; + sha256 = "06wi05bqwr1va589vzcyakjvh2z3vnn17ccbx0cgb7b3l8md73qs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo"; @@ -37726,27 +37622,6 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "20180216.949"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec"; - sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-vertical-mode"; @@ -38042,12 +37917,12 @@ imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imake"; - version = "20171006.450"; + version = "20180318.1559"; src = fetchFromGitHub { owner = "tarsius"; repo = "imake"; - rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; - sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + rev = "7df5fb9684a0288313ef5f64594078d477105959"; + sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; @@ -38063,12 +37938,12 @@ imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "20161008.1357"; + version = "20180318.1327"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "a879ddc36fedc30311693f308f414c520fdfc370"; - sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs"; + rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea"; + sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; @@ -38144,27 +38019,6 @@ license = lib.licenses.free; }; }) {}; - imgur = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "imgur"; - version = "20120307.225"; - src = fetchFromGitHub { - owner = "myuhe"; - repo = "imgur.el"; - rev = "ed952eb8f556c6fc0d982e2a689083504558cffb"; - sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d889f470cb81ac8a5f27e054755152867904feac/recipes/imgur"; - sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7"; - name = "imgur"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/imgur"; - license = lib.licenses.free; - }; - }) {}; immortal-scratch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "immortal-scratch"; @@ -38377,12 +38231,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20180307.1359"; + version = "20180410.457"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "e9db390fa273b02d4e637ab94244358792caead9"; - sha256 = "1cddcnmgdjdm9aqn5nr6g2p93rd4rb0xllyf7rimgf64xnqa96hm"; + rev = "3b758dff8a5153d6ad8c0d08385e5bcdd69232e4"; + sha256 = "1yv2nz8x7i0dv2g9485hqq8b5qq397fa5yxv5d8bn5msvj81vl6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -38419,12 +38273,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180316.1140"; + version = "20180402.1403"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "1295e58e9f7fb575149a7b9b2604547c7331b4d5"; - sha256 = "1c0rjnhlrbl396a5gjm7pnpqmxrbymr63l2ff0v5l2wjwfjrjiny"; + rev = "59868ff0433f7631c362ce25879bd4271d350ebc"; + sha256 = "1xh901krzwmvkj0rdq0hjbf41vsf92mr0w9vjb9ki660wnnjw8wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -38461,12 +38315,12 @@ inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-mongo"; - version = "20160815.216"; + version = "20180408.638"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "inf-mongo"; - rev = "649dc6ea8e468f1d8109568548eb222c71486dbf"; - sha256 = "19n0ddzgbqhbz3qjpvvw4nasrn2qvkczrdd8kk9h28v8xix5grzp"; + rev = "2e498d1c88bd1904eeec18ed06b1a0cf8bdc2a92"; + sha256 = "1m6skisj6r3fbxadpwwgf3a3934b2qvwb7zj975qksxq56ij0wkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b27d5354d4b30cc9dd3be730d79e5a5bc1f74/recipes/inf-mongo"; @@ -38797,12 +38651,12 @@ insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "insert-shebang"; - version = "20170825.438"; + version = "20180403.514"; src = fetchFromGitHub { owner = "psachin"; repo = "insert-shebang"; - rev = "adfa473f07443b231914d277c20a3419b30399b6"; - sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1"; + rev = "7bfea92ba1dae9d13d442e2f84f9fb6c05a0a9bd"; + sha256 = "01f2p58qsny7p9l6vrra0i2m2g1k05p39m0bzi906zm5awx7l0rr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; @@ -38922,12 +38776,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20180313.605"; + version = "20180409.1854"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "ebcf8a0935b57eb54351b78ed8c358cbef96f4bd"; - sha256 = "11ycc0ig2asndma38jhrqsy0s22m8ws6s1mjxk7p7armxca0g0pi"; + rev = "37af01509e55341ffcc81b56d1f30032a055d1e5"; + sha256 = "0fqm6r73lk2ysv2zif6mi7zkdzsxar8dxgc5g6j64426hp6jc5m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -39237,12 +39091,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20180308.1256"; + version = "20180408.429"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "847cf4e84f554fdcce49587747f0c18dae12b3ba"; - sha256 = "004b9av02q9165rfr6b3c7qfbry72s9bdkfs3n40f4fp25dcwq0q"; + rev = "94856c65ea9242aee5f57a66212ad12f5f39252b"; + sha256 = "1n6malmrxfzrzc9m44ycgp122x3hqkm6yhgiyna53z7bmx6whq70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -39531,12 +39385,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180315.1446"; + version = "20180415.905"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774"; - sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -39552,12 +39406,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20180316.447"; + version = "20180328.1147"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3"; - sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj"; + rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043"; + sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -39682,8 +39536,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774"; - sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39720,12 +39574,12 @@ ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: melpaBuild { pname = "ivy-mpdel"; - version = "20180304.50"; + version = "20180401.1207"; src = fetchFromGitHub { owner = "mpdel"; repo = "ivy-mpdel"; - rev = "d63c7ae492a3ce3288dc9f04cbc203d6a6f7c502"; - sha256 = "04bryyq67qi7zhkvvfymcjbz1w93xwmy8svp02293an9n67dirm2"; + rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; + sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; @@ -39871,8 +39725,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "4310b26e69dd9569582962d0013ebc8c372730e5"; - sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39930,12 +39784,12 @@ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xref"; - version = "20180201.1919"; + version = "20180405.1721"; src = fetchFromGitHub { owner = "alexmurray"; repo = "ivy-xref"; - rev = "4d2c437b479733e4159a356c9909ed3e110403a1"; - sha256 = "19gzsphcmkzyihcijb0609ykv98ak24p3z4k0ifil5r40iss1d1n"; + rev = "5c21aa14c81df1b75a4c7090729a41f755b74916"; + sha256 = "0qw3yqbs340k4mv0wy42nrn7r1wx537ypnr2idrll4v8fppfz24n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; @@ -40768,12 +40622,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20180213.755"; + version = "20180407.1048"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "d1fca4613ec90c2c0b8241f4603eba733dd1ac73"; - sha256 = "0sgpl03dqm4lv081l3ff3xp38c39q5i2miyvpsqdjmgnixg3nm8c"; + rev = "72ea5e35e0a66c7275cf4fe4af25a619761653d7"; + sha256 = "0xgkmadbbs3zid11pn6silb25kyng424ikgx0wib48yzcra0kdw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -40999,12 +40853,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20180305.1647"; + version = "20180331.2247"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "4125b49a6982a3eb36674962160118250daf665e"; - sha256 = "0783l752jxca5mb7y44fbx366zkrnninzy06yahidsmhzxpw5bhj"; + rev = "d76b4df4427e7bf4dfb2ba7b5dfff3c2aea52459"; + sha256 = "0m6pv3a6ji5dxjc8wp4z40rms63y4wz5k0bbl0ayi0k6miliik0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -41020,12 +40874,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20180316.552"; + version = "20180410.201"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "4bc2ff3b89c734ba7dfd9824d4ef5271ed09fb96"; - sha256 = "103kvzkvwc6g3jdwz1hin61b070zhd8q32h7v1qzgbnn1zczlplf"; + rev = "391e06c80e9197581c9d0b04edb5a65ffc149dcf"; + sha256 = "1w6pjhvcc8i7rmg85nxbnch3yxfcz81i7d1kdpbyra0i2ls7ikvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -41589,8 +41443,8 @@ src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; - rev = "67d516138172fd60782df94454b3d0bd247e84f3"; - sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs"; + rev = "292e07203c676361a1d918deb5acf2123cd70eaf"; + sha256 = "00rl5y7wra7kyp867ps2inx0vng9jrmym0sm4jhnk6pqj50c8i9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; @@ -41688,12 +41542,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180314.1046"; + version = "20180416.401"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "1576b4daca7c7504f7c91e63670d8026e9a3c927"; - sha256 = "1ycwpj3ciwahjinwq7mnb8fhph954bv11yfxjdhhfv3yhbyd2rng"; + rev = "2afd1be2a431b59e82ce22353b57bb7def851da5"; + sha256 = "19y5j2jha3q3i0l06bzywgxbc8q34sc1rh76j0wfvm6r6yxq1bwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41898,12 +41752,12 @@ keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keycast"; - version = "20180226.542"; + version = "20180318.1321"; src = fetchFromGitHub { owner = "tarsius"; repo = "keycast"; - rev = "c64742ee21cdfb816d33ad0574249982e5fb10e2"; - sha256 = "0pa87l92y2yvyghjvindvdaqy4dgzwxdg87ywzv043fl1s610c2z"; + rev = "46370b8a72922902921d3ed2fa194564568053dc"; + sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; @@ -41919,12 +41773,12 @@ keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keychain-environment"; - version = "20170118.626"; + version = "20180318.1523"; src = fetchFromGitHub { owner = "tarsius"; repo = "keychain-environment"; - rev = "7c08e8c4c3ea4d6eaee12d710a56793771f837c5"; - sha256 = "1mnqa69f584qzb62nn01bb4nz08gi7ra8b6xr0x7aphfqzk86kzy"; + rev = "d3643196de6dc79ea77f9f4805028350fd76100b"; + sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; @@ -41982,12 +41836,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20170614.1134"; + version = "20180318.1537"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "0130f32e5ade649dd2738206a80570e450906ef6"; - sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; + rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7"; + sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -42217,8 +42071,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "002e46f7db78c02cd1c12114bd9c15815cd97d83"; - sha256 = "0h6vs7nbdi7pnh1399r2brizcnyyp7r5wlwsqss5wvm6vscyyqdm"; + rev = "94d623f914745aab67715356db6731860a3e37e1"; + sha256 = "1hs69p79f27rdy8v4dld46qdnsszm7f4xx0nqlvz1pgy0wm3lq71"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -42549,12 +42403,12 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "20180313.1719"; + version = "20180401.521"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; - rev = "28521a8738943d7e3ceafbf4a54ac676b3ba5f3c"; - sha256 = "0nwflkrys84ik7abnr9pswk9qks4gyjd8ashbisqd82r2iljcqni"; + rev = "a27153f6a01f38226920772dc4917b73166da5e6"; + sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; @@ -42675,12 +42529,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20170917.2154"; + version = "20180409.316"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "bae4bdd240583b2253b4ff03af5295146e285103"; - sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -42968,12 +42822,12 @@ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lcr"; - version = "20180224.1243"; + version = "20180414.1256"; src = fetchFromGitHub { owner = "jyp"; repo = "lcr"; - rev = "6caa2bac7056dcf42c4cb88a1d5fbe1c9d71a9b4"; - sha256 = "0xvl0dqxwim6nmm6f9ddyp0r6j1n719zlgm2a3f49dskhnkn798z"; + rev = "49a59d80a4b55cc421cb55430ff8258887382c3d"; + sha256 = "1fds0s0if9m155v5hk5l0ihc6wr331qif5bc013w04hrlkn4v5jh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; @@ -42986,27 +42840,6 @@ license = lib.licenses.free; }; }) {}; - ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ldap-mode"; - version = "20091203.1015"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "ldap-mode"; - rev = "8761a835e90b990fb5fe70173ecdcd6f4b776cb0"; - sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/169243eedf4ee97fe01811a686f0798f2573fa0a/recipes/ldap-mode"; - sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq"; - name = "ldap-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ldap-mode"; - license = lib.licenses.free; - }; - }) {}; lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "lean-mode"; @@ -43052,12 +42885,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180224.1936"; + version = "20180416.105"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "3a10229bc1c12f36c9432ec3b459069a07f05498"; - sha256 = "1x0jg0vysab8592882pgbszrshr85ss66s8fsa6mhh61plxd0fw6"; + rev = "fa09a3bdd25a532b8ee1335e22b7427eb0d231e9"; + sha256 = "0hp7p6nmxp4ass17vnlx0r73k9gc4z8aknsmpwpyw1radx26vy1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -43367,12 +43200,12 @@ libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "libmpdel"; - version = "20180316.122"; + version = "20180403.816"; src = fetchFromGitHub { owner = "mpdel"; repo = "libmpdel"; - rev = "60239978403a802c09d52f4638d9533dac275f25"; - sha256 = "07y2mqz443n6wim1dq6wv22axkq4vv7y58ncm6cahl7jivkvkk4c"; + rev = "6e9b1bd6c3439c8e15be0f85eff94f95d1e987f6"; + sha256 = "03qcr2nc8x8h3cgb7fzk7r69b5fqpq63a3x8vd4fr6nps8bsb8gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; @@ -43434,8 +43267,8 @@ src = fetchFromGitHub { owner = "janestreet"; repo = "line-up-words"; - rev = "91f5f7e38fa87bda437091f6480acfb420be808c"; - sha256 = "07vmv8m7aip8xfjcv9plcxz9q9q4wdqx6smmc57z77zlnf27k9x8"; + rev = "bbefa954510801725070be50a7e13de6dc38f49a"; + sha256 = "165sg8j69lxqjfx9avbcclsw6n57x4qrkhd74zbmzs35xnji9w5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; @@ -43493,12 +43326,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20170923.855"; + version = "20180407.1440"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21"; - sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c"; + rev = "b350015ec4ebea9e84f73dcac808dd79b2882966"; + sha256 = "10gqpqq1xgjji7plljjkqzi0p63q65avjya0fsalrwvakzsx6xlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -43669,12 +43502,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180315.1216"; + version = "20180415.1117"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "0fdc50b703bb4ee41ba76df169382d1bec93668c"; - sha256 = "127frm285hblpcp1cbjfvfzbszf9b0ik72hhlvnzw7arqns611r4"; + rev = "582c9994688fcbbda454207e4112ad4a0cd80970"; + sha256 = "02frf3r2m0hfz3xf3vvcccxi4gvkl9fz5asrgrc0f6v45850mdv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43711,12 +43544,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20180228.1154"; + version = "20180414.1952"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "b4291857ed6a49a67c4ea77522889ce51fb171ab"; - sha256 = "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3"; + rev = "d2491462647fc6cffcc8f40c2a518a4948f2afcb"; + sha256 = "029jg6nggk5qvrskvlgb52ymgbakd56cnva1mgb10invr0wpswqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -43771,27 +43604,6 @@ license = lib.licenses.free; }; }) {}; - list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "list-register"; - version = "20091203.1015"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "list-register"; - rev = "f8bec5dc3765174de1089549947d9ca9a1cdbe5f"; - sha256 = "1pr7vmjmyildg44n7psg0zmj8a3kfsw5xmgh600fhs95wqxn3sag"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/list-register"; - sha256 = "0kza9xfhmxc8qia5yixx5z2y9j4wb1530rcvgxn545b903fs55kv"; - name = "list-register"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/list-register"; - license = lib.licenses.free; - }; - }) {}; list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-unicode-display"; @@ -43984,12 +43796,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20180311.2027"; + version = "20180330.1758"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "0c9f7a09a5c58d82bad706afd2e6e236e0cf42b8"; - sha256 = "0ii724lvcfs9jnlpd6kgrxjwlfmg41chywcp8j85m49al8b6pipa"; + rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a"; + sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -44506,12 +44318,12 @@ lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-go"; - version = "20171021.336"; + version = "20180330.255"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-go"; - rev = "d270b7c0bd893fdc73a97763e07706830756cad2"; - sha256 = "0i9l56dmkxcycn9a2ddj1zwa9cmzb5lpj6qn5x1k9q9yfk9hsc6b"; + rev = "00cbaac9419efc641fbe9e27ad0315d2c9a3ecb5"; + sha256 = "1n08vr2rkasz1w1bc43fi6zqg11vg7fa2a4sgp2cdrsn5hcp8nnh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; @@ -44569,12 +44381,12 @@ lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-java"; - version = "20171023.650"; + version = "20180330.30"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "5176f63e80e8f971563c0b98658db7dc72404369"; - sha256 = "07g259bx3vra2gf9mhxyd3qv1jb2s0lc0hndf0kvrcjdy29wwi52"; + rev = "35ad849fdd445be127f8df59ef1bb68effd0b7ff"; + sha256 = "0id9rjjzwybcyfa9ns3fm1py3zsm0z1l88dwlfh8pgkfjy7zkc34"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -44611,12 +44423,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20180203.52"; + version = "20180403.743"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "8df90bc27852da2cf05951870d94ce7920d8c09f"; - sha256 = "0pqk8p0z30p0j7lc5i2mvy7vmg8k5hphgwp4djhgm1ickm9pcx20"; + rev = "2c1f2f4cb24c30fcefb2d07dad3f40b058c90c1f"; + sha256 = "0pjzywlg981pvg4015w11b1dzrvqm1h3fjdl6qp6pv7iq2x9hxdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -44632,12 +44444,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180314.634"; + version = "20180416.622"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "6383fb9e414dc92eca41aed6e1b643accd4271d8"; - sha256 = "0xfg3dwi06z45y1hiff42lgyv5diz69hrrlsssar47vlprscmdxr"; + rev = "34a669b76ac0aa45b4917f882687ca7577814249"; + sha256 = "091ph46y6mb9rf0saar0vb230z1kf8w74f3dkcm7hs7b1k7khj3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -44695,12 +44507,12 @@ lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-python"; - version = "20171021.254"; + version = "20180404.819"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "035fed681ef18a774dcb82e361bd6b5b8778623f"; - sha256 = "0mhs7v1mc23h0rlcyinl3pf1qavjl4s6j5vrf9vc65sggsnw0x1d"; + rev = "e2fb53d191344dd73e26ffaaa4ac95cd6686dbd9"; + sha256 = "0s0w6sx7k7ys9i1w8zcf3hp9v3qzmcm4gl5pdnwr08ln73d3as9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -44737,12 +44549,12 @@ lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180314.556"; + version = "20180412.1807"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "6ba9d3fe2d9c0f239ebd8a124e10bc038c76fdb3"; - sha256 = "071bdnn1hs31bd479xs6dpyb98gf20q4z2k9sv0wfxmbjzm241s3"; + rev = "146efa7414a91090c494e24fac364011bc884f31"; + sha256 = "0076kjv1wpw079mbv35v0j609xhis7xrvx6jg54hnb7y5h5rkqqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; @@ -44786,12 +44598,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20180207.1216"; + version = "20180323.321"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "7909513c056ac85fd637aece6d3773ffa3b9b6cd"; - sha256 = "0bmsvggmrvcaq6yw856dk9484w5pjpfkkgia0p4w0f5rvvnfr8j3"; + rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; + sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -45101,12 +44913,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180315.1731"; + version = "20180416.852"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a"; - sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n"; + rev = "16785d7962cf84df12cf1e498b2c96519e84d235"; + sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; @@ -45257,12 +45069,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20180212.1648"; + version = "20180329.1950"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "79a2fccc460695df5547204ad6c05529868ba1fd"; - sha256 = "1ks17wl0h4a5rhwfzq47rf60192rxyvkwqhnp3fg9sa85b0nqc3i"; + rev = "f337f178a1b4d2e4c1199fa02338febe216ab902"; + sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -45296,6 +45108,27 @@ license = lib.licenses.free; }; }) {}; + magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-org-todos"; + version = "20180412.1542"; + src = fetchFromGitHub { + owner = "danielma"; + repo = "magit-org-todos.el"; + rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55"; + sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; + sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr"; + name = "magit-org-todos"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-org-todos"; + license = lib.licenses.free; + }; + }) {}; magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }: melpaBuild { pname = "magit-p4"; @@ -45320,12 +45153,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20180217.910"; + version = "20180329.1302"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "48cf02b8e4d7d4a83bc22cacd64cbf4e6a266aa2"; - sha256 = "0dnfa3djgnfgig279v46xl4gz3lzjmc48nq27gdlksnkp1mwnn3j"; + rev = "a0b22e30d135d4f83a9227b3fa13b1377f9be0df"; + sha256 = "0sn9gi0qm3q6c63f1jd67pkc54r2gqk8bzh21x48n2x2v4f84s63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -45425,12 +45258,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180307.446"; + version = "20180410.1351"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "d3fc59ddf4f3a6179386e967ad9dfcd1facb6759"; - sha256 = "1x7ql95qf8ldzf4p9zd79qmvqh1zin96xair9rhlab0zmvk3vzca"; + rev = "76b0156323c9953a8c6f36ff483a2d528d8df9bc"; + sha256 = "0xg0284ca7w1clfyrd7lhiick6izj00bi9zn0hdq01h9lifardxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -45446,12 +45279,12 @@ magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magma-mode"; - version = "20160304.408"; + version = "20180413.727"; src = fetchFromGitHub { owner = "ThibautVerron"; repo = "magma-mode"; - rev = "528c96a269980dcc6b65e2e973510ff07e6b9fc4"; - sha256 = "1pq6ckxp3dcb2f6xfsd4jwd43r9d0920m30ammp39glgc39p9lsq"; + rev = "d8e41b3c0bc7d37be78fdbcabf6c13c9e182dfaa"; + sha256 = "1wlwgbj3hslfxl21nz5s7g0p4kdpc5ph58jp7mrz0dws5cw3sj02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59764a0aab7c3f32b5a872a3d10a7e144f273a7e/recipes/magma-mode"; @@ -45572,12 +45405,12 @@ makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "makefile-executor"; - version = "20180315.632"; + version = "20180410.30"; src = fetchFromGitHub { owner = "thiderman"; repo = "makefile-executor.el"; - rev = "06b2efa4539c319ab36806b0bd8ea87e214aaa74"; - sha256 = "08rjj3bdnvmaxiwnys4cjd19wkkk06wv0l58hpn3c7vi077ps3cc"; + rev = "054c5460616d1903499d49190ac79074e9bd1c52"; + sha256 = "0axqm8hd2hz1a4qh02p7kyvrb0mab8iswpypij3q05s5yxidv1vv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; @@ -45761,12 +45594,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20180223.2121"; + version = "20180403.406"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "90b828f94872f6bdb9eb3c06bbc2a9c20e017f22"; - sha256 = "0n5kd7fngxs3zc7scv34mfr7ppl5nkg8mnvgxwsnkghlv5a76wwp"; + rev = "f230c871de8aab1be7b7a9718cd930548a90baa8"; + sha256 = "1zqshxwbsyz60bag6dcabmx8a49nmnpad5kvpy1c6gvqhjr8axvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -46489,12 +46322,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20180218.538"; + version = "20180405.1845"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; - sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; + rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788"; + sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -46783,12 +46616,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20170508.22"; + version = "20180329.2022"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "36b36a154dab22e112cc19675cfd73478f2a5956"; - sha256 = "01wqa5pf6zjxgsgzqw0pnp278vfd7livfgyqvc24xfqr519k2ifq"; + rev = "abe7f589adc5eef0d53e1eeaba9ab28d01c91231"; + sha256 = "1bn78w2mslsh02m6rzrqdm70cfgx1kgw10ifnrcslc1vn6lwvd0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -46829,8 +46662,8 @@ src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; - rev = "ddefb4e98778d4568a96754df52e3a6a494f2ad3"; - sha256 = "17kzi4jyjbmqkkadaz0h46cjw3dxv5qcy27rpfrajhbny72x9j1h"; + rev = "754480a9b6f2d62093fb7a264a5c4ac42fc57997"; + sha256 = "1z7gaij17yxk3ikxljlb54cvdcz0lhnm8wl0bpzpiycpnfkqxcy4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; @@ -47160,12 +46993,12 @@ minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minions"; - version = "20180306.5"; + version = "20180321.749"; src = fetchFromGitHub { owner = "tarsius"; repo = "minions"; - rev = "360e433fb8a0c62a3661434241ba29d2ba7bf95c"; - sha256 = "1az01ragbqwqipp1mah963l8vvyhcm003fa6rw24mfg6wv9pq58c"; + rev = "acac7fb0b04ffdf243775231690956d163474177"; + sha256 = "1065asbg1h2chd34cbja2pir93r5y8gp3wv3jv6sf5csa6yqk6c7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions"; @@ -47265,12 +47098,12 @@ mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mips-mode"; - version = "20170310.2149"; + version = "20180321.211"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "a13d1fc5b583a29f059f7794f2d83e59da439fa1"; - sha256 = "0ncvp52dnicy84wmnbxhm6djxhc8njrbxy6zwz2vylmy24z9948w"; + rev = "e6c25201a3325b555e64388908d584f3f81d9e32"; + sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -47286,12 +47119,12 @@ mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mixed-pitch"; - version = "20180314.1441"; + version = "20180410.917"; src = fetchFromGitHub { owner = "jabranham"; repo = "mixed-pitch"; - rev = "b76567bd0c55f72942e686b7de97a222d333b333"; - sha256 = "186s9ligb1b3hh54pdhfkvpzva5dkj87ydslyi3jjf7yrhvxgw9k"; + rev = "b6b1601c7a3eb9ab23e33192bc479bccc4dd5e7b"; + sha256 = "0g3mcbsjgcwg196ygj21i454ifyf0898r0xlkar1fqdl8lckb8zj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch"; @@ -47366,27 +47199,6 @@ license = lib.licenses.free; }; }) {}; - mmm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mmm-mode"; - version = "20180314.729"; - src = fetchFromGitHub { - owner = "purcell"; - repo = "mmm-mode"; - rev = "cb905bdc728fb3b5f9fdff8836d71b62bd717eab"; - sha256 = "1vyvp20g2dppnywa2clpvsvn5yac4pczj4f316dx63xp4zh7193l"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; - sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw"; - name = "mmm-mode"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/mmm-mode"; - license = lib.licenses.free; - }; - }) {}; mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; @@ -47474,12 +47286,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20171217.835"; + version = "20180321.1622"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "29376477b63e319875ad0969a8103f3864efb2a0"; - sha256 = "1j36ac827llm5ch58hs3yni4jfg0x5fypv5p1i30ffvb7dhn4mmc"; + rev = "33e1b521a8a8d0225df353b51f1e8a4588ee32d0"; + sha256 = "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -47600,12 +47412,12 @@ mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-line-debug"; - version = "20150307.512"; + version = "20180318.1525"; src = fetchFromGitHub { owner = "tarsius"; repo = "mode-line-debug"; - rev = "da44422eeb6a1f055b4ec2f822962c5162fce001"; - sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1"; + rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b"; + sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug"; @@ -47687,8 +47499,8 @@ version = "20180120.1514"; src = fetchgit { url = "https://git.daemons.it/drymer/molecule.el/"; - rev = "758dad6f5701c3a2e1146ba5895c08ef734a93d2"; - sha256 = "0syirvzjgbf1yvcvp00a19m4gi49yh1g95ba896mh741wrkilhb4"; + rev = "f3a1b19d2e0312bbb9ada00146994df84576abd2"; + sha256 = "0didxv3v3qnn3szxfnm1cmgpx0bhmjccdja3fhbhhdmp948904cy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7421b67dc51abf13bb028e467bb4c83f857a342e/recipes/molecule"; @@ -47830,12 +47642,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20180314.501"; + version = "20180402.221"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "da23ef64d4848636e47a026259526575381bd164"; - sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -47893,12 +47705,12 @@ moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moody"; - version = "20180316.340"; + version = "20180403.549"; src = fetchFromGitHub { owner = "tarsius"; repo = "moody"; - rev = "890218c6c175f6f3efbf584dd27b8702a16b8272"; - sha256 = "05q8l32mwz6sb40lflh6vwhnqj41sfmw7dp7lw3qlhg2skwjvc29"; + rev = "adf652f35cba1bb3d0f254e1905e2deeeb0fbdba"; + sha256 = "1zspq29n60r0kd9fy7d50zdypljigwcjb0qa5gkwiipnhpcnf9bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; @@ -47956,12 +47768,12 @@ morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "morlock"; - version = "20161008.1358"; + version = "20180318.1323"; src = fetchFromGitHub { owner = "tarsius"; repo = "morlock"; - rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5"; - sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj"; + rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834"; + sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock"; @@ -48271,12 +48083,12 @@ mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }: melpaBuild { pname = "mpdel"; - version = "20180316.115"; + version = "20180405.148"; src = fetchFromGitHub { owner = "mpdel"; repo = "mpdel"; - rev = "78bcaadd5471740a6c61a7e338086bf7a6ebfe54"; - sha256 = "1zgv6z3mp6bjw8akqhx6add00w9qclqf94mmqmfhbg3mqaky6zgh"; + rev = "82f98b94d0bfcb48b8ed9985ef8bf9202c8917f7"; + sha256 = "1fhcf1mm7pjjy9nyjr3lkqhn0xsp8bpykzk2pxdzfkidb1ca47bf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; @@ -48568,8 +48380,8 @@ src = fetchFromGitHub { owner = "sagarjha"; repo = "multi-run"; - rev = "87d9eed414999fd94685148d39e5308c099e65ca"; - sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; + rev = "3c5e44afd69aac2e0a5be118cf6249b757e2889a"; + sha256 = "0jknx6b973wlhmg01nymncqr2809kmjhchv75v92fas5yvn1pb3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; @@ -48669,12 +48481,12 @@ multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multiple-cursors"; - version = "20170908.1452"; + version = "20180406.1350"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "10752700084595bb24712c27ba70a2326302e45b"; - sha256 = "1hg693xq45bjxdla4drn6qn0np417hyvw6x3bmhfykg6lpibslz6"; + rev = "75dd6bf83af4eff83dc22e278c47264c1a41cd66"; + sha256 = "0cw6xcc1m4r0gdqrlj5w6kbyjwqbhhpvrrr7p4b1mhd4c2a7lhiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -48690,12 +48502,12 @@ multitran = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multitran"; - version = "20161122.1323"; + version = "20180320.956"; src = fetchFromGitHub { owner = "zevlg"; repo = "multitran.el"; - rev = "c0ce2e1b3706263946f9240a47c3f65ed4fc0afa"; - sha256 = "1dd82jlc865achy70ldjwkjx45p11sjj0snvf85r1dj4aywci6i5"; + rev = "d826eff6ada28799a9ff6c8a4c2884b2ef1e36fb"; + sha256 = "0rk8fidq8fp9k4m21wvkld3w8g13nbfpxnj10g35c16n5wa0ydkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran"; @@ -49110,12 +48922,12 @@ names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "names"; - version = "20171012.1214"; + version = "20180321.455"; src = fetchFromGitHub { owner = "Malabarba"; repo = "names"; - rev = "1d45ec50568eb2f5b55973f7ed0b48c68f9f13aa"; - sha256 = "1z0zdi9r6x6pqy2qfj9krkmbmlw9rlrgdvgn4dppfzrmrig8libr"; + rev = "d8baba5360e5253938a25d3e005455b6d2d86971"; + sha256 = "11wyha2q8y7bzqq3jrzix8n97ywvsibvddrahqcps1a1yqk4hzfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; @@ -49429,7 +49241,7 @@ owner = "yyr"; repo = "ncl-mode"; rev = "602292712a9e6b7e7c25155978999e77d06b7338"; - sha256 = "0a1pwhnllyb1q45gjfhply0q2p4bk208a19z9gaf635d7ck9qhny"; + sha256 = "0sv44hn2ylick7ywpcbij8h2vxdj06zridjdmcfgpv5d090dbl9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode"; @@ -49492,7 +49304,7 @@ owner = "rsdn"; repo = "nemerle"; rev = "59b28607968a9bee060b42eac55c69c37d1c0e69"; - sha256 = "1qba0zg37irnk35pgiasyslp9l0lfiysms1bw3znscay5s20lm8m"; + sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; @@ -49508,12 +49320,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20170711.501"; + version = "20180406.456"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7"; - sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -49801,12 +49613,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20180309.430"; + version = "20180410.307"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "0527060cc8b27dc26496a3a9b20ee6a8526e9efe"; - sha256 = "0iyj61870g84m6pr0vib3dj5dcrhrnwdiad6xzp8j2anf0gc23ii"; + rev = "6b0c1ef6e6cec93b0d17a714406830edab8cb995"; + sha256 = "1h5c5fsg610mqi7m0ddnkvc0l4952hdjic3hpbnmjaicnhszdgfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -49826,8 +49638,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10"; - sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2"; + rev = "ca041d88f4d610332aa48c801342edfafb622ccb"; + sha256 = "05wipm7cvhyf1fsd5awi44yzndllfsmg0i3xzdmml545ypdimk3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -49864,12 +49676,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20180215.1331"; + version = "20180403.1741"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "0ac0271f6c8acdbfddfdbb1211a1972ae562ec17"; - sha256 = "157vy4xkvaqd76km47sh41wykbjmfrzvg40jxgppnalq9pjxfinp"; + rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660"; + sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -50032,12 +49844,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20180125.1539"; + version = "20180414.503"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "5156e005d59453f2608b9c38e9fe92ba8df550db"; - sha256 = "086y8y5309hhmhiq9c5yqvya0fm6j3vxba47861ckwjqyp7d3ygk"; + rev = "9bffebc0f4858a06ba374f1d48a7dffd3537b93e"; + sha256 = "02dhplz597r5qp1mljy1npx2kzg07l938d2xivwy9cd6jlkj35ya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -50242,12 +50054,12 @@ nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nordless-theme"; - version = "20180215.454"; + version = "20180328.516"; src = fetchFromGitHub { owner = "lthms"; repo = "nordless-theme.el"; - rev = "aeecad74c19121fa2f68dfd85efb9a4f34e8a911"; - sha256 = "1ypwh4kz9kjxikmhgh8aac8ihnyinijsvsjwa8s4lc1j4nfzffih"; + rev = "31cf52bfa81cf312421533ccc4a26f79b03b6976"; + sha256 = "120d5wajjcimfzdmqn1kxav5l6ylpggg9rjhv0n65nmh829f1msm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme"; @@ -50281,11 +50093,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20180104.1635"; + version = "20180324.1609"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "a9f1c7c294526afb2a2ac18003a654ea4c780b7b"; - sha256 = "0pv6rpymhf1m10011hw5plsfz18d7gm10w396dc2rm05c9szffjr"; + rev = "5d510221d17862a252955d98046508bebcd14573"; + sha256 = "1pls4wny8f5pdfgmdg4c3cpsdy046hwmlaqlf90x5x9hp2jyibnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -50322,12 +50134,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "20180215.1206"; + version = "20180317.345"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "b0eab94b84464aa4508ccfee59af5b8df49666a2"; - sha256 = "0r4wy99kpdzs0c8b6ini8k0xixjrb48bbml3nz3sfxy3w7kb4kyb"; + rev = "b4959103619d94a7a1d5fe1d9a15887fc2b12b8f"; + sha256 = "18kqw9c2a6si1q55r7w8mmwhqfnajdxvrv9dckwxkc4pbgpjkk8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -50727,12 +50539,12 @@ ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-async"; - version = "20171114.1936"; + version = "20180410.2058"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "99a6f24191cacb343d6090ecc8c1c67f768b2e22"; - sha256 = "1cw62nsdnmllpkn4mqi80vp6s17yf6an418gvr06z8cxqndw07h1"; + rev = "703159f106ba918ccd4e3c053eb887840aea8e5f"; + sha256 = "06aax8k3p9h49sdy47v73a851b6xwkvz97xgcrplhrpi2w77p7ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -50751,8 +50563,8 @@ version = "20171103.1548"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; - rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; - sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; + rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; + sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/ob-axiom"; @@ -50828,6 +50640,27 @@ license = lib.licenses.free; }; }) {}; + ob-clojurescript = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ob-clojurescript"; + version = "20180406.1128"; + src = fetchFromGitLab { + owner = "statonjr"; + repo = "ob-clojurescript"; + rev = "17ee1558aa94c7b0246fd03f684884122806cfe7"; + sha256 = "1an4m7mpr345xw4fanyf2vznxm1dxbv35987caq1wq9039mzfaxr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9ccc0d2d034944cb9688d5e184fa5df95f6b31/recipes/ob-clojurescript"; + sha256 = "0h4qjz65k8m1ms7adrm5ypmjcjxx1nws1jmda88c4jjwjyz40jjf"; + name = "ob-clojurescript"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ob-clojurescript"; + license = lib.licenses.free; + }; + }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -51041,12 +50874,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20170920.2251"; + version = "20180416.822"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef"; - sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz"; + rev = "b68a0187e4f67e57891a3faae384d650a1cf31fc"; + sha256 = "0107xn1z2im8672lwsw4r7blza1gamgihy9aahxyf27jc0a2zvfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -51209,12 +51042,12 @@ ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "20170126.921"; + version = "20180328.1034"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "e70a9f9b96fd0fedcc30de7768c870f4b0ee1ae9"; - sha256 = "0vpxnvvmfxqwq1i6wl1gv76dgavcl4sg3f1ma42sq2bldpdn8am7"; + rev = "8e34b273730423f267138e9f9a0abe7718f3a5fa"; + sha256 = "0kn4dph1wfigh9l8r8ghxgnixjxawfh335kh4ypab1hb528pdq2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -52289,12 +52122,12 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20170724.2116"; + version = "20180413.2111"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "3b7417ac12f2710e88f8dff538670621064ef8bc"; - sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk"; + rev = "85fd01f5bde7cb3adb167a8e37e52865d49c9579"; + sha256 = "1isb6ym8c22f9y2wph6zy90x9nl4g51fal68vfklg8bq1pywzj7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; @@ -52310,12 +52143,12 @@ org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-attach-screenshot"; - version = "20160928.258"; + version = "20180330.1139"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-screenshot"; - rev = "1aabac1a2885d31a3d862cbeb31a635c3d68b9ab"; - sha256 = "04fylcv782sl00g5y30hjcg9z8q00lkzf89wq9g9za6dx013z33q"; + rev = "5eeb2eef690a02b95dfe171d38ec66c954719d65"; + sha256 = "10mzlqk7in6gjh6x9q0gc5slx536hc2dz2kndm77f8qaf9z7hw79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f545cd8d1da39e7fbd61020e178de30053ba774b/recipes/org-attach-screenshot"; @@ -52436,12 +52269,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180223.1455"; + version = "20180411.1157"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "22eacef9fd0e66508888016b5d33b6ce85727573"; - sha256 = "16mz2vv3p4x1x400ylx5321svpczsydzkkb93j21cmk3b6a1jibg"; + rev = "6857c9dcf11135eef40b8f1f86d10a71cecc86ac"; + sha256 = "092rl3vfkbj7vcn49bibc1s3m0479l0isbhb2w7xb06dh8k8j9ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -52478,12 +52311,12 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20170615.724"; + version = "20180403.1336"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "07e6ccda6756754a115d567f2ad3a760514b731d"; - sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp"; + rev = "8d3492c27a09f437d2d94f2736c56d7652e87aa0"; + sha256 = "19q83xgbdabkidx26xvff1x7kixk2wllplnwfsy7kggdj9wqpm9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; @@ -52524,8 +52357,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "8cec702f602b18da90b3d6207888a887b8e07750"; - sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; + rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; + sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -52541,12 +52374,12 @@ org-chef = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-chef"; - version = "20180304.1104"; + version = "20180325.628"; src = fetchFromGitHub { owner = "Chobbes"; repo = "org-chef"; - rev = "94427d5e48cadce45a906de16fff42676903fd9f"; - sha256 = "10hwbfhjz2bwiralgsqwzhjgjzfil51gs8qhig8vkbxq9brhcgd4"; + rev = "36fc59b4181456d7bd4c8227c34edbad600b08f3"; + sha256 = "0yvrxl24a0q4wbhmx2azsylwapih0xf6a5rhch3ppzhy4vyrdjcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef"; @@ -52772,12 +52605,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20180315.1220"; + version = "20180327.1429"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "3f568b163a8a26f22a9b2d9a90b85fcea89c67f2"; - sha256 = "1whp3cpdyxrip5id9ddajy0k04b81hrq12j9w5ir8244m1k5kkf4"; + rev = "a57beffd0f09b218a9487d1750960878c1d5b12c"; + sha256 = "1disqqfwjl366kv6xgc28w7zbc4xl9a0jmdj7w27mb00sxzfk3vb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -52793,12 +52626,12 @@ org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dp"; - version = "20160326.603"; + version = "20180311.123"; src = fetchFromGitHub { owner = "tj64"; repo = "org-dp"; - rev = "d9a18e8fb04c94d5d35236b37ee7db0afcb7d580"; - sha256 = "0misv6g1cql7qc3xhy56cn79pzvn811fvhvivvq0bdx4g0hpp2fg"; + rev = "334fefd06eb925c86b1642787b2a088aa0932bab"; + sha256 = "0cjx9428ypadvrlbfnfj6zwnfhdcay82q2f9x8v5gaffa6wrr7j3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f337375082da316ed07b8ce9c775b484b8cdbf6/recipes/org-dp"; @@ -52940,12 +52773,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20171102.556"; + version = "20180416.953"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "90a82ec72fb688ef98d1343c02dc3c6da9e4bbee"; - sha256 = "0fl9m1bgcmvxpdmb05lbna9snfrd8gbrn16c2w72b3asxx7acq94"; + rev = "4e1f949a6fb225e79e69cb8684c0629671b6b8e3"; + sha256 = "1nrcwjl50nycyraac2zwlx3346az7521icf1h718hqqw4r799ggk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -52961,12 +52794,12 @@ org-fancy-priorities = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-fancy-priorities"; - version = "20180221.1545"; + version = "20180328.1631"; src = fetchFromGitHub { owner = "harrybournis"; repo = "org-fancy-priorities"; - rev = "0998b27c02e81bc554e76fde3b7cac4aced2210e"; - sha256 = "0nlazpgfrv67vbb5w2pcwhsxf296f62xgw1zajrkp16gvj63hry6"; + rev = "819bb993b71e7253cefef7047306ab4e0f9d0a86"; + sha256 = "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/712902ae1cf967ceb2052266ed3244e92998f8a7/recipes/org-fancy-priorities"; @@ -52979,26 +52812,6 @@ license = lib.licenses.free; }; }) {}; - org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-fstree"; - version = "20090723.819"; - src = fetchgit { - url = "http://repo.or.cz/r/org-fstree.git"; - rev = "24e305c6443be9f45198185772eecfddc390a9ce"; - sha256 = "0ydsmjjc64r50qilgazmv5gzdv67vszlid67wskc2zii5ss0y01m"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/org-fstree"; - sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz"; - name = "org-fstree"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-fstree"; - license = lib.licenses.free; - }; - }) {}; org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }: melpaBuild { pname = "org-gcal"; @@ -53083,6 +52896,27 @@ license = lib.licenses.free; }; }) {}; + org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-index"; + version = "20180414.208"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "0dfe0a67979279345378ca006ab4f727df378aca"; + sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "org-index"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }: melpaBuild { pname = "org-iv"; @@ -53125,22 +52959,22 @@ license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20180118.31"; + version = "20180402.536"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "1d6f7ddf3baa296bf7ca7ed008f0d86c10397021"; - sha256 = "02r4h7l8mj5blxwsiv0zyfiwagmxckxdsi39vbx2kxjvxasv4zw3"; + rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800"; + sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; name = "org-journal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; @@ -53149,12 +52983,12 @@ org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-kanban"; - version = "20180313.1339"; + version = "20180410.1258"; src = fetchFromGitHub { owner = "gizmomogwai"; repo = "org-kanban"; - rev = "c240a1894b7ae4ed292657b4d3cf03db8274f451"; - sha256 = "12l9yb5dzhv9fgcl8nba5dh403bafx1klq2sw0n1v7zv82dic57i"; + rev = "d5f6c82c1f4072f5800b01b724ee980ea0373d0a"; + sha256 = "1xqx3iqv627wkpyz8b3frxgdm2y2zicfd5ansxw9yg2q7dxs6bff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; @@ -53233,12 +53067,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20180309.2241"; + version = "20180407.1820"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "e35c367e7dc1449e63916e424d4e7349c91f8c1d"; - sha256 = "0yyxji50cvpbrmwwqmsv48556yzd7537zzlbpng6fgsq93iq62v5"; + rev = "41ea9818b4e35555fac5d287a3f8bbf84c694005"; + sha256 = "148mw7wik58756k072p3frlb0hdy6sc2jsqgjzhp5pqsmd1chg7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -53359,12 +53193,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20180307.1029"; + version = "20180331.1231"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "abeb48573a62b62c57f63fc89fff31c4d47141e9"; - sha256 = "17pdx7kc3zk5yx4i10lv421zqv6a9xn37gzyd1h4vljjgs81j4yz"; + rev = "32cdf41079ca67c5906a10215eb7fbaefebab994"; + sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -53601,8 +53435,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "8cec702f602b18da90b3d6207888a887b8e07750"; - sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; + rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; + sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -53622,8 +53456,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "8cec702f602b18da90b3d6207888a887b8e07750"; - sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; + rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; + sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -53657,6 +53491,27 @@ license = lib.licenses.free; }; }) {}; + org-radiobutton = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-radiobutton"; + version = "20180321.1535"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "org-radiobutton"; + rev = "15777e9b389cd93eab6c3c2f967e64a5b7f247b0"; + sha256 = "1mysrs3m9bmw66r4hrh2bssfhgp56rbhnkcc4rm4d5slsbak10fz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/105043d8cfcb62ed89ddf9870f615519e6f415e7/recipes/org-radiobutton"; + sha256 = "16ly42iyfh7d34yz4bvdpj3zrlwkw3kmh82gwr25a05mlsdc1d93"; + name = "org-radiobutton"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-radiobutton"; + license = lib.licenses.free; + }; + }) {}; org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; @@ -53768,15 +53623,15 @@ license = lib.licenses.free; }; }) {}; - org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: + org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, htmlize, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20180310.1908"; + version = "20180409.813"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "b4bbc9774c741c299a3a232036342f89905910c8"; - sha256 = "1ddksbznxq7cpksiqm4cx2k2c442vrm8dsb1ii6xqvnm32wsx4bf"; + rev = "57e14a9e1c91c47fc46eb63b51e0b6585dfec977"; + sha256 = "129g1yzx5qkmy4s44czmmdk5ffvv9kdn0kpxcky56ndsyvnkz35p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -53789,6 +53644,7 @@ f helm helm-bibtex + htmlize hydra ivy key-chord @@ -53845,12 +53701,12 @@ org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-rich-yank"; - version = "20180301.401"; + version = "20180325.1218"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-rich-yank"; - rev = "5d9bc7f474187013a8e1cdc5fc3dc86c41385873"; - sha256 = "144cyi5k0fjnzdrp9hvhnlxshxhf6jhagiinzaw5aklswz0qs1w5"; + rev = "ba7eb7ba8d25dbf053b1f746061a4442375da437"; + sha256 = "0c6prl8wk9cf9rnr9ymwj50zv0gahbrwqjdqn0a46sflsaycb07i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; @@ -53908,12 +53764,12 @@ org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "org-send-ebook"; - version = "20180314.14"; + version = "20180401.1015"; src = fetchFromGitHub { owner = "stardiviner"; repo = "org-send-ebook"; - rev = "c41b6a69a16e73dd64ff1c7353d402e03a2003e2"; - sha256 = "0j962vyvgavs9h6grayy4c6frba3ksv5n8rklgicwj4zx53b0blf"; + rev = "efa80f3c1a26347097a16eca4dda2610627fcdf0"; + sha256 = "097cpr9v0c03117z76cy0b9faq3zjvi45anvgrw4bkbgs5mh9x2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook"; @@ -53929,12 +53785,12 @@ org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; - version = "20170706.646"; + version = "20180402.237"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "9dea733006ae53902e6ec91fb11ff058229afe84"; - sha256 = "0gyhhcr54myg0r4pjc5z4mkmpc2xnw3ymykz3m0sm589q1i1ym34"; + rev = "0ce09a3c27f6ea862b6dd121cb16a192cee0e9c4"; + sha256 = "07hx4d8a2m7kj151zjc0920l6h0c0d7jgvravp2n5rgcb76yrlnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -54206,8 +54062,8 @@ src = fetchFromGitHub { owner = "takaxp"; repo = "org-tree-slide"; - rev = "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134"; - sha256 = "153bg0x7ypla11pq51jmsgzfjklwwnrq56xgpbfhk1j16xwz9hyf"; + rev = "9f1b898223f3dafd15a384e0d06da8f09bd55cb0"; + sha256 = "097p6wyx8fabwmsg8nvv8zlmk6fr8wgbckn5pz8vdzjwp0kbi3s5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide"; @@ -54223,12 +54079,12 @@ org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: melpaBuild { pname = "org-trello"; - version = "20180310.2352"; + version = "20180330.2331"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; - rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c"; - sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc"; + rev = "e2e8a3d45057645e4caae7d46a79d2d9be2894bd"; + sha256 = "12yw54hg1lhfxw6mvxjsvbiv7cg1zwm3ccsl7g127vbf0yp2dhrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; @@ -54265,12 +54121,12 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20180124.229"; + version = "20180415.2219"; src = fetchFromGitHub { owner = "tesujimath"; repo = "org-wc"; - rev = "6ff202a4612fe65b4e96bd551893fe8df67b0f51"; - sha256 = "1yqiqscj7cmnqd4s1lgbf7jbhcqlf3bwr52sabz7mqfs4iwdryhl"; + rev = "d22b4cff3e1157ca468b186eb789ca62b9214abd"; + sha256 = "0ysnydpm6lviak3mrqifim4zs2lffbjiv9nvb33qs8mi1dq2igji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; @@ -54526,12 +54382,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20180217.1320"; + version = "20180318.1301"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c"; - sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax"; + rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7"; + sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -54547,12 +54403,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "20161104.1800"; + version = "20180318.1323"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; - sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; + rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d"; + sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -54838,27 +54694,6 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "20101130.448"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; @@ -54922,6 +54757,27 @@ license = lib.licenses.free; }; }) {}; + other-emacs-eval = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "other-emacs-eval"; + version = "20180408.648"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "other-emacs-eval"; + rev = "8ace5acafef65daabf0c6619eff60733d7f5d792"; + sha256 = "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/75b6391726b0d5069e036930c2c5fa177c4e3422/recipes/other-emacs-eval"; + sha256 = "07sr5bb6x9w450cvfg32darg6jlwg11n7c1qhhk0ijcrnlsm09n7"; + name = "other-emacs-eval"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://melpa.org/#/other-emacs-eval"; + license = lib.licenses.free; + }; + }) {}; outline-magic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outline-magic"; @@ -54985,6 +54841,27 @@ license = lib.licenses.free; }; }) {}; + outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outlook"; + version = "20180330.458"; + src = fetchFromGitHub { + owner = "asavonic"; + repo = "outlook.el"; + rev = "77f5199f573a67700cb8d4f736cea5b6bda8ab0c"; + sha256 = "0rhivgwqnfdvcl5vh9lmg6yaz36bhkvfmj590qxcq18zj1529mfh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook"; + sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k"; + name = "outlook"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/outlook"; + license = lib.licenses.free; + }; + }) {}; outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outorg"; @@ -55261,12 +55138,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180314.2012"; + version = "20180403.1111"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "8c792bd2c4899fae6753689198599c8c730fc116"; - sha256 = "1d6ni4i36srnh4b8f2v1279z67k1rd877ha8rw6a44vjyanzxcvd"; + rev = "15a6df059f5eac0964c075c1386ce1c83cfe979d"; + sha256 = "11vndvwq64s7kc8a706favp7x7jc59sqwgs00sknfzznmpyy0xki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -55681,12 +55558,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20180205.1521"; + version = "20180414.938"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00"; - sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m"; + rev = "cf202c0a93bd5aabea59d16ad7ddf8c292c05990"; + sha256 = "18icx58yqig4c7zdvjz8jrhilbv5ygdyl56473mz1zyhvb3q42xy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -55723,12 +55600,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20171201.1903"; + version = "20180416.100"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "9abfb14d9ad903ef73895a27b9964b5e6023d752"; - sha256 = "0brd8zhiyn9kpbc0za455vjbb5v49i2pj3hhj1lbdcghzwq39jvi"; + rev = "6929545b6c116bd3eb12d3481a78f381c759e6fc"; + sha256 = "19fj94i4ai1gzj2y2b2klw7xdsh4aki8zr4840lffn4a0f16nc7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -55783,22 +55660,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }: melpaBuild { pname = "package-utils"; - version = "20170222.2352"; + version = "20180317.1134"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "3cbbc2ff50ecb5e6fb20a309cb07d74ca10d4d42"; - sha256 = "1bp04c2ljcgxf590yv05wzvqz7b7ih22h343g7rwdd5l3cli43km"; + rev = "652531caf1a1df916d2185e7f47085bd0509c940"; + sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = []; + packageRequires = [ restart-emacs ]; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -55807,12 +55684,12 @@ packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20170819.942"; + version = "20180318.1029"; src = fetchFromGitHub { owner = "emacscollective"; repo = "packed"; - rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a"; - sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm"; + rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa"; + sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; @@ -55975,12 +55852,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20180122.1325"; + version = "20180415.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "f531518bd9952d39af8605f461fc43aa6b6fa5f4"; - sha256 = "110jnj7yp6j2qj5ar72c5kgkpj43b4b82ipq725xivk6zsvrhicr"; + rev = "8fa25d06fb2ae6d992e738a10d8b2150e109d9bf"; + sha256 = "0p50cfmwgwahb1czqvgx2kvnd3k46zl0pybvxlyf45y4c4kr8wjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -56084,8 +55961,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "3059378379a6fbd0363cd14fe6227c27739af4e1"; - sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -56225,12 +56102,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "20180124.352"; + version = "20180318.1325"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "166975683225367c866e6ae6f6acb88d24e21a35"; - sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy"; + rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4"; + sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -56372,12 +56249,12 @@ pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pasp-mode"; - version = "20170803.1301"; + version = "20180404.1000"; src = fetchFromGitHub { owner = "santifa"; repo = "pasp-mode"; - rev = "6511193677d6113fec1171f476c0db3be242ee15"; - sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg"; + rev = "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92"; + sha256 = "1ar4vws3izzmir7m870mccci620ns3c5j26dcmwaxavhgw45wcmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; @@ -56897,12 +56774,12 @@ pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcomplete-extension"; - version = "20140604.947"; + version = "20180322.28"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "pcomplete-extension"; - rev = "839740c90de857e18db2f578d6660951522faab5"; - sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6"; + rev = "3d7dac3de9e81604e4ed93c344cf4d44ebae3bf7"; + sha256 = "1qrlp066rbcafn67mmbg48fkxw7ai6ni8b3asmm8w623xhd63v1g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb8a938418f84a5b0ede92e84a516f38e4b1011/recipes/pcomplete-extension"; @@ -57086,11 +56963,11 @@ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pelican-mode"; - version = "20180217.317"; + version = "20180401.148"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "524c001eed50ceee40095d6680787e435b9d3624"; - sha256 = "1559x7wxmflgzjykkbdsgw61zayswpil940n71979qkgqzcc5ggq"; + rev = "c48bd6c3b7369787a09923c53b452d9ec460399c"; + sha256 = "0b5sizmbf05kiwrq0n45scg95jg33qar70gi2vsqp4aaqryipccs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; @@ -57189,12 +57066,12 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "20170110.546"; + version = "20180414.1044"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; - sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; + rev = "85d753a27c198cc3611845ca144150d3baf4e3d8"; + sha256 = "08iypb0pbscbqcvg6p81rmazr5b7kdavjg2z9l37jha4vcb3nbcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -57546,12 +57423,12 @@ phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-search"; - version = "20170310.237"; + version = "20180321.1829"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search"; - rev = "a81c4ea203fcb572f6cc37cc658d6b01453bef9d"; - sha256 = "1z3640walrdk2c90hj47xvlpm6xd5iblxvn7i16krdfz735i4rr5"; + rev = "9a089b8271cb1cff9640848850298c9ec855286c"; + sha256 = "1gr5plcbrfdc4pglfj905s89hf8x0kc083h30wcnd81bnw9jwz1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search"; @@ -57777,12 +57654,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180309.822"; + version = "20180412.1002"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "b67b34c43c6e937b70fcf87cc324936ef117093b"; - sha256 = "0z3byyy5wd2h9ab8wnhyfj3xymwz3dxq37caxjfyspzsgaviwq4c"; + rev = "ef69a8b63f70a89694087ab0f97545d103ad952c"; + sha256 = "0njhhlpv93rkskhzj6wyxyvvx839saix6d96x0ipairxv1arcj3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57903,12 +57780,12 @@ pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pianobar"; - version = "20171117.1522"; + version = "20180409.1906"; src = fetchFromGitHub { owner = "agrif"; repo = "pianobar.el"; - rev = "68fe0ed839f6775535081b3ae0a946ccaf11234a"; - sha256 = "0ycwahbn7fny3slmh5xkfv7vk4qj95jydygdk6pzzx6drsdhnyza"; + rev = "9eb9b7fcb4790b11726302cbcec1b7951fbc8b0e"; + sha256 = "0y41hfml5l28i40fk279m6yngylkwrlv5wldhq3y1sp4ryahwl6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5659b4c7be20572aabe75caba866301393db012/recipes/pianobar"; @@ -58155,12 +58032,12 @@ pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pipenv"; - version = "20180222.359"; + version = "20180402.2127"; src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "364eaf1c823a28db97fe55e7fe85106107a23234"; - sha256 = "1f3xx606xvsmcc73mqml0w07xbkkm2xjirc4pfkb2883cfsk3fq1"; + rev = "7f1fb3dd1704e535e67860c58080e55fc89e07f4"; + sha256 = "1z1hdh6m10gam86zyhdfjksj2jxjrichdcz8qs3290lxy59f7agq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; @@ -58369,8 +58246,8 @@ src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "fce628885b54635b0287b3337626752b2725369d"; - sha256 = "1pcxl00iwhrsi57s6gbf3bch00pkdxbg46p8xryn1w5r16xzd9pm"; + rev = "cfb408fc840dae80a7d05d5648d27c18f04c00a9"; + sha256 = "1w2f953glxqfg8ilv537qznxj4kv4ddi011wyhkn27sv4wnky82c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; @@ -58491,12 +58368,12 @@ playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "playground"; - version = "20180309.1614"; + version = "20180319.243"; src = fetchFromGitHub { owner = "akirak"; repo = "emacs-playground"; - rev = "0781674b0d65b287d253f143c2bc51ee65ec5959"; - sha256 = "0jb8qkj2hbnz4j5xzky1n9kq035xzqadssa3s9zwm43cyn6nn6f7"; + rev = "f1b87ba65d8be28c4a8fc0fd8480d2da00e52406"; + sha256 = "0fqja170pbdrj1lz8dfpi53l07bf4vk18maa1kzcd2nyd569xxvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground"; @@ -58638,8 +58515,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "007245c860654e88d5228b341c9066e84f035903"; - sha256 = "091p7m0vs96wywysqbagirpkyn1iw1g4b5afnpv9ng0x4fvilq62"; + rev = "071d155f83e2c9c917db43f5452822a6dc30250a"; + sha256 = "1whbjblizl478gc7yc2yj0spwskzq8d9inpxian441a6jj9biah3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -58655,12 +58532,12 @@ pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; - version = "20170818.533"; + version = "20180402.1809"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; - rev = "26e4583311ebc472f7bba59a1189f04938f2c03e"; - sha256 = "04cf97mwkp5rw0dvnspdbrycywjdv4mljl6lbjhbvlijj745d5xm"; + rev = "3eb9430b9db90bc02e736e433eb86389f7655189"; + sha256 = "0k6a9zzdi02g677cc699llk04i06yb7ddnlnmxndap5jszfyqwfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api"; @@ -58767,6 +58644,27 @@ license = lib.licenses.free; }; }) {}; + poet-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "poet-theme"; + version = "20180415.2212"; + src = fetchFromGitHub { + owner = "kunalb"; + repo = "poet"; + rev = "70b514373ea32c20ce4e46809b3336af1a69d2c8"; + sha256 = "0jsgd4fgz6xliyfq46xn3ky7hr5ma4577h8kgshsbdidzwmp6xrr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme"; + sha256 = "0pllyp4spj30g6ihzc91hzvnrvcg2zb49adj8wcmbzvq3hxnvls1"; + name = "poet-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/poet-theme"; + license = lib.licenses.free; + }; + }) {}; point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-pos"; @@ -58833,12 +58731,12 @@ pollen-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pollen-mode"; - version = "20160808.2000"; + version = "20180404.612"; src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad"; + sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/pollen-mode"; @@ -58896,12 +58794,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20180312.828"; + version = "20180320.1252"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "b15219a7a31adeebc80a060c42aed36d4b48d149"; - sha256 = "0xfl08cfgnms404vmc64mdihp49z00cyqyihk7i4fp1ag8cbja1k"; + rev = "30004b21714b53d22041514d905e1876c5cedd4b"; + sha256 = "0nis9dx73y90lqnh24j5ywrdmjf7aa1jrdgwxm53wjl4sfmk85r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -59316,12 +59214,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20180115.1942"; + version = "20180321.1948"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "2933f2b6d00a8cab39f73fc6231fac311cba5b29"; - sha256 = "0fxkz7rqj057bnxfqgh3i88waqxnla05dqw20v8njf9swchry0ya"; + rev = "af5ef31a33c3589a9be0b2a55a2741582e605efd"; + sha256 = "0zynj4pl9717xbj8g1mac3haiybdndb034bnqk03bb42iyrwy767"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -59673,12 +59571,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20180312.325"; + version = "20180329.1357"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "67b74d1354616f4761acd947fb4f89c6c8bd758e"; - sha256 = "0pnkw65kr046368xd29rpfbf4x7qd9h430knpy8rgf4czqqvl3hw"; + rev = "a07c611862ae6dad6cdf9186a7813e701dc6e072"; + sha256 = "1addcwmgd2i9jp327ccsw5vgiixw6k1jks2fwg328llln0gv18ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; @@ -59882,12 +59780,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20180316.2010"; + version = "20180324.2226"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "981ef7de7cd4d2465e95ae649993561783d85bc8"; - sha256 = "0za8a1p05xqss2n4y1pvmr686xzaqwqsnp8myc8d3xqpl5412ha3"; + rev = "fba757dcee67479e579c164ec0f4f930793de6cd"; + sha256 = "1c3lvq9n501dcvxa8xz9cg4hm7bazbamb5rbfxlqjk9b4gbf8hby"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -59987,12 +59885,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20171117.730"; + version = "20180327.433"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "348b11b237e87d87e784ab7accaef2bf97664bd6"; - sha256 = "1swlbndipa48hd6mhmgzi1x3bapdzn4cwd7j7a13wxfcj9s1jm9x"; + rev = "b5e516ef6a336bde32e4594408be15fd96b07e1b"; + sha256 = "06qwhf04wy67ils5wn9hyc1z2j1pq0kb1mvxkxzqglwdnaca00l7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -60012,8 +59910,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85"; - sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq"; + rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c"; + sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -60176,12 +60074,12 @@ promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "promise"; - version = "20170215.2204"; + version = "20180409.252"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "d3cad4e1f7825404828cd9f5b887f18d3fd83c56"; - sha256 = "1cn1xcp6yfxp642yibknngf456v29s2qq3y8bsc67ydxjkr5w4gz"; + rev = "f623fa7466983fd1ba7034371f599434c03da723"; + sha256 = "1ffk5scab9whn27xz4wyik5vl235ngvhx30fd05abq97d6l7hndl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; @@ -60327,8 +60225,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "ab95b1bc1eb964ee5f1fb48297344c5d37d35191"; - sha256 = "0abx3gs9x081wn2p3pc7v2s9rfyv0a1fmrzfwlrv2i4cx1axafig"; + rev = "320d56c833f835f40c56bdaf2a375768cdd1b334"; + sha256 = "0waqwqcwwv99rl0ays9maqv0y6l06vx6k8ygap21i69dn7mrj5nl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -60365,12 +60263,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20180101.1421"; + version = "20180404.215"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2"; - sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p"; + rev = "de22a50eb031d11c4771e62f8c705298bc5636d6"; + sha256 = "1sn2lw37382kl5d69c8wdghcr10cwwx7g5dgxgnmmfhspbkz6v95"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -60417,12 +60315,12 @@ psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20180314.205"; + version = "20180409.1056"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "6f7c8d6807c76fd351380b2f6f273d800736c5ec"; - sha256 = "1wc4fx5wqcqj2xzcch0wg5xr5vjdlqm04ljwz3cqv5ipdvqjz80z"; + rev = "faea8e5b3873a4c62a03c76a057cd0fd6fb0434e"; + sha256 = "1i1rjk72cwvfgxvqsiw2sqfwhsc8n4q89p94c96f3wm10rvlv7k2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -60435,27 +60333,6 @@ license = lib.licenses.free; }; }) {}; - psvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "psvn"; - version = "20151103.1042"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "psvn"; - rev = "23048d302858fc3a52c118652bd83491a4956410"; - sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3690f9af15a6470b76d953c349eed82833b79a7c/recipes/psvn"; - sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n"; - name = "psvn"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/psvn"; - license = lib.licenses.free; - }; - }) {}; psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; @@ -61066,12 +60943,12 @@ pyim = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20180206.1419"; + version = "20180324.2310"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "c670df2a338ca956b6103fd388f81a551bfc33f8"; - sha256 = "1pkjwcwz6xagamigsv25bxydda1yxzphw0xfclpi21raqnr9f1s6"; + rev = "78fe2db87d38fc64879621802e2fcf8b54b8acb7"; + sha256 = "1w5qswz1ybfzk1g5w8qlid836n6nsd5zpblfkijmss4nlkwxczgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -61196,8 +61073,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "03aa4ca2d6a78a4d9dc69438cbc76b982aca1569"; - sha256 = "0a8jdksaabm8ybpk0fzp58v9zy4vld1h857nwxf0crk68r50dv6z"; + rev = "56b5da6efd3a7ac934adbadf4d85abfc1d324d71"; + sha256 = "09c14bsfglvlbz0y7sx0di50p1iw033g5y8f3qxbwrxba3213pkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -61210,22 +61087,22 @@ license = lib.licenses.free; }; }) {}; - pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pynt"; - version = "20180203.2100"; + version = "20180410.1715"; src = fetchFromGitHub { owner = "ebanner"; repo = "pynt"; - rev = "92b3f0e7ee88dde641b9f62c50431f7c499dcf1e"; - sha256 = "1wn1gjql7g2dg7bnwqgx3r66b0hnxcmpmbh1wc5nc312wnklpz6f"; + rev = "313dd24248f26ee1257b8b20885c593d8fb19d58"; + sha256 = "05ik3807pv6g8rc66wyybwgnscjwgl2dn9yssn35rvb95cavqq77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; name = "pynt"; }; - packageRequires = [ deferred ein emacs epc helm ]; + packageRequires = [ deferred ein emacs epc ]; meta = { homepage = "https://melpa.org/#/pynt"; license = lib.licenses.free; @@ -61360,12 +61237,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20180121.50"; + version = "20180319.344"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "c9009f6753e05a4182674fdd3d9f80808de2dc2f"; - sha256 = "01r54skcxkjd6ihx7spx4rmp1b4x02yy9my93qgb4bkg3mwsbq5w"; + rev = "85b61649b5f66e966d55ffbaf90160c2b60ff410"; + sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -61493,12 +61370,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20180304.712"; + version = "20180415.614"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "f83c31a825138645dc55db49c5389cd8c7bf7b42"; - sha256 = "0xq71zbwfl0ijmljcsq74nxmm2pj8m3rbdpwpcdk2j2i6zx2wgr6"; + rev = "d7f89bd4fd3d3be7f6ef82caed51b4e7d1d754fa"; + sha256 = "1dmj4yfbwlp9259is8av9ggsx08dfhqj2jd18hvvpxbhfqcybi8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -61532,6 +61409,27 @@ license = lib.licenses.free; }; }) {}; + ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ql"; + version = "20180404.943"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6"; + sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "ql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; @@ -61574,27 +61472,6 @@ license = lib.licenses.free; }; }) {}; - quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "quack"; - version = "20160410.207"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "quack"; - rev = "c1c8e448d295cc1b5752104a63a5759a9c5fdf6d"; - sha256 = "0vhzwr2adkprjibi3x4lnsvjxishysma7fhpwzgg28l21qjqc0nm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cb571caa41ea51ebbfe952526785287d913d2836/recipes/quack"; - sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii"; - name = "quack"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/quack"; - license = lib.licenses.free; - }; - }) {}; quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; @@ -61616,22 +61493,22 @@ license = lib.licenses.free; }; }) {}; - quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: + quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quelpa"; - version = "20171207.1139"; + version = "20180325.1338"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "fc393aeb3bb1a9a35e603515d13c90cc008caece"; - sha256 = "1zkx7bpzmphhfwgqf5pfwf6qb4vjwgvhmds38vm6h2302hl4racx"; + rev = "1e57420158c158275c5a098951aca25651a41bc7"; + sha256 = "1lnvzl9a7pa0v1jzcf6n4qik4swmsm99y7bz9cscmy6i1hcd35b5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs"; name = "quelpa"; }; - packageRequires = [ emacs package-build ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quelpa"; license = lib.licenses.free; @@ -61644,8 +61521,8 @@ src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa-use-package"; - rev = "f276555d6bead02a0d869149f03a545d4d4265ad"; - sha256 = "0cmpfjkwx5mpiyssyglfnrfkfg7c4qr01b598z50vc1lyg6198i1"; + rev = "cd4820a34819516f26df0fe2e4d416bdea468e89"; + sha256 = "0wbmf0ihxldgrx43c3wiaapssn8qimcyaa3hg2x2j1q05c2qlgcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b581e411ef5ea3954acc2cd997c87b3b86777333/recipes/quelpa-use-package"; @@ -61871,12 +61748,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20180313.719"; + version = "20180401.1803"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "62c40b5a166f3d15d4ab82f5ccc0bbbd0fe90334"; - sha256 = "0v3myl2sfpk8b4n9xsnpwn37f7bzxyh99lm3ya1qj8p3qvmqszgv"; + rev = "aea74aceddf112cdfb918aa5ddb9842f0d56c744"; + sha256 = "0cqzj8qjcqwakikklx0yb193gyqvj5fvcr2acmlqzy8xwr0v65jd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -62501,12 +62378,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20180312.1514"; + version = "20180327.1634"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "6706358aa7adbfc6b551d8a2fd394287b01070e5"; - sha256 = "1m9j3gfz9nhlvdfxrn1qf6fysj6zjjzyvr4vs8wnd7zdv2s4cvrw"; + rev = "096bd8732ea0661f10d7f7c1c91ad1ca4cf51207"; + sha256 = "1mjbhnzq4j7pfapmxqhy6lx3f6py2wbj2xrri16npmn1qqmkmbjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -62633,12 +62510,12 @@ rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; - version = "20171114.2208"; + version = "20180324.121"; src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "f34089f176def79ecee5feda7dd79896f555bbe2"; - sha256 = "08kavajrmp3lxl9r67rg9710326ynywlklz73vdijpzjpyhp5al5"; + rev = "9ac0c71c2858b76dc5499f62c7c7fb7f9e8f16bc"; + sha256 = "0a0qf118gj2fag3j57zmli47939rn1jayvs2fwa4l280ipfvp2m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -62864,12 +62741,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20180227.723"; + version = "20180320.1312"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "8482615ea753ff78aad2f16565ff3a918e7f6435"; - sha256 = "1h6y2b0073xm996w4858w2xfhj97viq1fn674sfz21g93w4gjw51"; + rev = "8b9309f6344cddf9b5ef4b9c1fde9d910672e913"; + sha256 = "04n4nhxh3v8wjav67i1wl0qi626s2xpi001bn8qbxqipnfpidk9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -63640,12 +63517,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20180312.2254"; + version = "20180404.315"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "a3516855e12e58cef5894ddf1ca7f7b524c804d7"; - sha256 = "1hc85c0ffkiawy3ifln8i6rak3samdzlsyl5kz7rqgg8x9pzvaf4"; + rev = "d50bd106275f3ef7f77d0147857412fb065eef47"; + sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -63808,12 +63685,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20180301.650"; + version = "20180323.920"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85"; - sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq"; + rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c"; + sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -63850,12 +63727,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20180314.845"; + version = "20180409.902"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0"; - sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8"; + rev = "a0231e76808e94eb842c502fc9e10b53d3307ea8"; + sha256 = "0i6yzxfwyvbmfy1x5pymmjdli91ya6jgfq6wdjnwyrknbf6p76w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -64085,8 +63962,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "4310b26e69dd9569582962d0013ebc8c372730e5"; - sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -64102,12 +63979,12 @@ rtm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtm"; - version = "20160116.927"; + version = "20180329.808"; src = fetchFromGitHub { owner = "pmiddend"; repo = "emacs-rtm"; - rev = "08dc10458b56e72f1512896192b2114ef57e58c5"; - sha256 = "1ajks5dmsb5cyj0hzxbp3r305liwaayb8jds0wdnw4nk5anlsbnr"; + rev = "3e3d09387cb84801343ecca8fb02e82f213e7bbe"; + sha256 = "0cc07lhh27i1ra4alrwb6w322ddi6hw0498nkzf388arhn10h3wv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rtm"; @@ -64291,12 +64168,12 @@ ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; - version = "20171013.50"; + version = "20180323.1909"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "90e0fc89a2b28c527fcece7ee90d5783694a4406"; - sha256 = "1lkicxingcvs4inxvkrpxknylf09a506plbzx6bfiq9dicsnlw14"; + rev = "89fc364a837d7a78ecce34380f09c073a83e30e0"; + sha256 = "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -64522,12 +64399,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20180303.854"; + version = "20180322.127"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "42c98bbf3550aff91fd2a3f24637508b408d4cdb"; - sha256 = "0l0dk7w1jklg8sh5i8sxh6ggcyb9gna0n72b0icvyfihqn25qk30"; + rev = "07e16c6364bf0362f76c6aa46604453dec3ac640"; + sha256 = "0xjbv9q3mz7chjaz889hyji4xaff8ql2wmk0wir6bnyg6g2k58d1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -64543,12 +64420,12 @@ rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "rust-playground"; - version = "20170211.5"; + version = "20180317.1434"; src = fetchFromGitHub { owner = "grafov"; repo = "rust-playground"; - rev = "ff4149489c30a65817750428847217368bd995ba"; - sha256 = "04d5z33pv1xqsn539nfkyjh7dvf0kc0rwili1zr6817z0406k1qn"; + rev = "cbb8a32c5f69b5acd5e04519f55465b2b241c0a0"; + sha256 = "0791msvihb99ghknkvmmbjkp1zcvn39463y3qg6xj049h2xl9skk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground"; @@ -64585,12 +64462,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20180222.415"; + version = "20180331.118"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "4d10e251ca734548e48e7f0785b3b69a6e863f67"; - sha256 = "1pqq2mzrfam7lzilpgqnzr192dsisgxnnnkilyksqfk1q199p9my"; + rev = "42f874467dfdce59b511f883496ce2624b133dd7"; + sha256 = "0k9nmi014vb9c8rymy3w8xbnj1q85xlslpblacz78iqn1kr6wy1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -64606,12 +64483,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20180227.51"; + version = "20180406.108"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "5968b951bd646c003f2825f31cdf9da94d6f1cae"; - sha256 = "1ai8r6dmlvaa702yr74dbph97kp5xar3h147ahpk3vj1gh5irvnr"; + rev = "03410e6a7a2b11e47e1fea3b7d9899c7df26435e"; + sha256 = "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -64942,12 +64819,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "20170509.1215"; + version = "20180404.1139"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "20a92323c3edc060c521aa93edab9dad47646b4f"; - sha256 = "0h0wn5c1n2y3cyslz3kbhksvwy1rnwvb1995949b6qkkzwf0cb4l"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -64988,8 +64865,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "3e7fbfff14baf75c5f0c23496ac3fb5c5e6f8a96"; - sha256 = "12vs4k6ci02jw9l2z0iknm1mhs0w8kis2b9r5r1ip61nb9d43qx1"; + rev = "9bd8e87da64ffbdb1a41763a92e7feaf78652010"; + sha256 = "1sasl3r7fx3vy8w636sx7ahih7w6ihwzhnczi2vyxf5hyf478js9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -65759,12 +65636,12 @@ sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-navigation"; - version = "20171215.1007"; + version = "20180408.919"; src = fetchFromGitHub { owner = "noctuid"; repo = "emacs-sentence-navigation"; - rev = "b2fc2de3aaf1e2e7fd12d6d75a5b6c4b23614022"; - sha256 = "0s7xqs3r9ygc6vcba8ghsd7rbrgy7dkis3y1d36ik4w5dqh9qlvi"; + rev = "7c5d2edeaed01196aec25031782e89adeaa089f0"; + sha256 = "15za4fg7c8fsih86wz1npyx6gdmw0xhizklfsyfh84416dsmgswp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation"; @@ -65780,12 +65657,12 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20171213.1209"; + version = "20180412.1643"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "1b487722ba817347030b50df01491dbbff4b2891"; - sha256 = "0q8nnm5b6dp9qlnjg3hw7l863xiiajdfd4nk2i5p1gfx549mcdv5"; + rev = "fb7dd994f9fed518693475b2b6de67d518417783"; + sha256 = "0arg66j25ixvmbhlgdjw12gzwsa5wmif7qw1mzfzd0sghgdbmj0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme"; @@ -66389,12 +66266,12 @@ shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; - version = "20170523.238"; + version = "20180326.1757"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d"; - sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c"; + rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e"; + sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -67124,12 +67001,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20180315.253"; + version = "20180410.2035"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "b7e8aaee092a45ad96ea680a812cdb615463ad6e"; - sha256 = "1hlynbydgi194j9x2na66zdnf7i2r7iklyxly4jbq7jqqh1zybgr"; + rev = "411b1ec8385c431d2ad1a56525a981d8d63e1700"; + sha256 = "0ghnhcr9z7av9iwhdq1ww3fc0i11637xrri8l4w69dx3j435virg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -67187,12 +67064,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20180308.733"; + version = "20180413.1720"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "85ffc5ff9cd1d88e0b2fa10bbcd03d0c84768896"; - sha256 = "0wvfw7hk95zn78j6ry82gixz3q0z3wdiy7s3gwi8v9a8lizwq83i"; + rev = "26695c66162dcbb9dfd083c6e3b329c468e14ed9"; + sha256 = "1fj096yhvxnj47qvc0b3pw3vf7icxv2jdfa3nvap9aksj453xndb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -67355,12 +67232,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180221.1414"; + version = "20180412.355"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "486bfbe95612bcdc0960c490207970a188e0fbb9"; - sha256 = "0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l"; + rev = "7d12c47bc573c5497487cfba60ccb30bd66514d7"; + sha256 = "15wkra725r1sqzgpqgjs6shw5njlv116xinw4di9b41ih9qg98k1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -67711,12 +67588,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20180313.1752"; + version = "20180323.648"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "08993097c991070a3f804e797862a92a8bb4d59c"; - sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara"; + rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c"; + sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -67736,8 +67613,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "08993097c991070a3f804e797862a92a8bb4d59c"; - sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara"; + rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c"; + sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -67900,12 +67777,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20180308.1042"; + version = "20180325.438"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "3181747d9b84ed44b95fa95855609b624ce83d9b"; - sha256 = "0gv1k922w2sz1lgmivd1d5hh2gvv2w5zpvr51y94ddzpfmph4bwy"; + rev = "6eea872207c331c3df70caac49577b01926be45a"; + sha256 = "02qx8clgwwaggm2xmrsr0bxcapiipryyb5d4csm05xpbm19q7xv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -68236,12 +68113,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20180128.752"; + version = "20180320.2029"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7"; - sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk"; + rev = "43a4b37b1374de50e2022885077968af6d0e30a5"; + sha256 = "1xjhg3921gpgnxwr2grcrw9j9ar9faggppv030lyc4i7cx5qj357"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -68446,12 +68323,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "20171209.1350"; + version = "20180328.343"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2"; - sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd"; + rev = "9307486ceee18f4b622406b8d600360419e6d742"; + sha256 = "0j8vl26vpzmsfbpx23wj5c9b7ia6fdyr8advnk6vcbkcwgj8r9q2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -68488,12 +68365,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20171231.741"; + version = "20180409.853"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; - sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; + rev = "051128d7b7f217263c1aee5cb602338803d44ecb"; + sha256 = "1lfa1jbl5rfmvsk2cvsa5z4glvvg3qnhphksvkhinaha23369vhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -68810,12 +68687,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20171111.334"; + version = "20180412.526"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "ca20430271f80d46892d62cb7624b4dee6cafe72"; - sha256 = "1a9my43y64y4k7bizvxc0pdr7194vcf167jdiyyl577wxq1z640p"; + rev = "ca85233b443216f8519c401c58af6807b6d31740"; + sha256 = "1ssbvp8xc1i7bf51rb2n0pkbhqs741dq0i0akwc3qqjg2sblckk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -68852,12 +68729,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20180309.1335"; + version = "20180319.736"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "122b5b7edb0202610be7fcfd96b7a5e03b418de3"; - sha256 = "1pv0pv1bkp5syvkg2rss82m3f4cfx8s4726hxglm7ar72i6qy21s"; + rev = "3c1a613a36e80d10ecd4a536d690dca672d41242"; + sha256 = "0arg3sw1rrlkn12kag5zyx8jgn4xgfffj7ysxpyqag8as7i5mcwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -68936,12 +68813,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20171116.510"; + version = "20180320.1102"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "00527b8172ae61b667bc70a802c112132e06ba0b"; - sha256 = "1k8hg1mg8zyxr9bvfm2k2447arph9wk58yjbxgqlq4w5svrq79km"; + rev = "a00bb622c54086ac1ee96c265bf7fbef12c68089"; + sha256 = "0f919alnqbp5dnc4krgmnc9acqg84xs64fmzjc78gpbmfn0kyi0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -69017,6 +68894,27 @@ license = lib.licenses.free; }; }) {}; + speeddating = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "speeddating"; + version = "20180319.23"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "emacs-speeddating"; + rev = "df69db0560f19636a66a74f3d88c793bbb18b21e"; + sha256 = "0mhzjia900irv0ndiw6w2vzin1gvyaf48pghi16r562ci4lr963w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/01e23a3e2a2495e86aba60302dbd06f3b25768b4/recipes/speeddating"; + sha256 = "0b5lcb1inkcx94grib5ssv1qkbzxqryzm115qizlgfs04k8cwz09"; + name = "speeddating"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/speeddating"; + license = lib.licenses.free; + }; + }) {}; sphinx-doc = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "sphinx-doc"; @@ -69339,8 +69237,8 @@ src = fetchFromGitHub { owner = "leethargo"; repo = "sql-clickhouse"; - rev = "35308c9292622547a79c0cc2659db2fc9de42e93"; - sha256 = "12j9facwvwnwc8ga3nj9yddx3xp3kp28mih6lg4s1b67zj28pccg"; + rev = "2edccd94145c55a040a3a87193793f06cf01f64f"; + sha256 = "0zajd35i02h869mg6n2pn2fnb80ddny6ss1kap21b75p2gw79lb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0ef23e6825924094eb69bd8526a95d8fab210c1/recipes/sql-clickhouse"; @@ -69458,6 +69356,27 @@ license = lib.licenses.free; }; }) {}; + srcery-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + version = "20180414.636"; + src = fetchFromGitHub { + owner = "roosta"; + repo = "emacs-srcery"; + rev = "6eea761e039a9511cb49b2cd3967b498b06db979"; + sha256 = "0gqh4vn8f9d1jy1z8qw6qq5lgmbqywb9nbg1c3jrffgxcn1r414b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme"; + sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn"; + name = "srcery-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -69482,12 +69401,12 @@ ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssass-mode"; - version = "20171201.509"; + version = "20180413.2303"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ssass-mode"; - rev = "a95c4c9f99895cc582849b35e90ae13f1587ddce"; - sha256 = "1ldw72ggk22ih5j9fyb3bl0ngyfdkzfcyg97mp0mb40w8ly68qav"; + rev = "511fb0b7c41b5a479f9ea4b65f38b14454cb1401"; + sha256 = "199v7n8l9784hv2iqhqwf2na9gw20l22bf9dmi22sjmfsk8l9s7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; @@ -69524,12 +69443,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20180127.1301"; + version = "20180403.1638"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "31b2b41e33d315fff54ace8bc2234abc38adf7cc"; - sha256 = "02kw4h3hzpad39ir6y8cg8lnldd01cl0lm8p22kf4bf5f7f3sdlw"; + rev = "bd4f655adce484bfceee4bb816429b96bc35113f"; + sha256 = "0d3ppp4qs4n3rh0sla1x1kkrwl4fhlz1gvc9472vnlhva38ffxsn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -69566,12 +69485,12 @@ ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20180301.2215"; + version = "20180411.2201"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "a3f9ec5dc8ecf7caa7551be31e62a6edfdc542c3"; - sha256 = "130jrdj9y6cv78a71xsl6j9l79vnzf4081w6v1llxpyy1mn81a33"; + rev = "d0be94676f44078fd29668c6e1a790cc0cc02f88"; + sha256 = "0gc3pjzjgvznla5bl9n0yahsj8whs8jnicah5kv5zjgv99wslvb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -70362,12 +70281,12 @@ sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunburn-theme"; - version = "20171101.1126"; + version = "20180414.2312"; src = fetchFromGitHub { owner = "mvarela"; repo = "Sunburn-Theme"; - rev = "c57190f87e2e6c5ef6c7fbfd40964eb8f11b32ca"; - sha256 = "1b2d0iky9w8f0sww4wish55j2s2j1y2v4bjf3lk0yg2ysbspy3vq"; + rev = "995b389b7aa18b511718e9dcc68d7e1d9a2891a9"; + sha256 = "0skmxv4qmdncp79jd0kh5rsx7ff98r8kmzii9l9d0da3xmkvgx1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme"; @@ -70404,12 +70323,12 @@ sunshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunshine"; - version = "20160410.1317"; + version = "20180325.548"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "sunshine.el"; - rev = "11e49846a116bdec6e2e463bed2db4c2df9c8ad2"; - sha256 = "0jv1shacpxqbw6pv9rlkk8z84si85alhillhb9a2s6s36kjmybk0"; + rev = "ecaccac91010f8d464646a0360b1676be71e6600"; + sha256 = "0n9ppy22ijc2cgs5xix8nks7abn0shvh0v0f2ir1j7v1ckjsklc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0ff9a4ef4bbe8de722a4f77f4a56a851497ff1/recipes/sunshine"; @@ -70593,12 +70512,12 @@ sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; - version = "20151207.916"; + version = "20180401.1715"; src = fetchFromGitHub { owner = "CestDiego"; repo = "sweetgreen.el"; - rev = "a456dd7948a25da8ff007a142cf1325b4855d908"; - sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn"; + rev = "ffd7a7497db05e64031eaaffe170741b40ed753a"; + sha256 = "0whciwh6avhfb2qhpxfl63x3z097hcm7hwhypx8symydy3r4cbqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen"; @@ -70656,12 +70575,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180316.924"; + version = "20180402.1857"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774"; - sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -70803,12 +70722,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20180306.648"; + version = "20180412.339"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "bb02b971b06fb8e612c62bd2517b49884bc603a0"; - sha256 = "18ib707rky1k5qw5m4zfd88y1lvgqfilc336ha3v88i7fz8bbzh9"; + rev = "b76f510037eb8e0ea018272495f356c71ff5b758"; + sha256 = "0dlb7rm4adm2ccqga5a1w6m2jvs4ics9ihf76hqyx4px9m9ca1ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -70821,6 +70740,27 @@ license = lib.licenses.free; }; }) {}; + symbolword-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "symbolword-mode"; + version = "20180401.727"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "symbolword-mode"; + rev = "3857c42696e20f49f274ff8bc45a6f3ee26884d4"; + sha256 = "0pk20glbf73lpfky0jz6dqvxzaqvig3m11xca0786ni0g1yc4g0g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode"; + sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050"; + name = "symbolword-mode"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/symbolword-mode"; + license = lib.licenses.free; + }; + }) {}; symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; @@ -70908,12 +70848,12 @@ synonymous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "synonymous"; - version = "20160721.2255"; + version = "20180325.1117"; src = fetchFromGitHub { owner = "toroidal-code"; repo = "synonymous.el"; - rev = "1cbdc016c70ed3834c514621f9a33adc93707024"; - sha256 = "1lsn2x6mk36pl0j3z419jq2g6sxxl0hylpz0xl8aiqzsbmwnc6r1"; + rev = "2cb9a674d84fddf3f1b00c9d6b13a853576acb87"; + sha256 = "1l0skavpj96x5gdrx9l8dqj4mrb7zcilv3jj335ak11p2i4ckcq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf2c44c63e9f41f1733849bdef0d0c301485580/recipes/synonymous"; @@ -70933,8 +70873,8 @@ src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "ceeb06e24d3af3643862ecfdb263590eec1f492f"; - sha256 = "1qdppyx24zmz9dzm9kjvcx30g6znik602mg2h2s835cww9n97idm"; + rev = "8bf95b935976ec0a1964cf175ed57cc5f6f93bdb"; + sha256 = "06dssdq0fwmr5fw56f17hysy4ysvljlvh6np4szv7lc8bhvykki0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -71030,22 +70970,22 @@ license = lib.licenses.free; }; }) {}; - system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20180316.811"; + version = "20180415.2039"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "557b1eb96479cc6c73b9b7d509dd60b0ee71934d"; - sha256 = "01r8754ckbzsvlmnbpwpx2j33q693cmg5a59i5d77adn24ssk4f4"; + rev = "9e5532bbed819e6736922d2da2615a2fa4433cea"; + sha256 = "1blncv4cdf3ayq9d5ymdiacavma23smrmwh46130pscbjb4iyppy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; name = "system-packages"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/system-packages"; license = lib.licenses.free; @@ -71075,12 +71015,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20180101.1803"; + version = "20180414.1111"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90"; - sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff"; + rev = "e97f78ee11f4d4738aaa646e48bb39565d88abd6"; + sha256 = "16ffz0m964g8j6hi1drjvzaz2nxjm1z7r1y1j0g9bmn1dksz7vl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -71386,6 +71326,27 @@ license = lib.licenses.free; }; }) {}; + taskpaper-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "taskpaper-mode"; + version = "20180416.754"; + src = fetchFromGitHub { + owner = "saf-dmitry"; + repo = "taskpaper-mode"; + rev = "0e4f11d3aa07ea1602df0566f28bb2dc172f70f5"; + sha256 = "048hw8kbvdxihd9qsr16gzjlvjm3plvwlqb216mxbx60ig8vlhfx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; + sha256 = "0gayhzakiwlrkysmh24499pyzdfy3rmf8d68vamih7igxpl57gim"; + name = "taskpaper-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/taskpaper-mode"; + license = lib.licenses.free; + }; + }) {}; tawny-mode = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tawny-mode"; @@ -71557,12 +71518,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20180220.109"; + version = "20180404.1614"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "3e73a0ed2457e7b6991ea6555a1379bf9b77053b"; - sha256 = "0bwicz1xymq5j57m2kc8myjnc2dyfljm1jz2l80ifmlkdn549x92"; + rev = "c9aca6ce030fac893793558c74a957e7bd0e6034"; + sha256 = "081mj24h301vljb0d8bn5d9ibrgm1im2r5slzadd699h4zyyldcc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -72040,12 +72001,12 @@ texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "texfrag"; - version = "20180117.2025"; + version = "20180318.1647"; src = fetchFromGitHub { owner = "TobiasZawada"; repo = "texfrag"; - rev = "aca88ea6440dc9a8ac35692e72ee00aac27ce575"; - sha256 = "0bgjsqsxpfncfab5wnjpwy64wli6k7xw77dn7l1lpbymmsm9mnr5"; + rev = "8bb74e2d38139d6497545581a3507c6f7b4fa5e2"; + sha256 = "03pqbx2mwz2lz7027da0aiyh12f2jifdfvxh0s83qshsnw6sipmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; @@ -72317,8 +72278,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "a9efd1abd4fd4862d8e967ec207015af79494b6c"; - sha256 = "104viwwc6z9qk7p77wlmb088278f9awwx1v5cycnn6qv8wglhxfj"; + rev = "c564651dd404d7e9ff6bf7e5b343f429b9e52082"; + sha256 = "19i37mhyvg80d6j2zdxi5iljv28fbx5mjnayc6p14rqhk93xm856"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -72376,12 +72337,12 @@ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "tidal"; - version = "20171207.1452"; + version = "20180410.1245"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; - sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f"; + sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -72397,12 +72358,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20180301.121"; + version = "20180416.755"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "bd6948be51c61845238fd323a6c08b929534cac1"; - sha256 = "1ppzr2nhwarzmc3gpf0qcfphq2nz7jjvml1dkskpbm1j322z0mqa"; + rev = "e9a19bf500ee9c1a31d420055c159da44ada92db"; + sha256 = "0kfcllkkhknqx69h407v5v6b0p8g0xpd5ashh2smhz9zdnxwx1m8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -73109,8 +73070,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd"; - sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl"; + rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6"; + sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -73189,12 +73150,12 @@ transfer-sh = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "transfer-sh"; - version = "20160828.424"; + version = "20180317.1022"; src = fetchFromGitHub { owner = "Brillow"; repo = "transfer-sh.el"; - rev = "70cd5c50b56ed2597221796014298417f503d10f"; - sha256 = "1s4c70z54pc1kcqzqg3z07vw4v0d0f68w7nzifcmbx6s1l5211wf"; + rev = "3f0344358081bcaa3c129b401ee18ecaeecda4d9"; + sha256 = "0flsdkqhmrclnwwbxxqraawj4xv0240bwh5pbi4hgwdl5l9ihc4j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f74dd06d4d5249beaf67b2befec4251c8c18ed/recipes/transfer-sh"; @@ -73315,12 +73276,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180314.435"; + version = "20180410.1230"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs"; @@ -73340,8 +73301,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil"; @@ -73361,8 +73322,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile"; @@ -73565,12 +73526,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20180312.410"; + version = "20180325.47"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "a3ad3a9220363f2fd0898369866f5879489d51ec"; - sha256 = "1l7nbg273d1ffnac8crhvmiq8mz2xdyd52aflp0s3am9iw7319kn"; + rev = "fcf578a6aa2af815bc93fb48f374b8c3798a3e9a"; + sha256 = "0zmrmkcz019ny1cwqssyy327zmqpjmrn05xikcz4xqwy7ij8xifp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -73838,12 +73799,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20180315.1309"; + version = "20180409.422"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "526f307ca8ca50b8f98975f2812198212f6acf2f"; - sha256 = "1hj4jy91qfpfmnajb4wc9vavx0zlmawi0r1nvkh87ngm3q09mnbi"; + rev = "5350c45aec10bcdffe16ec9273d04298e576f1e1"; + sha256 = "0121gik1ksmwyx8lrr1pgpim0kyay189rg3cfa9l4hpwm425prp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -73901,12 +73862,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20171231.2214"; + version = "20180317.107"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "45dc6ba44fd5f2aece9da4a0e88effb947fe6c0e"; - sha256 = "1q3gva57r7g9iqvkfi90zih97dq37ds2vfbjisqxzh43vab8hsjv"; + rev = "4fe50d616fc60e77eb9b5a824c0a1ca4010b0746"; + sha256 = "0j5s86s9wb33fqw415mmkysdasyj3vdx9l8l6ca6f89ps6znr636"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -74090,12 +74051,12 @@ undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: melpaBuild { pname = "undercover"; - version = "20170502.912"; + version = "20180403.752"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "d947e6410a3b269c657645b499a413d90d4b69ca"; - sha256 = "0c4i8qfa6mzbnjmdk9zqgw324fxyjnq5dm6bmxfadsnvnhjmn7y5"; + rev = "3fc54ef92f0b4b7d26d962d6ed29a81d526a3a66"; + sha256 = "0iqj1a6nj1ka5ahcy4rrn7k427bs1ifv0v0i7gj79m7isjj15qc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; @@ -74150,26 +74111,6 @@ license = lib.licenses.free; }; }) {}; - undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "undo-tree"; - version = "20170706.246"; - src = fetchgit { - url = "http://www.dr-qubit.org/git/undo-tree.git"; - rev = "e9a9102f515acd7523158f20e83f300600374989"; - sha256 = "07y1pn0dzwh1avkd3dm96lcjisvnr7p02wbhxf1m3dgaxf059mcn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree"; - sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr"; - name = "undo-tree"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/undo-tree"; - license = lib.licenses.free; - }; - }) {}; undohist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undohist"; @@ -74402,8 +74343,8 @@ sha256 = "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0af5c20984ebe5458c6e97b24ef97e8b2fbc4045/recipes/unidecode"; - sha256 = "1xizid7hg98lx2i544w253h6c51ykimim1j58jkn1r5fzqg3r4xd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9ba8e425e37e80a2236832c3f12568546d4c7c9/recipes/unidecode"; + sha256 = "0vhghnyj8a5mcqq5rzajrm1izzfry77pd1wxhmra5yp9ribw2sv5"; name = "unidecode"; }; packageRequires = []; @@ -74562,12 +74503,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "20170830.533"; + version = "20180416.623"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "c2c1b44b16a0fd873193b17c580ef3dfdacea580"; - sha256 = "1rq4m77fydkawdwkbw8125ihmvv6aisr03nwb1857k3hxhrg0gwv"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -74650,8 +74591,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182"; - sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -74671,8 +74612,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182"; - sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; @@ -74713,8 +74654,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182"; - sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; @@ -75255,12 +75196,12 @@ vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vertigo"; - version = "20160429.2105"; + version = "20180408.920"; src = fetchFromGitHub { owner = "noctuid"; repo = "vertigo.el"; - rev = "70b56a57c3a37735cc9e92ffaa6dc27c64437738"; - sha256 = "044vy6yi9yfk3h2gd3a718w50py02h1b5fr0i7a08rjlq4l3srka"; + rev = "117450dfad5d5ad45d40995cdf9a626cf9c2b136"; + sha256 = "1bxf2kzdj4xmy6wmajwvn40msp2q4szp25ylah49biw92dwi2bzw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3/recipes/vertigo"; @@ -75609,27 +75550,6 @@ license = lib.licenses.free; }; }) {}; - vkill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "vkill"; - version = "20091203.1022"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "vkill"; - rev = "8ffe640ed03ddcc23db1c74c76d1acbf25250ad9"; - sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1fe8711711d5c7e1dfdf81b8153a193e6940a16c/recipes/vkill"; - sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm"; - name = "vkill"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vkill"; - license = lib.licenses.free; - }; - }) {}; vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; @@ -75759,12 +75679,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20180104.1611"; + version = "20180410.1157"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "b489a63dabe0f2fee2730121ecabb1b4f4c11761"; - sha256 = "09fkyyj0lg3q9q0874q0jpvx1h8rf26g96sn9a2xw0j3fl5ab1n4"; + rev = "eab311f535ac922086466dba3e6f0d428fcff3f2"; + sha256 = "0j7qbrx0z6kvm9r2swyb2khhn9gciq4yjxg199ckg7k5p8iqlzlq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -75947,12 +75867,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20180316.1534"; + version = "20180331.105"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "f0c8c4e55be6569c4c56a1d041f5c53769e4d5ac"; - sha256 = "11p5kqp16bvas26i0zgdazqhgz6jb6j612q032g6d4476yb8df26"; + rev = "afecc04e806c8338e553bdbdb716328fa9f2227a"; + sha256 = "1sf1mck6pk2xnlfcr4rh47brpgl6dsla7zir8lxpa0224dvy0bvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -76178,12 +76098,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180313.1458"; + version = "20180416.240"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "49a7a72adf77c8d3ee457ef38dce415cddd09aae"; - sha256 = "0m0dg0w6pimvq0bp5xm7jca6619n38zsw40mddpb9xw01gxmaagb"; + rev = "370fba5fefc819b863909330fa17b6b0e8b20080"; + sha256 = "0rsksx6gbff2l26rcfrxjq51pnl3l61r0vsnwq9ax70djrpk804m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -76280,6 +76200,27 @@ license = lib.licenses.free; }; }) {}; + webkit-color-picker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }: + melpaBuild { + pname = "webkit-color-picker"; + version = "20180325.36"; + src = fetchFromGitHub { + owner = "osener"; + repo = "emacs-webkit-color-picker"; + rev = "765cac80144cad4bc0bf59025ea0199f0486f737"; + sha256 = "0a6nirdn1l7cymjycbns38ja9an1z4l5lwjk5h428aly3pmkvdqj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af9d2e39385c6833eff6b7c7e5a039238563c00f/recipes/webkit-color-picker"; + sha256 = "1i9244zghabyavxhz86d22fn40qspzdn2sjql8pl3mm8ks7a49a3"; + name = "webkit-color-picker"; + }; + packageRequires = [ emacs posframe ]; + meta = { + homepage = "https://melpa.org/#/webkit-color-picker"; + license = lib.licenses.free; + }; + }) {}; weblogger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "weblogger"; @@ -76325,12 +76266,12 @@ websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20171113.2045"; + version = "20180402.2042"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "7d2adf218743c52578c8e8fd5584a5e54732e256"; - sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f"; + rev = "e9d148fbb6425c35dc7f76cccdec70aba7fafacf"; + sha256 = "1gyp67sdi4pwrzdkgslnd9l0sjw7nbkqlh7j4zi423yrb5zxh4wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -76556,12 +76497,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20180301.1018"; + version = "20180321.331"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "d19fe4e037baf8a5cd6e8c0609d3999528bb5ac9"; - sha256 = "1ylfy31a63g3306v0392a8nx2jdjms10f0r91i7am57pkygrx664"; + rev = "bc97659029bffda0861a418da092656b379dd0cd"; + sha256 = "0j1kpykqz691f8dlb2grfgv5rafr9xvb64yfc9pb07r4f8791fgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -76661,12 +76602,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "20171015.938"; + version = "20180411.1636"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; - sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; + rev = "cfe081c957ad6e70e1fd32c7836008851198431a"; + sha256 = "1qipmr0v6l6r2ggdp7lbrc14hwfjs6j835ii53y99knmbp7cnci1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -76682,12 +76623,12 @@ whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whole-line-or-region"; - version = "20170815.212"; + version = "20180324.2119"; src = fetchFromGitHub { owner = "purcell"; repo = "whole-line-or-region"; - rev = "1220974153b7eaca5192ed87f86182d121e228e4"; - sha256 = "1n44nn0zkk55cnwlincv5i8s36nymnh3bm6jd85h6m97jssxd85l"; + rev = "944290d443a395ef0578531929186d6274ab03e9"; + sha256 = "04hbs8hrm5csnjxvxkfbd9fky0rd6xpr105cy0bvya5c14anzcd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; @@ -76749,8 +76690,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "900cf8213df6e58bdd3244b446ea02c67b7555d8"; - sha256 = "1yn2hadcpcsgnf0wy7x8zcfw97c90dpp2ipdml176191vz41n7nb"; + rev = "aafd8a262599571f2de06e3aa75933d8a09e2d35"; + sha256 = "0663631mxw4mrzlb144fbvry6yffg9hic9jbns147zfgvsp1xcf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -77126,8 +77067,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "d04938232934"; - sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; + rev = "dbb4f5d19925"; + sha256 = "1ng4p0yf8lp3nhdz8l3m4zhl13x3bpb9prckw8nghqf2hc96l2dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -77164,12 +77105,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20180217.548"; + version = "20180414.757"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "fcbccec6ec0f6639eab769d6ff8e97f25347a48e"; - sha256 = "079dy4b409i9016j3fkgwxggw8332hkvnnm86am46va3lqpd3jr9"; + rev = "ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84"; + sha256 = "0hq2dy8djxf45ajk9di1grhgzly0qrijcjfdah8xj5zkwvn9cvlh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -77374,12 +77315,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20180316.926"; + version = "20180408.36"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "543bfe21727c0ea96ee0c1022ed334103c0acdf0"; - sha256 = "0ia74ijp6cdhxjfygvjb5kx36iyakbdws9lsz20761xlp8vw0dfq"; + rev = "90f0e5f7a596ead7fc3b5106684ab118ee857340"; + sha256 = "1yfvknn4nbc6qig0pa4gks1085l91v79cg8hjg7776plz0cwmn08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -77644,27 +77585,6 @@ license = lib.licenses.free; }; }) {}; - x-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "x-dict"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "x-dict"; - rev = "920b2430bff9fb8c4bb7944aa358622545c00cee"; - sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0567fcc7b7aff08094095292fb701da3be8403c3/recipes/x-dict"; - sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc"; - name = "x-dict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/x-dict"; - license = lib.licenses.free; - }; - }) {}; x-path-walker = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "x-path-walker"; @@ -77710,12 +77630,12 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "20161215.448"; + version = "20180321.1802"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "544a1ad4e8551c60e58e6c431470b6ef4ce7c5cb"; - sha256 = "1w2fhi5x0amjyzzdndp9lvm6i279pcjjs6zfhssly2lbxw4dpaky"; + rev = "a72e282d3db72fc1078623f405c2874bd48b9205"; + sha256 = "0ayjdq50kd3karg0rc9ffxdn8pv0fbf7yfbq5vics8p5w7fl55x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; @@ -77731,12 +77651,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20180219.2311"; + version = "20180405.1521"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "cf452fd0f2e742812a4c69e41cb5403f22b0a16a"; - sha256 = "1wjj3sj90az5y4a7cy0pblwxi0xbj5gg72jdr9wbm95si582vk58"; + rev = "5b630c3a706d7b692e04e44c571ff9c1076be2c3"; + sha256 = "0di2pyd1b4a0lyz1xi260dha3n6wa8d4nlb59inaxcj4nfw7sv15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -77752,12 +77672,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20180228.2206"; + version = "20180402.2139"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "3a617b446fda59294b5ff67c0b86a0a6e9f15feb"; - sha256 = "1bj2w1r98db1jwirvbvxnbc8p7l9pz3n4l0w2rl9g6kqavdx8pnh"; + rev = "95ec296ec6e059e0f802b919fcaeae521714fd68"; + sha256 = "19hjw9bcq2qsc0m47303r5r1nr144sbsrs0lwzzadxvfyfwpm1q4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; @@ -77794,12 +77714,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20180313.1143"; + version = "20180412.2300"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "cef43c378743bd0073e9044b5cd4df212a022bd8"; - sha256 = "1qa4payi7r6ncg2dgp9frs6g8gmsc5mfaxssf84lgm3p3468y0fw"; + rev = "e7181d40cc4bf30eed2672cb97255a8451031002"; + sha256 = "0lhakj8hr2wg7n3nqc5bqwgxb9lf6yvknryll9xw9lq4q9yha7rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -77857,12 +77777,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20180308.349"; + version = "20180328.1515"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "2904922958f746cbb77692564e4c4487ff31c9ab"; - sha256 = "1zk02fbkd9y6hy226lnqf31c3l5sync2m6gqj1m4pj4qqla98m1k"; + rev = "6e240b83bd3bc19b0edf8a85413b216dbf27f441"; + sha256 = "1ff3r1a3jgvv33sahi9ajs04m4sch9cmqwx0dlwkn1595smwk8k5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; @@ -78274,27 +78194,6 @@ license = lib.licenses.free; }; }) {}; - xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-frobs"; - version = "20161207.1609"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-frobs"; - rev = "0832d588598dbf6bd8aa8e05c611d7c098c3f9d8"; - sha256 = "0snrylgv2d6r3d6nv05vqs6ng3sgrxkvqpx7m4ga2y7a1m5lmxkw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bb3be63b798967f5525cf118579a1cc756ee1a/recipes/xterm-frobs"; - sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf"; - name = "xterm-frobs"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-frobs"; - license = lib.licenses.free; - }; - }) {}; xterm-keybinder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "xterm-keybinder"; @@ -78316,27 +78215,6 @@ license = lib.licenses.free; }; }) {}; - xterm-title = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-title"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-title"; - rev = "b6ea73d297d191d48bba7dd1e2adc23bbdfa1c3c"; - sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bc25d156c8631b552a463f5088a99a3370166e03/recipes/xterm-title"; - sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6"; - name = "xterm-title"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-title"; - license = lib.licenses.free; - }; - }) {}; xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xtest"; @@ -78470,8 +78348,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "c2912e845d74a22436bdf720eb9bc543d0e0c45c"; - sha256 = "1swnr1nrlyd7ij4m05dvqwdfmpj41b3ibfqmb45qm073f27gvj65"; + rev = "673f033c05b4984f5159526db2d7f4a32dd57b6d"; + sha256 = "1iwmwff538zw95mlrq4jhwaikx2hs6jqcx94rypn6znymrfsf0hp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -78508,12 +78386,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20180212.1556"; + version = "20180408.2307"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "3fc5a33760b0bbb6e67adbce48ab3dc4ae34b847"; - sha256 = "1ijq7ay5lx77nibzqc1kih64v4bg4790as1zg26igp7ivg66l1m6"; + rev = "40067a10ac1360f0b9533f0bbbb2eea128e2574d"; + sha256 = "0v7646vdsbbhxh9ywsypq2ycdsrf6m7wv788qaircbjgn1pk4v7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -78592,12 +78470,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20180220.1049"; + version = "20180415.350"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "de672dab9df4a0bffb44cdadaace93d00d9a8848"; - sha256 = "1w0lkn1prv9xd4pn81kqxk26s37ia1xk0kz8qahcvjg7z4igyy9n"; + rev = "a804f145d17b4b68490ee62ba9a9c4fc7faad130"; + sha256 = "1m9zal19s7v6djrma1xbqwx1n271y0ik44wx9sscmrynmhdlis04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -78739,12 +78617,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180310.1614"; + version = "20180319.607"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "5170f051ad39353ed46ae7ff7b67e50e0e27324c"; - sha256 = "1ssb1ljbm8i78qii15yhd488y3q1w2082lb2pcwly2axwa5a02kv"; + rev = "fa6a71c42de7fecd58193e2fd3681a0225b71dc5"; + sha256 = "0zxwqc2ksk43p47svhcxsbw8fazl7krarfj8d1i1r9nkwhx5sqqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -78760,12 +78638,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20180307.518"; + version = "20180408.446"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "2b4c4d7ef7e85a3b9306ce7da82a65cf243edc22"; - sha256 = "0v0q8ym8jp6pps6g9g0qnz9x39i4n4w937s8s6arf1f31fc73r52"; + rev = "4bbe565b7c9c7286f7ac465f0cc79c3fe5796c0b"; + sha256 = "0rak66wmj0x4zmksckniamslvcaxsz0dgysrzv22jijmjjqpfd2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -79087,8 +78965,8 @@ src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "3a9ae671d01d9828b3e2935c80e8796cd3c1d77b"; - sha256 = "1kfwnwnnax22dlkc42rlw7lrdlpjxmh70sjnrrljpvi238scn5b2"; + rev = "af752f46306eb710158904b89c1bf0d6786d0a4d"; + sha256 = "0w3s3c1h7s5j02h7jgbnnh85cx1cmqb5jd8w6fgsp4jna6wn5627"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -79543,12 +79421,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20180215.1021"; + version = "20180409.1322"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "67a1d90595353ab57fd424651c567df9851b9494"; - sha256 = "01qv400zp4bdfah62l3ixkc3kvkwrjj5ngc36m6w783q0zmr105r"; + rev = "487957664cedc61d70feccc881092eef6746977b"; + sha256 = "1hvqx1dfh253iin59j9i1x85xfnhljgwsrvn9pq3lxfvy82zjlc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6b986aa7499c..c21db447e397 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -82,10 +82,6 @@ self: inherit (self.melpaPackages) ess ctable popup; }; - ess-R-object-popup = super.ess-R-object-popup.override { - inherit (self.melpaPackages) ess popup; - }; - # upstream issue: missing dependency highlight evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; @@ -98,8 +94,8 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; # build timeout graphene = markBroken super.graphene; @@ -111,13 +107,10 @@ self: helm-rtags = markBroken super.helm-rtags; # upstream issue: missing file header - helm-words = markBroken super.helm-words; - - # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; # upstream issue: missing file header - initsplit = markBroken super.initsplit; + initsplit = super.initsplit; # Expects bash to be at /bin/bash ivy-rtags = markBroken super.ivy-rtags; @@ -128,9 +121,6 @@ self: # upstream issue: missing file header link = markBroken super.link; - # upstream issue: mismatched filename - link-hint = markBroken super.link-hint; - # upstream issue: missing file header maxframe = markBroken super.maxframe; @@ -159,9 +149,6 @@ self: # upstream issue: missing dependency org-readme = markBroken super.org-readme; - # upstream issue: missing file header - perl-completion = markBroken super.perl-completion; - # upstream issue: truncated file powershell = markBroken super.powershell; @@ -171,12 +158,6 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing package version - quack = markBroken super.quack; - - # upstream issue: missing file header - railgun = markBroken super.railgun; - # upstream issue: missing file footer seoul256-theme = markBroken super.seoul256-theme; @@ -211,9 +192,6 @@ self: # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - # upstream issue: missing file header - zeitgeist = markBroken super.zeitgeist; - w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 294414f15ee1..ff9967e51b35 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -125,48 +125,6 @@ license = lib.licenses.free; }; }) {}; - ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake"; - rev = "f01b3da7e2d20ea5a62daf62412c7dc1ad0130ff"; - sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2257db76719cb1e3e2f79aff2b61073b655f9061/recipes/ac-cake"; - sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl"; - name = "ac-cake"; - }; - packageRequires = [ auto-complete cake ]; - meta = { - homepage = "https://melpa.org/#/ac-cake"; - license = lib.licenses.free; - }; - }) {}; - ac-cake2 = callPackage ({ auto-complete, cake2, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake2"; - version = "1.0.1"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake2"; - rev = "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a"; - sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b8b728c2caed96d7505cafc42d0d7ed49d6cadcd/recipes/ac-cake2"; - sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy"; - name = "ac-cake2"; - }; - packageRequires = [ auto-complete cake2 ]; - meta = { - homepage = "https://melpa.org/#/ac-cake2"; - license = lib.licenses.free; - }; - }) {}; ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-capf"; @@ -212,12 +170,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "d14b0898f88c9f2911ebf68c1cbaae09e28b534a"; - sha256 = "02f8avxvcpr3ns4f0dw72jfx9c89aib5c2j54qcfz66fhka9jnvq"; + rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7"; + sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -527,12 +485,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "326721527b2f88df7227cdc41708912b2f9c8494"; + sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -548,12 +506,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "326721527b2f88df7227cdc41708912b2f9c8494"; + sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1562,110 +1520,6 @@ license = lib.licenses.free; }; }) {}; - anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything"; - version = "1.3.9"; - src = fetchgit { - url = "http://repo.or.cz/r/anything-config.git"; - rev = "6b9718fba257e6c2912ba70f9895251ab1926928"; - sha256 = "040znq4qv6rqjw05klriasysvsx6s6xn00ssc3acbqdqjgjk8l2a"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; - sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj"; - name = "anything"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/anything"; - license = lib.licenses.free; - }; - }) {}; - anything-exuberant-ctags = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-exuberant-ctags"; - version = "0.1.2"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-exuberant-ctags"; - rev = "97fa91eb04df11bdf4558fe7bb2f6aebf8be0d6c"; - sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66cae648d534468e5e9f125679847fb876935f68/recipes/anything-exuberant-ctags"; - sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk"; - name = "anything-exuberant-ctags"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-exuberant-ctags"; - license = lib.licenses.free; - }; - }) {}; - anything-replace-string = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-replace-string"; - version = "0.9.2"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-replace-string"; - rev = "1962f24243d6013bcef7e8d23136277d42e13130"; - sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39b7f3a8de2f7728b374c09a1387beb3f7595d2e/recipes/anything-replace-string"; - sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71"; - name = "anything-replace-string"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-replace-string"; - license = lib.licenses.free; - }; - }) {}; - anything-sage = callPackage ({ anything, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: - melpaBuild { - pname = "anything-sage"; - version = "0.0.1"; - src = fetchFromGitHub { - owner = "stakemori"; - repo = "anything-sage"; - rev = "8335657d3f0611bd5fc8858160bbe87dfdbaf0f2"; - sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/07be4b11bbddb376e11616525e7b226c5a9f2296/recipes/anything-sage"; - sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3"; - name = "anything-sage"; - }; - packageRequires = [ anything cl-lib sage-shell-mode ]; - meta = { - homepage = "https://melpa.org/#/anything-sage"; - license = lib.licenses.free; - }; - }) {}; - anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-tramp"; - version = "0.8.5"; - src = fetchFromGitHub { - owner = "masasam"; - repo = "emacs-anything-tramp"; - rev = "942affd6b7538d1e829ee257bbd829cb4e860cce"; - sha256 = "0njynjg7p7i5li668ldpvmnpc5w7bikcs4cmkf26vf5n714fvlc1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; - sha256 = "053bi7b6d9aa6xwsgm0yxbklbs5sl3dgi529gsapj30lw68lh1vh"; - name = "anything-tramp"; - }; - packageRequires = [ anything emacs ]; - meta = { - homepage = "https://melpa.org/#/anything-tramp"; - license = lib.licenses.free; - }; - }) {}; anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; @@ -2023,36 +1877,36 @@ license = lib.licenses.free; }; }) {}; - auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: + auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auth-password-store"; - version = "3.0.0"; + pname = "auth-source-pass"; + version = "4.0.1"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "6af0458a6b586cc5004fa652f23615433304924d"; - sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa"; + rev = "5690092e40c790384692d8e8da3451e6878d8c17"; + sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; - sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5"; - name = "auth-password-store"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; + sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak"; + name = "auth-source-pass"; }; - packageRequires = [ cl-lib emacs password-store seq ]; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/auth-password-store"; + homepage = "https://melpa.org/#/auth-source-pass"; license = lib.licenses.free; }; }) {}; auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "8d117868a0a091389d528428136e60f951e9c550"; - sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; + rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f"; + sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -2554,6 +2408,27 @@ license = lib.licenses.free; }; }) {}; + banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "banner-comment"; + version = "2.5"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52"; + sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "banner-comment"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; @@ -2620,16 +2495,16 @@ bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbcode-mode"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "ejmr"; + owner = "lassik"; repo = "bbcode-mode"; - rev = "e693ab09c3f34cabfd185e7c249c0b5403f0a7e0"; - sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky"; + rev = "73c56a40301c8b017d3e64c08dccc80d1dc47e59"; + sha256 = "0g0dxk33pz18awv7ncv64c2a4lmdx9sigppkvq2mb9za47azk8dh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/bbcode-mode"; - sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; + sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; name = "bbcode-mode"; }; packageRequires = []; @@ -2722,22 +2597,22 @@ license = lib.licenses.free; }; }) {}; - beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "beeminder"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "54cc1277f2a7667a7b0d999dc49ceffcf2862b44"; - sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q"; + rev = "3e95a669474e27cd51a16caea030456377f83062"; + sha256 = "1bj9yzjvglnb0f4glh8fg478xlm5nqmd9jqm1casdj5m30i4kafn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww"; name = "beeminder"; }; - packageRequires = []; + packageRequires = [ org ]; meta = { homepage = "https://melpa.org/#/beeminder"; license = lib.licenses.free; @@ -3250,12 +3125,12 @@ buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "868aa9e04438d57746e0b1f5a13bcb9b64061c05"; - sha256 = "0b069g89b34s76ds3axmpiwl924fjd1jh6z6fdw5x0h0lj20pa87"; + rev = "e093360e05164c78255866c1ac8f966aa38ba514"; + sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; @@ -3562,27 +3437,6 @@ license = lib.licenses.free; }; }) {}; - cake = callPackage ({ anything, cake-inflector, fetchFromGitHub, fetchurl, historyf, lib, melpaBuild }: - melpaBuild { - pname = "cake"; - version = "1.4.3"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake"; - rev = "a7c9f3bee71eb3865060123d4d98e5397c2f967e"; - sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/86ed5054ee2392a0e384443c945a5d4824238e95/recipes/cake"; - sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr"; - name = "cake"; - }; - packageRequires = [ anything cake-inflector historyf ]; - meta = { - homepage = "https://melpa.org/#/cake"; - license = lib.licenses.free; - }; - }) {}; cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cake-inflector"; @@ -3604,27 +3458,6 @@ license = lib.licenses.free; }; }) {}; - cake2 = callPackage ({ anything, cake-inflector, dash, f, fetchFromGitHub, fetchurl, historyf, ht, json ? null, lib, melpaBuild, s }: - melpaBuild { - pname = "cake2"; - version = "2.1.0"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake2"; - rev = "0a9d0b3a1c49ba1730088416f50507f53221c70b"; - sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/18e38d9cdb9f1a8cc05545c52c3a76265a9aa2ab/recipes/cake2"; - sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x"; - name = "cake2"; - }; - packageRequires = [ anything cake-inflector dash f historyf ht json s ]; - meta = { - homepage = "https://melpa.org/#/cake2"; - license = lib.licenses.free; - }; - }) {}; calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calendar-norway"; @@ -3751,6 +3584,27 @@ license = lib.licenses.free; }; }) {}; + call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: + melpaBuild { + pname = "call-graph"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "beacoder"; + repo = "call-graph"; + rev = "0bbe292b1b9c7ba1d8a65ed5e475f6a53f5f9f27"; + sha256 = "0kckjs7yg8d04nir5z3f00k05272kgma98794g0ycgfn1vrck0h0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; + sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; + name = "call-graph"; + }; + packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ]; + meta = { + homepage = "https://melpa.org/#/call-graph"; + license = lib.licenses.free; + }; + }) {}; camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "camcorder"; @@ -3775,12 +3629,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.1"; + version = "4.7.0beta2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56"; - sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7"; + rev = "c0bd6a27e138911560f43dc75d5fde2ade4d6cfe"; + sha256 = "0z08mpvfa5jvbdxkx9wlarn1zpp01aaxasmy63cz452jr8zg0nll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -4400,6 +4254,27 @@ license = lib.licenses.free; }; }) {}; + citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }: + melpaBuild { + pname = "citeproc"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "6d68f52ebd150e035b33dcaa59d9e2aceab69b84"; + sha256 = "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "citeproc"; + }; + packageRequires = [ dash emacs f queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; @@ -4772,12 +4647,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.11.0pre1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "02edf08be2b9476f442b702c6c00447912425cc2"; - sha256 = "1ppq3g1525izfl4d8779rj6lq8jkgqh50wnbyb0cmj6bp7b7c9sz"; + rev = "61fd4c742013a7f9139db190f936703b656540ff"; + sha256 = "1iiyysw16asqj1c077gk6s9pqy8qij6d83kwxc59swc7xgcy1g0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5129,12 +5004,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "2c30c3bdb8316b27d5c1832b944cb146d00de456"; - sha256 = "183hyy5vy7xs6hwsk8nrylck8w5czcqwzfx0wik4ppx8011jzis1"; + rev = "42753d43333c6e4ad83797f0234149b76b463369"; + sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -5486,12 +5361,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "326721527b2f88df7227cdc41708912b2f9c8494"; + sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5681,12 +5556,12 @@ company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; @@ -5825,6 +5700,27 @@ license = lib.licenses.free; }; }) {}; + conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }: + melpaBuild { + pname = "conllu-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "odanoburu"; + repo = "conllu-mode"; + rev = "993fd6bc2b5c7b70815a3ecede1642f607513615"; + sha256 = "0x6ga4h084qcf9h6nak7c66qq1slq907n64sqx41gnd3zbscmwxa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; + sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v"; + name = "conllu-mode"; + }; + packageRequires = [ cl-lib emacs parsec ]; + meta = { + homepage = "https://melpa.org/#/conllu-mode"; + license = lib.licenses.free; + }; + }) {}; connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "connection"; @@ -6059,12 +5955,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "9d70490b551503aac22241c8089a46e55dd3deba"; - sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff"; + rev = "307638efaa172539e77fe425626eac99f7abf654"; + sha256 = "0c0fqn9hin9738bcxib354al6pd64arj2pccacjiyg1sa5h3mwj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -6122,12 +6018,12 @@ counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-tramp"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-counsel-tramp"; - rev = "d4c35e1aca724af6a0084362a027fdd70876d2c8"; - sha256 = "0dflm700n9wzn2nrwlbrh1558zv0c9fzzrs43d1kqvzw98wihfz2"; + rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa"; + sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; @@ -6143,12 +6039,12 @@ coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "trezona-lecomte"; repo = "coverage"; - rev = "f7e78bb9502d3893ef876274c992743f49c0a1a7"; - sha256 = "01545iy2gaxyd4i8gawgxqi9gbkrjk20djhvc59finnjrblzccn3"; + rev = "c73d984168955ca0f47f44b0464aa45282df42b6"; + sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage"; @@ -6605,12 +6501,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.27.3"; + version = "0.28.2"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "8ad16fc871be075f889d5e7c2892db3e4c8ce978"; - sha256 = "144mqqyaid6w9qx38m88snd3c8qm2k1a73vs21h9cmnp19gigfby"; + rev = "93e3bb9b7558d597d10c4cb8aa1dd887ed37dc2b"; + sha256 = "1cywxcfrb2j33ncldylimqhj7r7yzlb6ghy5i8c9784vfvxd56yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6665,6 +6561,27 @@ license = lib.licenses.free; }; }) {}; + daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "daemons"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "cbowdon"; + repo = "daemons.el"; + rev = "9e6868e2559ea7d70fbad8c419798124f406cc40"; + sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; + sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr"; + name = "daemons"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/daemons"; + license = lib.licenses.free; + }; + }) {}; dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; @@ -6694,7 +6611,7 @@ owner = "fommil"; repo = "emacs-darcula-theme"; rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976"; - sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"; + sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -6752,12 +6669,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -6773,12 +6690,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -6857,12 +6774,12 @@ datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b"; - sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j"; + rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5"; + sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; @@ -7235,12 +7152,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "c91edab065f413910354940742b35bdffeb52029"; - sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; + rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21"; + sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -7361,12 +7278,12 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "8144c013d46c55b0471f31cdc3b5ead303286cbf"; - sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; @@ -7408,7 +7325,7 @@ owner = "xuhdev"; repo = "dired-icon"; rev = "dbace8d2250f84487d31b39050fcdc260fcde804"; - sha256 = "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki"; + sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon"; @@ -7471,7 +7388,7 @@ owner = "xuhdev"; repo = "dired-quick-sort"; rev = "fe39cfb2d4a7ba6b30f98134548b4e4bac67c469"; - sha256 = "1a9r1kz5irpvb2byabbf27sy7rjzaygfpqimpag41sj955wlgy9a"; + sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; @@ -7571,12 +7488,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "5b55dac12467689083ff995777f54a304ff47be1"; - sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn"; + rev = "03c4edffba45722a9511d6d10992578f140d095f"; + sha256 = "1b8xp0yprpy1sc8hmim6jcdmgpc8yj6wjzgj4rdy77k7l96016v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -7809,12 +7726,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "ae25b0e01394f94995f4b0ceaab1e04eb4b9acbd"; - sha256 = "14xri92dcj52vw1vhrnicibrn9y010zv8w7jw6j3q9lrpmr073lr"; + rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265"; + sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -7895,14 +7812,14 @@ pname = "doom"; version = "1.3"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "kensanata"; repo = "doom"; rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730"; sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7e41ed64142be89a62fddeceee5e39603a18525c/recipes/doom"; - sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom"; + sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5"; name = "doom"; }; packageRequires = [ cl-lib ]; @@ -8103,12 +8020,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27"; - sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg"; + rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1"; + sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -8145,12 +8062,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "64c0759432334465ccea115d83600b468f86e3be"; - sha256 = "00vhxd7z7fw2cwdzgvfbdzfp668dfaw83c95kkicmmdzlabiz50i"; + rev = "260054500d4731c36574b6cbc519de29fdd22f43"; + sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -8354,12 +8271,12 @@ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "eacl"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700"; - sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg"; + rev = "80113a9f6cc246cef67e3e20ec052788c38ab116"; + sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -8372,22 +8289,22 @@ license = lib.licenses.free; }; }) {}; - easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "easy-hugo"; - version = "2.8.21"; + version = "3.2.24"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "61a504616705feae8c3fd8b01bf315e2cb89f699"; - sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi"; + rev = "fbcd7dfd737e6ec90f7bee6a911ff66e86577a64"; + sha256 = "1yabqf8mksadfab7pfk87a3yimda3x6la2kvrxf76kbzbl23h3dx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; name = "easy-hugo"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs popup ]; meta = { homepage = "https://melpa.org/#/easy-hugo"; license = lib.licenses.free; @@ -8396,12 +8313,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "1.5.12"; + version = "1.6.13"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; - sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; + rev = "742366a2eb8bdb3d91e108e701ca8a1e83084671"; + sha256 = "1i3pxg5mskbk2zmcavbd78sr9l45qqcjjfp3p0i8q5kbm9zjr5fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -8919,12 +8836,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd"; - sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za"; + rev = "fcf9bff0af071f5e2020ac77d9a9473325e4c5bb"; + sha256 = "1xk7k4av9hy0i7zqwpzis0rjp5myvxs52k45ah00zg8wi5hybq1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -9265,12 +9182,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; - sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -9304,6 +9221,27 @@ license = lib.licenses.free; }; }) {}; + elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "elisp-def"; + version = "1.0"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "elisp-def"; + rev = "5e0d766a5db537f4e7145c2053c22829d736ceba"; + sha256 = "0l9az09yw40rr2xrvf01c3idfqplddr1kk880qscnzj8v9p06l4x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def"; + sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz"; + name = "elisp-def"; + }; + packageRequires = [ dash emacs f s ]; + meta = { + homepage = "https://melpa.org/#/elisp-def"; + license = lib.licenses.free; + }; + }) {}; elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-lint"; @@ -9538,12 +9476,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "30cb5e3c344edef572b6cffac94c6ff80bf6595f"; - sha256 = "17iwdaly9kw17ih86rk9w1iswn8r6vvj9sh71picsxg6gqdrqnrk"; + rev = "8b04039b8112fd18392861718dc30ba011626dee"; + sha256 = "0yyn1a8sdn8avmwmlg98365irr9b2rx2jrjxs3y93d1bhlmr816i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9564,6 +9502,27 @@ license = lib.licenses.free; }; }) {}; + elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elscreen"; + version = "2018snapshot3snapshot21"; + src = fetchFromGitHub { + owner = "knu"; + repo = "elscreen"; + rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772"; + sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen"; + sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s"; + name = "elscreen"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elscreen"; + license = lib.licenses.free; + }; + }) {}; elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elscreen-fr"; @@ -9630,12 +9589,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f32e91ebbaebd7f1125107dce2aa979827b26c0"; - sha256 = "1hc4jw2fy25ri2hh3xw7sp67yfl2jvrgj1a25xa6svchjq3h1yf2"; + rev = "c5fb4853d8a7d266c8d484522cbaa6b31e745695"; + sha256 = "1lc9kdflssp4j220p252hskd5ikl0fbvhqp6fksfynrj1j02p4jg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -9923,12 +9882,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.13"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; - sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; + rev = "ccc0090ba1ebaad6bd3b079d6d810e9a051218b3"; + sha256 = "1jy7zc26ypwl46ag26gbspbn7p4lf3jxgb34l8blqzk8qn8fxz0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -10028,12 +9987,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "0.4"; + version = "1.0"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "4eccfc7ce43d4dfd3cf65ea86b2975abb4b4e9ad"; - sha256 = "1n5pmcd6d71pcgjwkqnmh6midcyp7ahc5yry3r38my3shrwirqc2"; + rev = "9fac58de9b8f7539bfd4c6983bc826e27d060b30"; + sha256 = "1z5j4nr9c6806f6ys4p3b2byxca7zc34ap1bysai8nvzxz02rzf6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -10101,12 +10060,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20171101"; + version = "20180330"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb"; - sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf"; + rev = "c9c39ff07f8cf45814071a77b559477bd57bc3b1"; + sha256 = "1w563cnxadmjbfnwbazqazrpmw2k5xyk4yaxgfk2glxahk4dr0fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -10339,12 +10298,12 @@ erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-hl-nicks"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; @@ -10486,12 +10445,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.2.4"; + version = "20.3.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "13c6a4bf01d39a5002e09ef1f82619cde9f2c90c"; - sha256 = "1j8fqzaw36j8naafrrq1s329jlvlb06ra1f03hl76xr0bbxm44ks"; + rev = "c5ee502e6031986983d3596745cad7fd547fd9c2"; + sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10860,22 +10819,22 @@ license = lib.licenses.free; }; }) {}; - eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773"; - sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33"; + rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec"; + sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; name = "eslintd-fix"; }; - packageRequires = []; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/eslintd-fix"; license = lib.licenses.free; @@ -11010,12 +10969,12 @@ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "eterm-256color"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "dieggsy"; repo = "eterm-256color"; - rev = "89b20de890bc890331abe2d5e27a7e3129cde7b8"; - sha256 = "1bh0wqz2wkp8i1g8r8wgqzny0f5igflca5hkwq9p8ql84jkwlm69"; + rev = "dab96af559deb443c4c9c00e23389926e1607192"; + sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; @@ -11427,22 +11386,22 @@ license = lib.licenses.free; }; }) {}; - evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "3.1.3"; + version = "3.2.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "41d43709210711c07de69497c5f7db646b7e7a96"; - sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; + rev = "34d411715ead5829d6d8969511047feb703b067e"; + sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d"; name = "evil-nerd-commenter"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-nerd-commenter"; license = lib.licenses.free; @@ -11910,22 +11869,22 @@ license = lib.licenses.free; }; }) {}; - exato = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }: + exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exato"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "ninrod"; repo = "exato"; - rev = "ba21cd2c8d0588e1c70ba89ebad6df247605e03f"; - sha256 = "12xqysbdnkvz220qf0jz2v40809hcmdmga10ac74yhg00h25nll6"; + rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6"; + sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn"; name = "exato"; }; - packageRequires = [ evil thingatpt-plus ]; + packageRequires = [ emacs evil ]; meta = { homepage = "https://melpa.org/#/exato"; license = lib.licenses.free; @@ -12077,22 +12036,30 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; - sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; + rev = "4f7946db67d6599baba6b3961e8f543a68707742"; + sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; name = "exwm-x"; }; - packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; + packageRequires = [ + bind-key + cl-lib + counsel + exwm + ivy + swiper + switch-window + ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -12122,12 +12089,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.4.5"; + version = "1.0"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "4a79230739cfaa607f39fbfe53339692b83c3933"; - sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8"; + rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1"; + sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -12224,6 +12191,27 @@ license = lib.licenses.free; }; }) {}; + faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faff-theme"; + version = "2.0"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "emacs-faff-theme"; + rev = "0835c25b5e4ae7a79f0c1c4c44867f2d2e73b642"; + sha256 = "0msh7w8qmrd9977zamyh0qifzf5bwl6g1012gc8lsr995c6gwm87"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; + sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g"; + name = "faff-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/faff-theme"; + license = lib.licenses.free; + }; + }) {}; fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-battery"; @@ -12412,6 +12400,27 @@ license = lib.licenses.free; }; }) {}; + fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + version = "0.9"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "e819fca19a138ae67201220e41fe1d4384fb2a42"; + sha256 = "102aalb7bfvjgf1klqsx6mn5a4vfjq63kwn7wqs9cmlib1mp8vnf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "fill-function-arguments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "finalize"; @@ -12457,12 +12466,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.5.2"; + version = "5.6.4"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e"; - sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my"; + rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361"; + sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -12583,12 +12592,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "cd0387f7f1d5c50e080091f86ca97d8a67d603a6"; - sha256 = "0q4cq1rkiz5mjxhp7p5awmw59q1yjb2sryc9i54cwhr5dwwqf95k"; + rev = "bac709ac1235751952d6022dddc6307d9135d096"; + sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -12776,22 +12785,22 @@ license = lib.licenses.free; }; }) {}; - flower = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flower"; - version = "0.3.6"; + version = "0.4.1"; src = fetchFromGitHub { owner = "PositiveTechnologies"; repo = "flower"; - rev = "2c89a7b0bc9d7b2e95d98e159a059d41ae43933f"; - sha256 = "1ilj0wa53qs8863d7ri9k8m57jd4n2zm3ijs3s2i7fn8a3svmmhy"; + rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6"; + sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; name = "flower"; }; - packageRequires = []; + packageRequires = [ clomacs emacs ]; meta = { homepage = "https://melpa.org/#/flower"; license = lib.licenses.free; @@ -13262,12 +13271,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; - sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -13388,12 +13397,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "0.5"; + version = "0.8"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4"; - sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763"; + rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7"; + sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -13493,12 +13502,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; - sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -14078,27 +14087,6 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "1.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "6266840de17ac396dd7275a71da72cd5120c35a6"; - sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fn"; @@ -14141,27 +14129,6 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fold-dwim"; - version = "1.2"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fold-dwim"; - rev = "4764b0246a722d37eb8ec9f204ffaccaad1755d0"; - sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fold-dwim"; - license = lib.licenses.free; - }; - }) {}; fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: melpaBuild { pname = "fold-dwim-org"; @@ -14333,12 +14300,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "ee20f7a3bcb86b661a38480acf853c1da2db6d26"; - sha256 = "0y7ji7p3blgzbwsz434346g835hzjs896hd7jli1ig0b9b0l43my"; + rev = "8269066a9035fcf50eb835de3745a62c1cb96660"; + sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -14372,6 +14339,27 @@ license = lib.licenses.free; }; }) {}; + frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "frameshot"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "frameshot"; + rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a"; + sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot"; + sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70"; + name = "frameshot"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/frameshot"; + license = lib.licenses.free; + }; + }) {}; free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "free-keys"; @@ -14551,12 +14539,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "631c493b97b3e2f928892fb25fa29daca4927f83"; - sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68"; + rev = "784e3147196bfe82ea9499628467335ea1d036f9"; + sha256 = "07dqqpacvap034jzvdvnpjyryzicbvjx2imnsghsxw9m52jsb9wn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -14614,12 +14602,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710"; - sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d"; + rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f"; + sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -14674,22 +14662,22 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "6.3"; + version = "6.5"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "900e1788695d91dde2a3d7fee97681a3380285de"; - sha256 = "1lix0x2gj6lrcx6imr5w3scyix99526fwpx0vzs1dzxfzglscjja"; + rev = "3022e9f8411628e6a210fb5843d858b15a7513f5"; + sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; name = "gams-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; @@ -14761,12 +14749,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "8ef6a9321d81ff478cfd376023eb84b8a819a991"; - sha256 = "08aha9lxdxix1jq0vc3am9wsyivj6vjpfs8frm797aca3bwaam0j"; + rev = "775d1d734a677274fbbf4af780592bb3768d3f9b"; + sha256 = "086qlii1w7sqxwnxwxvc4d6d71p829jabhgwvi0l0bjkxn7bx8pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -14947,22 +14935,22 @@ license = lib.licenses.free; }; }) {}; - ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "1.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "d8ec78184ec82d363fb0ac5bab724f390ee71d3d"; - sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h"; + rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4"; + sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; name = "ghub"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs let-alist ]; meta = { homepage = "https://melpa.org/#/ghub"; license = lib.licenses.free; @@ -15118,12 +15106,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; - sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; + rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de"; + sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -15136,7 +15124,7 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: + git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; version = "0.3.1"; @@ -15144,14 +15132,14 @@ owner = "emacs-stuff"; repo = "git-commit-insert-issue"; rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; - sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; + sha256 = "1gffjf6byasisa9jdcv9n4n5zqalvzfsxv7z75zl0g3ph7wc7bbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax"; name = "git-commit-insert-issue"; }; - packageRequires = [ bitbucket github-issues gitlab helm projectile s ]; + packageRequires = [ bitbucket github-issues gitlab projectile s ]; meta = { homepage = "https://melpa.org/#/git-commit-insert-issue"; license = lib.licenses.free; @@ -15244,12 +15232,12 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "0.4.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "2d1d94fd2e8a17025224ae2224c5f44d8482dc64"; - sha256 = "1d0vk8344n4lcdcqxkv44qc7f3753mpy76hmgf8xi60kyajvjrd7"; + rev = "ea49e2e005af977a08331f8caa8f64d102b3b932"; + sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -15328,12 +15316,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "020d02cd77df6bf6f0efd4d4c597aad2083b6302"; - sha256 = "1g7gxa2snh8ya8r3wim834qszhcmpp154gnvqkc3b1gw8x7jdrql"; + rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043"; + sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -15370,12 +15358,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -15412,12 +15400,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -15538,12 +15526,12 @@ gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -15577,6 +15565,48 @@ license = lib.licenses.free; }; }) {}; + gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "gitlab-ci-mode"; + version = "20180306.1"; + src = fetchFromGitLab { + owner = "joewreschnig"; + repo = "gitlab-ci-mode"; + rev = "313431fa5b8b5ce4512909dfc15675bb99395f6f"; + sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; + sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f"; + name = "gitlab-ci-mode"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/gitlab-ci-mode"; + license = lib.licenses.free; + }; + }) {}; + gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }: + melpaBuild { + pname = "gitlab-ci-mode-flycheck"; + version = "20180304.1"; + src = fetchFromGitLab { + owner = "joewreschnig"; + repo = "gitlab-ci-mode-flycheck"; + rev = "388fd05f3ea88ed3ebafb09868fc021f6ecc7625"; + sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; + sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh"; + name = "gitlab-ci-mode-flycheck"; + }; + packageRequires = [ emacs flycheck gitlab-ci-mode ]; + meta = { + homepage = "https://melpa.org/#/gitlab-ci-mode-flycheck"; + license = lib.licenses.free; + }; + }) {}; gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitpatch"; @@ -15640,6 +15670,27 @@ license = lib.licenses.free; }; }) {}; + glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: + melpaBuild { + pname = "glab"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "ghub"; + rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4"; + sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; + sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8"; + name = "glab"; + }; + packageRequires = [ emacs ghub ]; + meta = { + homepage = "https://melpa.org/#/glab"; + license = lib.licenses.free; + }; + }) {}; gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }: melpaBuild { pname = "gmail-message-mode"; @@ -16063,12 +16114,12 @@ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-tag"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "brantou"; repo = "emacs-go-tag"; - rev = "a239f58bbef2629086d9e2cf90a64ba3d389a8a3"; - sha256 = "1w1m05ypl94xn2qvypbgvjhq7gysi13g42pqwlmppgsdh1kphwha"; + rev = "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40"; + sha256 = "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; @@ -16315,12 +16366,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "7d879bac14d09f2f2a45a0477c1e45fbf52240f5"; - sha256 = "09fllx7l2hsjrv1jl7g06xngjy0xwn5n5zng6x8dspgsl6kblyqp"; + rev = "123ed177021588bac57b5c87c1a84270ddf2eca8"; + sha256 = "0m144lpjbyil8cs57dw9q72abjhrd8cfwbalvzyaldgnx10j8gkc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -16599,12 +16650,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98"; - sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0"; + rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; + sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -16638,6 +16689,27 @@ license = lib.licenses.free; }; }) {}; + grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grep-context"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "grep-context"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; + sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g"; + name = "grep-context"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/grep-context"; + license = lib.licenses.free; + }; + }) {}; grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grin"; version = "1.0"; @@ -16980,7 +17052,7 @@ owner = "iain"; repo = "hamburger-menu-mode"; rev = "fd37f013c2f2619a88d3ed5311a9d1308cc82614"; - sha256 = "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm"; + sha256 = "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu"; @@ -17226,12 +17298,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "17b9facafcff8203012c037c5a589f290169fc33"; - sha256 = "00k13sl2yjnqjjdqlmz8ril07xw5al2ysbsnpmz81sccqa1kbikr"; + rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947"; + sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -17289,12 +17361,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; - sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; + rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28"; + sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -17625,12 +17697,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; - sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; + rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28"; + sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -18276,12 +18348,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "68f01726795ca3054cfc6327dcdb22c9c83dfdfa"; - sha256 = "0vak9phqgxz5dk1zj3i4cs94y797h77qadirsf33gl073cg95l8a"; + rev = "ecf5ad53bef572e38d8c8d93b516f8eab8c4dfe5"; + sha256 = "14020ws87m64bfxqw30c9hc88zb7w4kxs5svd2a10y00lgrg2m93"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -18738,12 +18810,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3"; - sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz"; + rev = "f1aeafd3de4d434fb89b9f65b863c9a53a7d2feb"; + sha256 = "194f2in1k4g9fm66q63ayqmrg5shj807nq4phmkgfm02p1hj7v5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -18780,12 +18852,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.8.5"; + version = "0.9.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "ee7f6a2c09df5fdc28b4d910840a7c56922059c3"; - sha256 = "0lkzi6h6wkm19mn7v6wjy50kd96k6hw7jhx7pxwgfp577816c7c2"; + rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64"; + sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -18885,12 +18957,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "3ae20551fb0ce199deff47534a475cab50f19237"; - sha256 = "1zb2zfyflabhar8smvpxcdmkla7camaq2srq6dk2xc66226vj9rn"; + rev = "c527d0a9f66b50c28dfc44b88c5dd634c770ade2"; + sha256 = "0mbqwxnk689mx58yjqs6dyyfkcgakginm35nqzp3kdwsvwvvkxzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -18966,6 +19038,27 @@ license = lib.licenses.free; }; }) {}; + hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hide-mode-line"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-hide-mode-line"; + rev = "86b9057391edad75467261c2e579603567e608f9"; + sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line"; + sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl"; + name = "hide-mode-line"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hide-mode-line"; + license = lib.licenses.free; + }; + }) {}; hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; @@ -19281,36 +19374,15 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; - sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; + rev = "fbe311b3be34cb5719e612f71d46a87b99954309"; + sha256 = "0f7dsp2b0hzzz6klcmawwlid1jyl90ax0p2ph7bh2791jhywq60k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -19452,12 +19524,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "1.51"; + version = "1.53"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "88e2cb6588827893d7bc619529393887c264d15a"; - sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n"; + rev = "1bc2f1b0feb852fa5a289a1d72646b16ac84adf1"; + sha256 = "0dr235c0z8is3pi5xdgqyqljg6px0b2aya6qb79zkyi477bmz4ip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -19662,12 +19734,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6"; - sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h"; + rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1"; + sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -19932,27 +20004,6 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "4.7"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-vertical-mode"; @@ -20166,12 +20217,12 @@ imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imake"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "imake"; - rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; - sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + rev = "7df5fb9684a0288313ef5f64594078d477105959"; + sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; @@ -20187,12 +20238,12 @@ imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "a879ddc36fedc30311693f308f414c520fdfc370"; - sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs"; + rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea"; + sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; @@ -20753,12 +20804,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.26"; + version = "0.1.29"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "f85e1b47df3bb328be0de34120950cecb3465055"; - sha256 = "1zng4sliygg1l0jamprx9pfs85jiy19gwxpcy2hs3s4hc7yxjdds"; + rev = "73997cf10277e9781682768113ebd87eeb6d2882"; + sha256 = "1mf2ddpgnyjiq2km1qc4l926xp8mj9vrszlizh39hn3acxqlac7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -20984,12 +21035,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "acd6322571cb0820868a6febdc5326782a29b729"; - sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; + rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6"; + sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -21044,6 +21095,27 @@ license = lib.licenses.free; }; }) {}; + ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: + melpaBuild { + pname = "ivy-mpdel"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "ivy-mpdel"; + rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; + sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; + sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r"; + name = "ivy-mpdel"; + }; + packageRequires = [ emacs ivy libmpdel mpdel ]; + meta = { + homepage = "https://melpa.org/#/ivy-mpdel"; + license = lib.licenses.free; + }; + }) {}; ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-pages"; @@ -21549,12 +21621,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170721"; + version = "20180301"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc"; - sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy"; + rev = "38e425785d5ea4600c3642f6500062ecedf694a4"; + sha256 = "1afvm8cp9h0v0pk7v3jwag6f608v1787l7m7a9541ld616cgb5x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -21906,12 +21978,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "8a229fcd1d73876920a063f0eba906a5080275a7"; - sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911"; + rev = "0a80628e083db6e9d4b4af73be5d917d7d667330"; + sha256 = "1brb0l39xkl19h9xslvmms9vcziygfp244xs5r3n4dqn43c7rr68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22008,15 +22080,36 @@ license = lib.licenses.free; }; }) {}; + keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "keycast"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "keycast"; + rev = "46370b8a72922902921d3ed2fa194564568053dc"; + sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; + sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id"; + name = "keycast"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/keycast"; + license = lib.licenses.free; + }; + }) {}; keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keychain-environment"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "keychain-environment"; - rev = "7c08e8c4c3ea4d6eaee12d710a56793771f837c5"; - sha256 = "1mnqa69f584qzb62nn01bb4nz08gi7ra8b6xr0x7aphfqzk86kzy"; + rev = "d3643196de6dc79ea77f9f4805028350fd76100b"; + sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; @@ -22074,12 +22167,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "0130f32e5ade649dd2738206a80570e450906ef6"; - sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; + rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7"; + sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -22326,12 +22419,12 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; - rev = "eb894bcb0769ce73404734f14f7582661abe02c8"; - sha256 = "118csp4pi1dxm9grmd006d9wmdplnx8gnk02hbfrl639k7hnnd8z"; + rev = "a27153f6a01f38226920772dc4917b73166da5e6"; + sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; @@ -22368,12 +22461,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "1.6.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d976e4f0cadb2309b798540429558936f8f45889"; - sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -22415,7 +22508,7 @@ owner = "latex-math-preview"; repo = "latex-math-preview"; rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc"; - sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw"; + sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; @@ -22617,6 +22710,27 @@ license = lib.licenses.free; }; }) {}; + libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "libmpdel"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "libmpdel"; + rev = "abb748b6cb35de4652df80ce8539bfc63189619d"; + sha256 = "0ccqcn85131pywzga4644f0azxrsl5ay69m6jz27zzvshs7gzzjv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; + sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1"; + name = "libmpdel"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/libmpdel"; + license = lib.licenses.free; + }; + }) {}; lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lice"; @@ -22942,12 +23056,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.21.1"; + version = "2.22.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9"; - sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66"; + rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a"; + sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -23169,6 +23283,27 @@ license = lib.licenses.free; }; }) {}; + lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lsp-mode"; + version = "4.1"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-mode"; + rev = "065c36f1fceb6322b7ff8fd4bc623aa0cf6136ba"; + sha256 = "0129h8h2abc7vcv0h5b2lsr6swa0zq597s5r7zcfj3macga7iifr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; + sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; + name = "lsp-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lsp-mode"; + license = lib.licenses.free; + }; + }) {}; lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-ocaml"; @@ -23316,15 +23451,15 @@ license = lib.licenses.free; }; }) {}; - magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: + magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; - sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; + rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de"; + sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; @@ -23335,7 +23470,9 @@ async dash emacs + ghub git-commit + let-alist magit-popup with-editor ]; @@ -23473,12 +23610,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; - sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + rev = "f337f178a1b4d2e4c1199fa02338febe216ab902"; + sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -23491,45 +23628,45 @@ license = lib.licenses.free; }; }) {}; - magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { - pname = "magit-popup"; - version = "2.12.2"; + pname = "magit-org-todos"; + version = "0.1.2"; src = fetchFromGitHub { - owner = "magit"; - repo = "magit-popup"; - rev = "ab75385a1fb8c0fba0769d448b13ba8324835261"; - sha256 = "0ky4l3k3camh1paa5ap9frr9hcadj7nj40l3imiiqfcvgyl8ijp6"; + owner = "danielma"; + repo = "magit-org-todos.el"; + rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55"; + sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; - sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv"; - name = "magit-popup"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; + sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr"; + name = "magit-org-todos"; }; - packageRequires = [ async dash emacs ]; + packageRequires = [ emacs magit ]; meta = { - homepage = "https://melpa.org/#/magit-popup"; + homepage = "https://melpa.org/#/magit-org-todos"; license = lib.licenses.free; }; }) {}; - magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "magit-rockstar"; - version = "1.1.0"; + pname = "magit-popup"; + version = "2.12.3"; src = fetchFromGitHub { - owner = "tarsius"; - repo = "magit-rockstar"; - rev = "c8320472e8a50c8299140ba0943bb1fe485d294a"; - sha256 = "1xjym51z0v7ibxw059f6k3zljli6z390rmxvrywbfzkb8hqms0l1"; + owner = "magit"; + repo = "magit-popup"; + rev = "32e6da899abd6657c098534c5775fc7177047f49"; + sha256 = "0nrvs7gwd9kn4n808akrydn7zggvy9zyk38yrcmm561kw0h0h903"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; - sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n"; - name = "magit-rockstar"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; + sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv"; + name = "magit-popup"; }; - packageRequires = [ dash magit ]; + packageRequires = [ async dash emacs ]; meta = { - homepage = "https://melpa.org/#/magit-rockstar"; + homepage = "https://melpa.org/#/magit-popup"; license = lib.licenses.free; }; }) {}; @@ -23963,12 +24100,12 @@ mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mastodon"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318"; - sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp"; + rev = "ae8dabda04e377a6ac22cb854e4844f68073f533"; + sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -24152,12 +24289,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; - sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; + rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788"; + sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -24338,6 +24475,27 @@ license = lib.licenses.free; }; }) {}; + mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mgmtconfig-mode"; + version = "0.0.15"; + src = fetchFromGitHub { + owner = "purpleidea"; + repo = "mgmt"; + rev = "3ad7097c8aa7eab7f895aab9af22338c0cf82986"; + sha256 = "04sq8qn6wpsn5yxyf1g2cxv74v3r7n1n32jv174qdn4qknc9khkv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; + sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil"; + name = "mgmtconfig-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mgmtconfig-mode"; + license = lib.licenses.free; + }; + }) {}; mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; @@ -24485,6 +24643,27 @@ license = lib.licenses.free; }; }) {}; + minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "minions"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "minions"; + rev = "4fa1b333ecc13f577fab84ee64b8ee385a214b1e"; + sha256 = "0gzp1n0jpjmlskbw8mpdpql0d050qdcxwkcw1bfpp07xbs071w0l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions"; + sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940"; + name = "minions"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/minions"; + license = lib.licenses.free; + }; + }) {}; minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minitest"; @@ -24509,12 +24688,12 @@ mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mips-mode"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "dcde079176c1419ec24df08b62dd77a897892437"; - sha256 = "0jvbcld3abm45qzsbcaf6f1zd71hgdg5y47v6c0ri4xgwgcwqrvc"; + rev = "e6c25201a3325b555e64388908d584f3f81d9e32"; + sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -24568,27 +24747,6 @@ license = lib.licenses.free; }; }) {}; - mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mmm-mode"; - version = "0.5.4"; - src = fetchFromGitHub { - owner = "purcell"; - repo = "mmm-mode"; - rev = "4085494df67e0a3207839a175ac62673dfd0acc1"; - sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; - sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw"; - name = "mmm-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mmm-mode"; - license = lib.licenses.free; - }; - }) {}; mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; @@ -24718,12 +24876,12 @@ mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-line-debug"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "mode-line-debug"; - rev = "da44422eeb6a1f055b4ec2f822962c5162fce001"; - sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1"; + rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b"; + sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug"; @@ -24781,12 +24939,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.5.0"; + version = "3.5.3"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a"; - sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -24820,15 +24978,36 @@ license = lib.licenses.free; }; }) {}; + moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "moody"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "moody"; + rev = "db27ba168503bd6e6c98c313e73699dc403a10aa"; + sha256 = "1y0zg0flcv3sawyqvwilh1ysvbn1bsnkn0b2n89lj00zyb5dj5z8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; + sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy"; + name = "moody"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/moody"; + license = lib.licenses.free; + }; + }) {}; morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "morlock"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "morlock"; - rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5"; - sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj"; + rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834"; + sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock"; @@ -24988,6 +25167,48 @@ license = lib.licenses.free; }; }) {}; + mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }: + melpaBuild { + pname = "mpdel"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "mpdel"; + rev = "3786dd31a9f0a3355c967889323742cfe61f4141"; + sha256 = "0fqdhjmywyw9yd97glrw12j962kmq062djgz2ymv6kspy2g1xv9y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; + sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8"; + name = "mpdel"; + }; + packageRequires = [ emacs libmpdel ]; + meta = { + homepage = "https://melpa.org/#/mpdel"; + license = lib.licenses.free; + }; + }) {}; + mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: + melpaBuild { + pname = "mpmc-queue"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "smizoe"; + repo = "mpmc-queue"; + rev = "4775ddcb120528828ef1fcb7ee761524a0907a31"; + sha256 = "0fbrx288vpd0vx2cph7kfclr7hhplqjgynr6csmkh8jaskv26p79"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue"; + sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354"; + name = "mpmc-queue"; + }; + packageRequires = [ emacs queue ]; + meta = { + homepage = "https://melpa.org/#/mpmc-queue"; + license = lib.licenses.free; + }; + }) {}; mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: melpaBuild { pname = "mpv"; @@ -25155,6 +25376,27 @@ license = lib.licenses.free; }; }) {}; + multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: + melpaBuild { + pname = "multi-run"; + version = "1"; + src = fetchFromGitHub { + owner = "sagarjha"; + repo = "multi-run"; + rev = "87d9eed414999fd94685148d39e5308c099e65ca"; + sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; + sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h"; + name = "multi-run"; + }; + packageRequires = [ emacs window-layout ]; + meta = { + homepage = "https://melpa.org/#/multi-run"; + license = lib.licenses.free; + }; + }) {}; multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; @@ -25263,12 +25505,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "d7885c32ad54f5b5698b48abea392a8eae2567a8"; - sha256 = "1kssmryl44m4cq05ff98blwdvqafb9x7v3bvb1z70rrvdvw3l024"; + rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf"; + sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -25578,12 +25820,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; - sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -25725,12 +25967,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "d5e839692a1273b128003eaed543318e7e5965a7"; - sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; + rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660"; + sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -25767,12 +26009,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "8e321f1036770c20637a0f946b655805cd070e25"; - sha256 = "11hxf0fkka4mv1qsw0nx3ymvgcav95r2bvk1gwyj5m5cbwb4a1n9"; + rev = "57bf044e2f779a03c7bb80c9131d31286ca9660d"; + sha256 = "0fdsm6d3v2hjcyl2kcrzv1fzy17qy8l5a5kpkrv3xq3s25l7dqx1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -25827,6 +26069,27 @@ license = lib.licenses.free; }; }) {}; + nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nofrils-acme-theme"; + version = "0.1.0"; + src = fetchFromGitLab { + owner = "esessoms"; + repo = "nofrils-theme"; + rev = "7825f88cb881a84eaa5cd1689772819a18eb2943"; + sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme"; + sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a"; + name = "nofrils-acme-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nofrils-acme-theme"; + license = lib.licenses.free; + }; + }) {}; nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nord-theme"; @@ -25869,11 +26132,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.26"; + version = "0.26.1"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583"; - sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f"; + rev = "ea690a44d1a5af3da496b0d9482471cbd9623231"; + sha256 = "0c9ihkwg2p2sq1zkribbc4k60sl5zdi3sgcy0v2amydsk5kkfy3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -25910,12 +26173,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "4ef20ebb587ffb0ab73c85ad5748d41af1071596"; - sha256 = "03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb"; + rev = "e7bb37334ca85ce0e3f5c980464f652266a11218"; + sha256 = "1lymf4ir9kja0dpifbx230cq3n1li25kcdn3x3bh8fskiil1pqm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -26204,12 +26467,12 @@ ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "7e94309d3a21d7e265f3a85b41801397f286af00"; - sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w"; + rev = "efa86bb70fd1907806f3e43705aff54d35582442"; + sha256 = "0g25nn2h7djgc9rp59spx9096jdypsizd0vfzwj96cpq90lkysjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -26544,8 +26807,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7a6fe00e841106b17e7554f8a21f8457d12c5197"; - sha256 = "1vrgj2irm87pykfjyx27a46g5xam7rxwjdfqh4jl6p8cgzgprrrg"; + rev = "c00a3a9157432c578fffb79169232e4a81d4ad31"; + sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -27073,6 +27336,27 @@ license = lib.licenses.free; }; }) {}; + org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-index"; + version = "5.8.8"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "0dfe0a67979279345378ca006ab4f727df378aca"; + sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "org-index"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "org-jira"; @@ -27094,27 +27378,48 @@ license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.12.3"; + version = "1.13.3"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "44a52a20a154d5c1a78684ef720972c4fe36b64a"; - sha256 = "0c4jwh53mgy4qpv7aiwbsbvjjhchyfjb0ca5ny5875ljvkq59qz6"; + rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800"; + sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; name = "org-journal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; }; }) {}; + org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-kanban"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "gizmomogwai"; + repo = "org-kanban"; + rev = "2f0909f6f988f5185026a46a9cc929404652672f"; + sha256 = "08imw445bic3r8x7wls78dqskgx9ny5lixdksrvnp806vixq0f94"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; + sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41"; + name = "org-kanban"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-kanban"; + license = lib.licenses.free; + }; + }) {}; org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-travis"; @@ -27220,6 +27525,27 @@ license = lib.licenses.free; }; }) {}; + org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-noter"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "weirdNox"; + repo = "org-noter"; + rev = "32cdf41079ca67c5906a10215eb7fbaefebab994"; + sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; + sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf"; + name = "org-noter"; + }; + packageRequires = [ cl-lib emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-noter"; + license = lib.licenses.free; + }; + }) {}; org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-outlook"; @@ -27506,12 +27832,12 @@ org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; - version = "1.0.3"; + version = "1.1.2"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "1a63f7eb0682a73126b534458b403ad0858273e8"; - sha256 = "13k8rqh8r48hhdn8z580g379m6mgyc3jnh8a2kk0b22vlx6c3zap"; + rev = "ab4ad93a23e5402b5276c061945872dd6d586e75"; + sha256 = "07j4gyw22372nlfbaf94w6a7pza01zp6ivsg9iq2hcnx5pniv7hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -27737,12 +28063,12 @@ org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: melpaBuild { pname = "org-trello"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; - rev = "32dd866e830836a72a3b96b96e0d00d044d0eaf7"; - sha256 = "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm"; + rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c"; + sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; @@ -27893,12 +28219,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c"; - sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax"; + rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7"; + sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -27914,12 +28240,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; - sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; + rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d"; + sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -28037,27 +28363,6 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; @@ -28100,6 +28405,27 @@ license = lib.licenses.free; }; }) {}; + outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outlook"; + version = "0.1"; + src = fetchFromGitHub { + owner = "asavonic"; + repo = "outlook.el"; + rev = "5847c6f13b106cb54529080e9050be5b8b5be867"; + sha256 = "13wlfklk342gv5fmzpnz69mc07vm8x6xmh7li1w7f13ci3v4s045"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook"; + sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k"; + name = "outlook"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/outlook"; + license = lib.licenses.free; + }; + }) {}; outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outorg"; @@ -28163,6 +28489,27 @@ license = lib.licenses.free; }; }) {}; + overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "overcast-theme"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "myTerminal"; + repo = "overcast-theme"; + rev = "009257956522dedf07d9e136ee41ac0b1b0b3518"; + sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme"; + sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r"; + name = "overcast-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/overcast-theme"; + license = lib.licenses.free; + }; + }) {}; overseer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; @@ -28436,22 +28783,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }: melpaBuild { pname = "package-utils"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "e00df8a85fb3d0cfe9dde5a683d81e1a89570e29"; - sha256 = "14zcg9rc2nif8kv8pfmv9arbq0i8glviyvxgxr0lfiif2n4cfg9s"; + rev = "652531caf1a1df916d2185e7f47085bd0509c940"; + sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = []; + packageRequires = [ restart-emacs ]; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -28460,12 +28807,12 @@ packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "2.0.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "packed"; - rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a"; - sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm"; + rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa"; + sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; @@ -28668,12 +29015,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "166975683225367c866e6ae6f6acb88d24e21a35"; - sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy"; + rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4"; + sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -29443,12 +29790,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "1.18.4"; + version = "1.19.0"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "ad7d1092e1d66602482c5b54ed0609c6171dcae1"; - sha256 = "03yp07dxmxmhm8p5qcxsfdidhvnrpls20nr234cz6yamjl5zszh6"; + rev = "c68013a583e2f0bd0792e0988ff9ce3e6deae531"; + sha256 = "0ycqf8fr3f4flgww9ffiga2hkj8l6ikcdj93iafp7qxqs1bzjxfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -29930,6 +30277,27 @@ license = lib.licenses.free; }; }) {}; + pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pomidor"; + version = "0.2"; + src = fetchFromGitHub { + owner = "TatriX"; + repo = "pomidor"; + rev = "5780ce2aaa98882a79e92f5eefaaf10fd8dbee3a"; + sha256 = "19bz3pg3s265wpcwb458i84138z170rgd1qybn6vrll2brvwsf8b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; + sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi"; + name = "pomidor"; + }; + packageRequires = [ alert emacs ]; + meta = { + homepage = "https://melpa.org/#/pomidor"; + license = lib.licenses.free; + }; + }) {}; pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "pony-snippets"; @@ -30562,12 +30930,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.5.1.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "860bd12fec5c69e6529565165532b3d5108a7d97"; - sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; + rev = "b5fbb742af122b565925987e65c08957739976a7"; + sha256 = "14gq6rnv03zvcb5hym240z4yqiphrmd5y4zx9a77n37rwvfgx5qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -30622,22 +30990,22 @@ license = lib.licenses.free; }; }) {}; - psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc"; - sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53"; + rev = "c48b0574e1477437b4427e78d018f858b49fd0ff"; + sha256 = "1ffgnkdvrryc84cw1m5k37zx22dd5l7z882zgfh1p3dfzh8rqpqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a"; name = "psession"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ async cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/psession"; license = lib.licenses.free; @@ -30714,7 +31082,7 @@ owner = "elzair"; repo = "punctuality-logger"; rev = "708cae8e67dbae293c7c4be0ca5e49d76fac6714"; - sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py"; + sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/punctuality-logger"; @@ -31071,7 +31439,7 @@ owner = "python-mode-devs"; repo = "python-mode"; rev = "a0a534639bc6142c2c2f44bd7ca5878ad5f79518"; - sha256 = "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml"; + sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -31087,12 +31455,12 @@ python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: melpaBuild { pname = "python-pytest"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-python-pytest"; - rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe"; - sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm"; + rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70"; + sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; @@ -31157,12 +31525,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "71eec02c25006737444dec7dfd004285f6cff6a8"; - sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m"; + rev = "70a755d79b04964bdb969e41166f2473e21f277e"; + sha256 = "1sim74ccvwifradjdq726jbfcbw52cizbj1vh8q7c75qis6nhb7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -31196,6 +31564,27 @@ license = lib.licenses.free; }; }) {}; + ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ql"; + version = "1.0"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6"; + sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "ql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; @@ -31640,12 +32029,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "3804711863630affe79614a1527bc12c0955ec7c"; - sha256 = "0fi48xh6rc7z146rafkabqhg6wy3zv85apn1bciw9pysazblq8pb"; + rev = "09431a4561921bece36a6083b6e27ac4dc82432d"; + sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -32192,12 +32581,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "562ac6fd6291f828ee6116db62982c77ddd52956"; - sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw"; + rev = "d50bd106275f3ef7f77d0147857412fb065eef47"; + sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -32318,12 +32707,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "79bedb1d188e209be5cfef3bea8906df9c509ab8"; - sha256 = "1dh76r9hy1d1f9xhdywslgv0w3c9nhsbwvpd8icgp300x5c6a3zh"; + rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0"; + sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -32927,12 +33316,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298"; - sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -32948,12 +33337,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "84c3d178a1f2c580f620fd8f03a05ac6413086a3"; - sha256 = "1ndxylb2jbnfrrsbbs5vcxygrqd3ssf3az01nh694hv6lkcidw5k"; + rev = "a70899661861cf40f54f773c3066fe5b5e9fb71d"; + sha256 = "0gnqy88qi751pzpg8ga3j2yx0x9cz5inkqpv2451n5b0gjfps9yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -33594,7 +33983,7 @@ license = lib.licenses.free; }; }) {}; - shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: + shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "shrink-path"; version = "0.3.1"; @@ -33602,14 +33991,14 @@ owner = "bennya"; repo = "shrink-path.el"; rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b"; - sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki"; + sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path"; sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb"; name = "shrink-path"; }; - packageRequires = [ dash f s ]; + packageRequires = [ dash emacs f s ]; meta = { homepage = "https://melpa.org/#/shrink-path"; license = lib.licenses.free; @@ -33660,12 +34049,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8"; - sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf"; + rev = "b33b23097ad34177e4179e9d3731ec5db30c6391"; + sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -34521,12 +34910,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; - sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; + rev = "d0ff4dea49540f37301d869f2797fca2492f55d5"; + sha256 = "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -34731,12 +35120,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "0ca89a2186ac35d7323ac45c0bea2e1c9ecd61ea"; - sha256 = "0a0vy1pg9s6vh3z52bahhcls9b5p4hhqi075cqsif0ld2l4a4am2"; + rev = "2837b97244111515c61fb3823c1479bc126a458b"; + sha256 = "0hqp8r24wvzrkl630wbm0lynrcrnawv2yn2a3xgwqwwhwgva35rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -34980,6 +35369,27 @@ license = lib.licenses.free; }; }) {}; + srcery-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "roosta"; + repo = "emacs-srcery"; + rev = "385809e78a2494ee617782430415048d91a11444"; + sha256 = "1r6k042jipqz04nlr9gfpq6p80k33k4aqxsn03p1sicnpakzpixg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme"; + sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn"; + name = "srcery-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -35490,8 +35900,8 @@ src = fetchFromGitHub { owner = "CestDiego"; repo = "sweetgreen.el"; - rev = "9de3916023872ab054e1c7301175fa27fdb1de0c"; - sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs"; + rev = "e40d2821ff941695e50a9b003a8c96d32c19bfdc"; + sha256 = "1gw09x5d4yqlmknjsrhgygp9bch315cnmyqp3679i3hza0l7fds6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen"; @@ -35672,6 +36082,27 @@ license = lib.licenses.free; }; }) {}; + symbolword-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "symbolword-mode"; + version = "1.0"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "symbolword-mode"; + rev = "273dece5b04f7abc4c35048b2f64f04b33774b87"; + sha256 = "0gpm0zy1kwqxkakvfdgh1lylp99msyamwvi19c53g9jl01m9avyd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode"; + sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050"; + name = "symbolword-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/symbolword-mode"; + license = lib.licenses.free; + }; + }) {}; symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; @@ -35779,12 +36210,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "149c253583e8b4d56a851b1e91e456260749cdea"; - sha256 = "1c0q9c0wq9kskg8p6mnh6mnkivlabb46aqfcs7ms21497ndlmlsv"; + rev = "fff67d190440fb076104f0f52d55a5e098207e31"; + sha256 = "0ia4nnyhk84dkahsan8l8dslmqiv0afs5abc1w2fnql7zhsiac6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -36493,12 +36924,12 @@ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "tidal"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; - sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f"; + sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -36514,12 +36945,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.7.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "6ca5319cdd581d323944584242a1ba45a115ee3d"; - sha256 = "1jcnzx8g742pfh9nv3gcsxdj31kfpjzl202by30pzg2xz54i48gb"; + rev = "0db094ba1748e3add4e152fa34d64b25eb07bdd2"; + sha256 = "113lg22aaagh3bbabxp65460cfwa9whjg3yzafd5n8azkinq8s6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -36752,8 +37183,8 @@ sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; - sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs"; + sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv"; name = "treemacs"; }; packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; @@ -36773,8 +37204,8 @@ sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; - sha256 = "1b02dybvp2fs9n1f80gpnqaxic45wwykny7vdyfay11ds5xzfpsg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil"; + sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg"; name = "treemacs-evil"; }; packageRequires = [ evil treemacs ]; @@ -36794,8 +37225,8 @@ sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; - sha256 = "0q3rj0g03423ql0d1ssp928x5f4540kxqlg51584aw57dlyy2z3n"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile"; + sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc"; name = "treemacs-projectile"; }; packageRequires = [ projectile treemacs ]; @@ -37401,12 +37832,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; - sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -37440,15 +37871,36 @@ license = lib.licenses.free; }; }) {}; + use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + melpaBuild { + pname = "use-package-el-get"; + version = "0.1"; + src = fetchFromGitHub { + owner = "edvorg"; + repo = "use-package-el-get"; + rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947"; + sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get"; + sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0"; + name = "use-package-el-get"; + }; + packageRequires = [ use-package ]; + meta = { + homepage = "https://melpa.org/#/use-package-el-get"; + license = lib.licenses.free; + }; + }) {}; usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "usql"; - version = "0.0.1"; + version = "0.0.3"; src = fetchFromGitHub { owner = "nickbarnwell"; repo = "usql.el"; - rev = "4cd8f4cf5c2e75485343321f02d621915aef10e8"; - sha256 = "0cw25g8jvfjpzq3sabc3zbp0qynknzc0mq5psspcbxffk2qalbb9"; + rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d"; + sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; @@ -37464,12 +37916,12 @@ utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "599fa4ff640d731927415a44679e5b07d9553acd"; - sha256 = "030wmzi51hya4180m411afy8i2vkq63r630cms3apdqd2bkjjjqs"; + rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07"; + sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -37784,7 +38236,7 @@ owner = "iankelling"; repo = "visible-mark"; rev = "c1852e13b6b61982738b56977a452ec9026faf1b"; - sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv"; + sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark"; @@ -38136,12 +38588,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "15"; + version = "16"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2"; - sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r"; + rev = "3ff506aae50a47b277f2b95ff7b7a7c596664e6a"; + sha256 = "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -38723,12 +39175,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; - sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; + rev = "ff3e96929d4532e33422a5980a6e3ca9f2fcf032"; + sha256 = "1fhn2wd0wszbnfpvnjmlw8gxqzy8f4q7dg7r16jpa1cmk0fpcdi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -39311,12 +39763,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695"; - sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv"; + rev = "340aec635e359609b22f7e94df15af1af2b070f6"; + sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -39828,7 +40280,7 @@ owner = "egh"; repo = "zotxt-emacs"; rev = "43c0c6d23b31126bac6b14bb85608180fd9c866f"; - sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp"; + sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index a2ba794933ea..33473ecad3f0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -81,10 +81,6 @@ self: inherit (self.melpaPackages) ess ctable popup; }; - ess-R-object-popup = super.ess-R-object-popup.override { - inherit (self.melpaPackages) ess popup; - }; - # upstream issue: doesn't build eterm-256color = markBroken super.eterm-256color; @@ -100,8 +96,8 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; # build timeout graphene = markBroken super.graphene; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index f6349089be1e..c0223e17a567 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20180226"; + version = "20180416"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180226.tar"; - sha256 = "0jqvry6gah1bwnryha4asynj13jyds3qim0xcy7s01rxk99m2ziy"; + url = "https://orgmode.org/elpa/org-20180416.tar"; + sha256 = "05rbkrs93zd9kvldwvypb8fwwaysajy5n7b2k9c8xm2cx2nayv8m"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180226"; + version = "20180416"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180226.tar"; - sha256 = "034wp70hcqnpidji5k1k80mj35iyyy098nbvc2sl7i2aca4m03zc"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180416.tar"; + sha256 = "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 7be55b873bc5..0e4a6a5bf207 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.10"; + version = "1.6.11"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "0hrbycy5lapdkaa2xm90j45sgsiqdnlk9wry41kxxpdln9msabxs"; + sha256 = "0izbsm2vx24pnd92gf7ky8x47g324a8d16hy1s8kk3x1inxd80z1"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Simple, distraction-free writing environment"; license = licenses.gpl3Plus; maintainers = with maintainers; [ madjar ]; - platforms = platforms.all; + platforms = platforms.linux; homepage = https://gottcode.org/focuswriter/; }; } diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 23478758efe5..bedc299ee673 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl }: with stdenv.lib; @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool libintl ]; buildInputs = [ gtk2 which file ]; doCheck = true; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 491fc0ca2a8d..7a0399ea0f84 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ghostwriter"; - version = "1.5.0"; + version = "1.6.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "0ixw2w2526836lwj4pc0vp7prp1gls7iq37v8m9ql1508b33b9pq"; + sha256 = "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3c5574388236..84ba32c41256 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -104,9 +104,9 @@ let }) (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv - chmod +x $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv ''; }); @@ -239,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1yxjvsp89mkk7gghbz5lqh7bbqi6l1ihg876c60bhqg0f5m98zcg"; /* updated by script */ + sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -265,12 +265,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "073wwhg58hkd8w4jazvwngl78gbhnmilm63jhpirr98jk7i7a4mq"; /* updated by script */ + sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -278,12 +278,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "124rzc46f4bqyhllwyb26lkavh7zwbj62axrwhif34rayl2rcmpm"; /* updated by script */ + sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -291,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "10r3z37mhr8daxi14k011bhx3pxpx3lsj7jvikwll4wjlv1znhiw"; /* updated by script */ + sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -304,12 +304,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2017.3.6"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1mcq8n7rd074aghmiyqf1yg3qvs28w97kk4dygj2a46y3s1ha4cd"; /* updated by script */ + sha256 = "00g86fggh8wfm02k9wwn33yqmbfr2b1x3vnvyn9gdpycdk46lqgw"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; @@ -317,12 +317,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "027w73qrrj7aml2kdj3sx890q7jyj2jfnsg0pivi7i4kh8i11204"; /* updated by script */ + sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -330,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0040ryx7kj64vwc10gvns43f1c97dvrgnwlmdm1m1506ldvaw0si"; /* updated by script */ + sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -369,12 +369,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "123v4m8p7acndj8p8frn1bjvycijlx904pa84ka9pv18c90qiym9"; /* updated by script */ + sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 6b7881c490cf..0943513a4d12 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -6,7 +6,7 @@ let verMajor = "1"; verMinor = "1"; - verPatch = "423"; + verPatch = "442"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "02kpmzh0vr0gb5dhiwcm4gwjbc3biwz0km655mgzmx9j64cyd3nf"; + sha256 = "0drqh2brfs9w8dfh4r7j3fsqdsg63s6pvj2bbg5xwwc0yf220ahs"; }; # Hack RStudio to only use the input R. diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 9cf5bd97d0a3..9cf5bd97d0a3 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime/3/common.nix index 9c8a75320a61..7185a82a9601 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,33 +1,39 @@ +{buildVersion, x32sha256, x64sha256}: + { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, - gksuSupport ? false, gksu, unzip, zip, bash }: + gksuSupport ? false, gksu, unzip, zip, bash}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3143"; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; in let + archSha256 = + if stdenv.system == "i686-linux" then + x32sha256 + else + x64sha256; + + arch = + if stdenv.system == "i686-linux" then + "x32" + else + "x64"; + # package with just the binaries sublime = stdenv.mkDerivation { - name = "sublimetext3-${build}-bin"; - + name = "sublimetext3-${buildVersion}-bin"; src = - if stdenv.system == "i686-linux" then - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - } - else - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; - }; + fetchurl { + name = "sublimetext-${buildVersion}.tar.bz2"; + url = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; + sha256 = archSha256; + }; dontStrip = true; dontPatchELF = true; @@ -80,8 +86,8 @@ in let wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; -in stdenv.mkDerivation { - name = "sublimetext3-${build}"; +in stdenv.mkDerivation (rec { + name = "sublimetext3-${buildVersion}"; phases = [ "installPhase" ]; @@ -110,4 +116,4 @@ in stdenv.mkDerivation { license = licenses.unfree; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix new file mode 100644 index 000000000000..01445ade4732 --- /dev/null +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -0,0 +1,18 @@ +{ callPackage }: + +let + common = opts: callPackage (import ./common.nix opts); +in + rec { + sublime3-dev = common { + buildVersion = "3162"; + x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i"; + x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3"; + } {}; + + sublime3 = common { + buildVersion = "3143"; + x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; + x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; + } {}; + } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 03505ec11a5f..938f38174796 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}: +{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.12.6"; + version = "2.12.8"; name = "${pname}-${version}"; - altname="Texstudio"; - src = fetchurl { - url = "mirror://sourceforge/texstudio/${name}.tar.gz"; - sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd"; + src = fetchFromGitHub { + owner = "${pname}-org"; + repo = pname; + rev = version; + sha256 = "0f1az7398rnxmm3m9b2jcz7pd9x445fjsv8w85k2j261n5cyfqx2"; }; nativeBuildInputs = [ qt5.qmake pkgconfig ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index bd08d599755a..8444ff6eaecc 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "0rf50w7nkdm70999q1mj7sy5hyjj41qjf4izi849q9a7xnhddv44"; + sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 00b2b23c6f47..5b4f631987f2 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.1605"; + version = "8.0.1655"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0a8zf43q806py14vq1frm350wycn47cmanj1hn1i7bqx1gdgcal9"; + sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 2af6e93bcfcc..7825188fea9b 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vis-${version}"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k"; + sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb"; repo = "vis"; owner = "martanne"; }; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index a8b38012a131..5c10f6fb3bbc 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.21.1"; + version = "1.22.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0c5wh6i4yl601hg0r1c8y25lz7j2p4vhisdnvnx9nzd6v4ib27cj"; - "x86_64-linux" = "19i0wkl0qccq2cm10khy0xxb53a6g2m061g71y54s4cxb4wimc9l"; - "x86_64-darwin" = "0d1ws4c3n80gypiarqbylyipg273ssc0m29jnrg7hx1mcy5ljb1i"; + "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n"; + "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam"; + "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode/with-extensions.nix index c54c8a4277f1..c54c8a4277f1 100644 --- a/pkgs/applications/editors/vscode-with-extensions/default.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 987b544c5565..b2404df8e56e 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS }: stdenv.mkDerivation { @@ -12,9 +12,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas + libLAS ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + # On Darwin the installer tries to symlink the help files into a system + # directory + patches = [ ./no_symbolic_links.patch ]; + configureFlags = [ "--with-proj-share=${proj}/share/proj" "--without-opengl" @@ -29,8 +34,12 @@ stdenv.mkDerivation { "--with-mysql-includes=${mysql.connector-c}/include/mysql" "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" + "--with-liblas=${libLAS}/bin/liblas-config" ]; + # Otherwise a very confusing "Can't load GDAL library" error + makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ postConfigure = '' @@ -69,6 +78,7 @@ stdenv.mkDerivation { --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib + ln -s $out/grass-*/include $out/include ''; enableParallelBuilding = true; @@ -78,5 +88,6 @@ stdenv.mkDerivation { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/applications/gis/grass/no_symbolic_links.patch new file mode 100644 index 000000000000..ef09b97b7037 --- /dev/null +++ b/pkgs/applications/gis/grass/no_symbolic_links.patch @@ -0,0 +1,37 @@ +diff --git a/include/Make/Install.make b/include/Make/Install.make +index 0aba138..8ba74bc 100644 +--- a/include/Make/Install.make ++++ b/include/Make/Install.make +@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) + -$(INSTALL) config.status $(INST_DIR)/config.status + -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null + +-ifneq ($(findstring darwin,$(ARCH)),) +- @# enable OSX Help Viewer +- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) +-endif +- + $(INST_DIR) $(UNIX_BIN): + $(MAKE_DIR_CMD) $@ + +diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh +index 04e63eb..c9d9c2c 100755 +--- a/macosx/app/build_html_user_index.sh ++++ b/macosx/app/build_html_user_index.sh +@@ -140,7 +140,6 @@ else + # echo "<tr><td valign=\"top\"><a href=\"$HTMLDIRG/$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX + # make them local to user to simplify page links + echo "<tr><td valign=\"top\"><a href=\"global_$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX +- ln -sf "$HTMLDIRG/$i" global_$i + done + done + fi +@@ -183,8 +182,3 @@ echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"> + </html>" > $i.html + done + +-# add Help Viewer links in user docs folder +- +-mkdir -p $HOME/Library/Documentation/Help/ +-ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon +-ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix new file mode 100644 index 000000000000..7b79cd062a8c --- /dev/null +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools + , qtlocation, qtsensors, doxygen, cups, makeWrapper, qtimageformats +}: + +stdenv.mkDerivation rec { + name = "OpenOrienteering-Mapper-${version}"; + version = "0.8.1.2"; + + buildInputs = [ gdal qtbase qttools qtlocation qtimageformats + qtsensors clipper zlib proj doxygen cups]; + + nativeBuildInputs = [ cmake makeWrapper ninja ]; + + src = fetchFromGitHub { + owner = "OpenOrienteering"; + repo = "mapper"; + rev = "v${version}"; + sha256 = "0f7zxzl2n46qy86k6n3f6a7l1nhba58i28l8ngp3drf74qffaa33"; + }; + + cmakeFlags = + [ + # Required by the build to be specified + "-DPROJ4_ROOT=${proj}" + + # Building the manual and bundling licenses fails + "-DLICENSING_PROVIDER:BOOL=OFF" + "-DMapper_MANUAL_QTHELP:BOOL=OFF" + ] ++ + (stdenv.lib.optionals stdenv.isDarwin + [ + # Usually enabled on Darwin + "-DCMAKE_FIND_FRAMEWORK=never" + # FindGDAL is broken and always finds /Library/Framework unless this is + # specified + "-DGDAL_INCLUDE_DIR=${gdal}/include" + "-DGDAL_CONFIG=${gdal}/bin/gdal-config" + "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib" + # Don't bundle libraries + "-DMapper_PACKAGE_PROJ=0" + "-DMapper_PACKAGE_QT=0" + "-DMapper_PACKAGE_ASSISTANT=0" + "-DMapper_PACKAGE_GDAL=0" + ]); + + + postInstall = + stdenv.lib.optionalString stdenv.isDarwin '' + # Fixes "This application failed to start because it could not find or load the Qt + # platform plugin "cocoa"." + wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} + mkdir -p $out/bin + ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper + ''; + + meta = with stdenv.lib; { + description = '' + OpenOrienteering Mapper is an orienteering mapmaking program + and provides a free alternative to the existing proprietary solution. + ''; + homepage = https://www.openorienteering.org/apps/mapper/; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [mpickering]; + }; +} diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 21ee4297599a..896387b1f7f4 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,23 +1,31 @@ { stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags, openssl -, withGrass ? false, grass +, qjson, qca2, txt2tags, openssl, darwin, pkgconfig +, withGrass ? true, grass, IOKit, ApplicationServices }: stdenv.mkDerivation rec { name = "qgis-2.18.17"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla - fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ + fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] + ++ + (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]) + ++ (stdenv.lib.optional withGrass grass) ++ + (stdenv.lib.optional (stdenv.isDarwin && withGrass) darwin.apple_sdk.libs.utmp) ++ (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory enableParallelBuilding = false; + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libspatialindex)" + ''; + # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' @@ -29,19 +37,46 @@ stdenv.mkDerivation rec { sha256 = "1nxwl5lwibbiz9v3qaw3px7iyxg113zr4j8d99yj07mhk2ap082y"; }; - cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system + # installed frameworks + # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the + # installation which causes havoc + # Building RelWithDebInfo allows QGIS_DEBUG to print debugging information + cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}" + ++ stdenv.lib.optional stdenv.isDarwin + (["-DCMAKE_FIND_FRAMEWORK=never"] + ++ ["-DQGIS_MACAPP_BUNDLE=0"]); +# ++ ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"]; - postInstall = '' - wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} - ''; + + + postInstall = + (stdenv.lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/qgis \ + --set PYTHONPATH $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} + '') + + (stdenv.lib.optionalString stdenv.isDarwin '' + # Necessary for QGIS to find the correct default GRASS path + # Plugins look for gdal tools like deminfo on the PATH + ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} + for file in $(find $out -type f -name "QGIS"); do + wrapProgram "$file" \ + --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ + --prefix DYLD_LIBRARY_PATH : "${qscintilla}/lib" \ + --prefix PATH : "${gdal}/bin" \ + ${stdenv.lib.optionalString withGrass "--prefix PATH : ${grass}/bin"} \ + --set PYTHONPATH $PYTHONPATH + done + mkdir -p $out/bin + ln -s $out/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis + ''); meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [viric mpickering]; }; } diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 847421de3b1f..a0f2e007555e 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -2,15 +2,15 @@ libharu, opencv, vigra, postgresql }: stdenv.mkDerivation rec { - name = "saga-6.2.0"; + name = "saga-6.3.0"; buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.2.0/saga-6.2.0.tar.gz"; - sha256 = "91b030892c894ba02eb4292ebfc9ccbf4acf3062118f2a89a9a11208773fa280"; + url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.3.0/saga-6.3.0.tar.gz"; + sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv"; }; meta = { diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e716146ec7a9..410c74ac6cfa 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-22"; - sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam"; + version = "7.0.7-27"; + sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k"; patches = []; }; in diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index b7647803b3d3..5fb7e0078065 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,31 +1,41 @@ -{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, - gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, - librsvg, gst_all_1, autoreconfHook, makeWrapper }: +{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, + gtkmm2, glibmm, libxml2, libsecret, curl, libzip, + librsvg, gst_all_1, autoreconfHook, makeWrapper, + useUnrar ? false, unrar +}: + +assert useUnrar -> unrar != null; stdenv.mkDerivation rec { name = "ahoviewer-${version}"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; rev = version; - sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx"; + sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig"; }; - enableParallelBuilding = true; - + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 - libsecret curl unrar libzip librsvg - gst_all_1.gstreamer - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - gst_all_1.gst-plugins-base ]; - + buildInputs = [ + glibmm libconfig gtkmm2 glibmm libxml2 + libsecret curl libzip librsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-good + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + ] ++ stdenv.lib.optional useUnrar unrar; + + # https://github.com/ahodesuka/ahoviewer/issues/60 + # Already fixed in the master branch + # TODO: remove this next release + makeFlags = [ ''LIBS=-lssl -lcrypto'' ]; + postPatch = ''patchShebangs version.sh''; - + postInstall = '' wrapProgram $out/bin/ahoviewer \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index d415df1bae80..f51777bdbf73 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+ maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 14659d796fc3..d81fea5ea398 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.1"; + version = "2.4.2"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; + sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix new file mode 100644 index 000000000000..f95370e39e72 --- /dev/null +++ b/pkgs/applications/graphics/dosage/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "dosage"; + version = "2018.04.08"; + PBR_VERSION = version; + + src = fetchFromGitHub { + owner = "webcomics"; + repo = "dosage"; + rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; + sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; + }; + buildInputs = with pythonPackages; [ pytest responses ]; + propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; + + disabled = pythonPackages.pythonOlder "3.3"; + + checkPhase = '' + py.test tests/ + ''; + + meta = { + description = "A comic strip downloader and archiver"; + homepage = http://dosage.rocks/; + }; +} diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 2943b5ef94c0..2e91f7873501 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, lirc }: +, epoxy, poppler, mesa_noglu, lirc }: stdenv.mkDerivation rec { name = "fbida-2.13"; @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff - libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; + buildInputs = [ + libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp + imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc + mesa_noglu + ]; makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ]; diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix new file mode 100644 index 000000000000..355acf7681a0 --- /dev/null +++ b/pkgs/applications/graphics/fstl/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}: +stdenv.mkDerivation rec { + name = "fstl-${version}"; + version = "0.9.3"; + + buildInputs = [qtbase mesa_glu]; + + prePatch = '' + sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro + ''; + + preBuild = '' + qmake qt/fstl.pro + ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv fstl.app $out/Applications + ''; + + src = fetchFromGitHub { + owner = "mkeeter"; + repo = "fstl"; + rev = "v" + version; + sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892"; + }; + + meta = with stdenv.lib; { + description = "The fastest STL file viewer"; + homepage = "https://github.com/mkeeter/fstl"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index a2cbffd5d217..3802fff2ad21 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -46,8 +46,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"; meta = { description = "The GNU Image Manipulation Program"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 03489db933c1..7dc69bceda92 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,32 +1,43 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, - exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret, - libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison, - flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }: + exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, + libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, + flex, wrapGAppsHook, shared-mime-info }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let pname = "gthumb"; - version = "${major}.0"; - major = "3.6"; + version = "3.6.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "1zc7myvnzgq7dawjg03rqvwfad7p938m20f25sfhv65jsfq8n928"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1vj26gw9b5y4bmb2m49wplqg0md568g3gxin500v3slggzhzkaww"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; - buildInputs = with gnome3; - [ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf - exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain - librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ]; + buildInputs = with gnome3; [ + glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base + exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain + librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme + ]; enableParallelBuilding = true; + configureFlags = [ + "--enable-libchamplain" + ]; + preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/gthumb; description = "Image browser and viewer for GNOME"; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index b7063a0c4e7f..0cad1e1aabb6 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.4"; + version = "1.4.5"; name = "jpegoptim-${version}"; src = fetchurl { url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; - sha256 = "1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849"; + sha256 = "1mngi8c4mhzwa7i4wqrqq6i80cqj4adbacblfvk6dy573wywyxmi"; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index eb59b6ff6d65..996d495d87c1 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc -, cmake, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: @@ -20,24 +20,25 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; + cmakeFlags = [ + "-DK3D_BUILD_DOCS=false" + "-DK3D_BUILD_GUIDE=false" + ]; preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" ''; + nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; + buildInputs = [ - cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng - boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff - gettext intltool perl unzip ftgl glew asciidoc - gtkmm2 glibmm gtkglext pangox_compat libXmu + libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng + boost cairomm imagemagick libjpeg libtiff + ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu ]; #doCheck = false; - enableParallelBuilding = true; - meta = { description = "A 3D editor with support for procedural editing"; homepage = http://www.k-3d.org/; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index f74ad3c877ca..5af0e627d7d8 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "14sm67vkpxzpnh4c2mzvr0rpk8a3i8kzxx6fi3lpczrcc1g7di09"; + sha256 = "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 4dc1e89116ed..ada55f0351e1 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CAD program for creating virtual LEGO models"; - homepage = http://www.leocad.org/; + homepage = https://www.leocad.org/; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index adb1ec29237e..eaaabe8fd395 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -61,5 +61,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 8c3a8bc894b3..675c4e6a49ef 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,12 +18,12 @@ }: stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.8.1"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; + sha256 = "1irms980d7acdqrfn8isw55vgc4d9n26ff86887vk7xfvxs0ayla"; }; name = "nomacs-${version}"; @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */ImageLounge) ''; - patches = [./fix-appdata-install.patch]; - nativeBuildInputs = [cmake pkgconfig wrapGAppsHook]; diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch deleted file mode 100644 index cdeed56f496d..000000000000 --- a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake -index 3521056a..34f99ed9 100644 ---- a/cmake/UnixBuildTarget.cmake -+++ b/cmake/UnixBuildTarget.cmake -@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) - # manpage - install(FILES Readme/nomacs.1 DESTINATION share/man/man1) - # appdata --install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/) -+install(FILES nomacs.appdata.xml DESTINATION share/appdata/) - - # "make dist" target - string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index c33c0b31a959..49835298f132 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "1jn4ph7giwxr65xxbm59i03wywnmxkqnpvqp0kcajl4k48vq3wkr"; + sha256 = "0xyfb41arvi3cc5jvgj2m8skzjrb0xma8sml74svygjgagxfj65h"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 42b69e249267..e5385c752804 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,5 +1,5 @@ { -stdenv, fetchFromGitHub, cmake +stdenv, fetchFromGitHub, cmake, makeWrapper ,qtbase, qttools, python, libGLU_combined ,libXt, qtx11extras, qtxmlpatterns }: @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = [ - "-DPARAVIEW_ENABLE_PYTHON=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" - ]; + cmakeFlags = [ + "-DPARAVIEW_ENABLE_PYTHON=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" + "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by @@ -35,10 +35,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + makeWrapper ]; buildInputs = [ python + python.pkgs.numpy libGLU_combined libXt qtbase @@ -47,6 +49,16 @@ stdenv.mkDerivation rec { qtxmlpatterns ]; + # Paraview links into the Python library, resolving symbolic links on the way, + # so we need to put the correct sitePackages (with numpy) back on the path + postInstall = '' + wrapProgram $out/bin/paraview \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvbatch \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvpython \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + ''; meta = { homepage = http://www.paraview.org/; diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix new file mode 100644 index 000000000000..ffef558e84dd --- /dev/null +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: + +stdenv.mkDerivation { + name = "photoflow-unstable-2018-03-06"; + + src = fetchFromGitHub { + owner = "aferrero2707"; + repo = "PhotoFlow"; + rev = "f9bbea183fa02412d1d17075955d2284eeaf8174"; + sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf"; + }; + + nativeBuildInputs = [ + gettext + glib + libxml2 + pkgconfig + swig + automake + gobjectIntrospection + cmake + ninja + ]; + + buildInputs = [ + libtiff + libjpeg + fftw + exiv2 + lensfun + gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 + # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 + libraw + lcms2 + libexif + vips + expat + pcre + pugixml + ]; + + cmakeFlags = [ + "-DBUNDLED_EXIV2=OFF" + "-DBUNDLED_LENSFUN=OFF" + "-DBUNDLED_GEXIV2=OFF" + ]; + + meta = with stdenv.lib; { + description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; + homepage = https://aferrero2707.github.io/PhotoFlow/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.MtP ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 9e5958871cc0..757ce52e9c4c 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "0zn7ps73lw04l9i4777c90ik07v3hkg66mnpz8vvvwjyi40i77a7"; + sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix deleted file mode 100644 index 12ff5c772402..000000000000 --- a/pkgs/applications/graphics/processing/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }: - -stdenv.mkDerivation rec { - name = "processing-${version}"; - version = "2.2.1"; - - src = fetchurl { - url = "https://github.com/processing/processing/archive/processing-0227-${version}.tar.gz"; - sha256 = "1r8q5y0h4gpqap5jwkspc0li6566hzx5chr7hwrdn8mxlzsm50xk"; - }; - - # Stop it trying to download its own version of java - patches = [ ./use-nixpkgs-jre.patch ]; - - buildInputs = [ ant jdk makeWrapper libXxf86vm which ]; - - buildPhase = "cd build && ant build"; - - installPhase = '' - mkdir -p $out/${name} - mkdir -p $out/bin - cp -r linux/work/* $out/${name}/ - makeWrapper $out/${name}/processing $out/bin/processing \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ - --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - makeWrapper $out/${name}/processing-java $out/bin/processing-java \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ - --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - ln -s ${jdk} $out/${name}/java - ''; - - meta = with stdenv.lib; { - description = "A language and IDE for electronic arts"; - homepage = https://processing.org; - license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch deleted file mode 100644 index 8f6a5e2018e1..000000000000 --- a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com> -Date: Tue, 26 Aug 2014 00:07:58 +0200 -Subject: [PATCH] patch - ---- - build/build.xml | 42 +++++++++++++++++++++--------------------- - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/build/build.xml b/build/build.xml -index 4d0f0b2..c3f5c09 100755 ---- a/build/build.xml -+++ b/build/build.xml -@@ -640,10 +640,11 @@ - value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" /> - --> - -+ <!-- - <get src="http://processing.googlecode.com/files/${jre.file}" - dest="linux/jre.tgz" - usetimestamp="true" /> -- -+ --> - <!-- - Cannot use ant version of tar because it doesn't preserve properties. - <untar compression="gzip" -@@ -655,39 +656,38 @@ - <!-- - http://www.gnu.org/software/tar/manual/html_section/transform.html - --> -- <exec executable="tar" dir="linux"> -+ <!-- <exec executable="tar" dir="linux"> --> - <!-- Change directory --> - <!-- - <arg value="-C" /> - <arg value="linux/work" /> - <arg value="-xzpf" /> - --> -- <arg value="xfz" /> -- <arg value="jre.tgz"/> -- </exec> -+ <!-- <arg value="xfz" /> --> -+ <!-- <arg value="jre.tgz"/> --> -+ <!-- </exec> --> - - <!-- - We only want to move when the folder didn't exist before - <move file="linux/jre1.7.0_40" tofile="linux/work/java" /> - --> -- <exec executable="rsync" dir="linux"> -- <arg value="-a" /> -- <arg value="--delete" /> -- <arg value="jre1.7.0_40/" /> -- <arg value="work/java" /> -- </exec> -- <delete dir="linux/jre1.7.0_40" /> -+ <!-- <exec executable="rsync" dir="linux"> --> -+ <!-- <arg value="-a" /> --> -+ <!-- <arg value="jre1.7.0_40/" /> --> -+ <!-- <arg value="work/java" /> --> -+ <!-- </exec> --> -+ <!-- <delete dir="linux/jre1.7.0_40" /> --> - - <!-- Remove unused JRE bloat. --> -- <delete> -- <fileset refid="javafx-basics" /> -- <fileset refid="javafx-linux-${sun.arch.data.model}" /> -- <fileset refid="jre-optional-linux" /> -- </delete> -- -- <copy todir="linux/work/java/lib/fonts"> -- <fileset dir="shared/lib/fonts" includes="*" /> -- </copy> -+ <!-- <delete> --> -+ <!-- <fileset refid="javafx-basics" /> --> -+ <!-- <fileset refid="javafx-linux-${sun.arch.data.model}" /> --> -+ <!-- <fileset refid="jre-optional-linux" /> --> -+ <!-- </delete> --> -+ -+ <!-- <copy todir="linux/work/java/lib/fonts"> --> -+ <!-- <fileset dir="shared/lib/fonts" includes="*" /> --> -+ <!-- </copy> --> - - </target> - --- -2.1.0 - diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix new file mode 100644 index 000000000000..4ef078fdbac6 --- /dev/null +++ b/pkgs/applications/graphics/processing3/default.nix @@ -0,0 +1,53 @@ +{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }: + +stdenv.mkDerivation rec { + version = "3.3.7"; + name = "processing3-${version}"; + + src = fetchFromGitHub { + owner = "processing"; + repo = "processing"; + rev = "processing-0264-3.3.7"; + sha256 = "0a20z19lmc4xarfnr7xshcmlv3xkc2dgjxknis0iv79gxnwlqhpq"; + }; + + nativeBuildInputs = [ ant rsync makeWrapper ]; + buildInputs = [ jdk ]; + + buildPhase = '' + # use compiled jogl to avoid patchelf'ing .so files inside jars + rm core/library/*.jar + cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/ + + # suppress "Not fond of this Java VM" message box + substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ + --replace 'Messages.showWarning' 'if (false) Messages.showWarning' + + ( cd build + substituteInPlace build.xml --replace "jre-download," "" # do not download jre1.8.0_144 + mkdir -p linux/jre1.8.0_144 # fake dir to avoid error + ant build ) + ''; + + installPhase = '' + mkdir $out + cp -dpR build/linux/work $out/${name} + + rmdir $out/${name}/java + ln -s ${jdk} $out/${name}/java + + makeWrapper $out/${name}/processing $out/bin/processing \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + ''; + + meta = with stdenv.lib; { + description = "A language and IDE for electronic arts"; + homepage = https://processing.org; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index c8327b9bca19..b300c0071fae 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; description = ''Constructive solid geometry package''; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 9964bec67814..eb97a2b9b3b6 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "5.3"; + version = "5.4"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; + sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 8f26d5a9884a..bea4fe9b2c6c 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "scantailor-advanced-${version}"; - version = "1.0.12"; + version = "1.0.14"; src = fetchFromGitHub { owner = "4lex4"; repo = "scantailor-advanced"; rev = "v${version}"; - sha256 = "0i80jzky7l8wdv0wqdx48x1q0wmj72hhm0050pd43q80pj5r78a0"; + sha256 = "1h7lng0hxkjcvwbdf1yx59a382kiwn9bpll42acqs71nsvw65p28"; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 5a24a364587e..1ebc2f88ec5d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ let pname = "shotwell"; - version = "0.28.0"; + version = "0.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg"; + sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index a8b4973203d1..2cc127a3fc6f 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -8,6 +8,7 @@ let ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo + EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 2555fe409f25..36dd1773b39e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -84,6 +84,7 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; + kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; @@ -93,6 +94,7 @@ let kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdav = callPackage ./kdav.nix {}; + kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 89bc171d2953..9b16485cfa77 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -16,7 +16,7 @@ mkDerivation { platforms = platforms.linux; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ # qt qtwebkit # kde @@ -32,11 +32,17 @@ mkDerivation { ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = - let k3bPath = lib.makeBinPath [ - cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode - vcdimager - ]; + let + binPath = lib.makeBinPath [ + cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode + vcdimager flac + ]; + libraryPath = lib.makeLibraryPath [ + cdparanoia + ]; in '' - wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" + wrapProgram "$out/bin/k3b" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : ${libraryPath} ''; } diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix new file mode 100644 index 000000000000..9978e7ff6674 --- /dev/null +++ b/pkgs/applications/kde/kalarm.nix @@ -0,0 +1,37 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + + kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools, + kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio, + knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, + + kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils, + kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, + pimcommon, kpimtextedit, kdepim-apps-libs, messagelib, + + qtx11extras, + + kdepim-runtime +}: + +mkDerivation { + name = "kalarm"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools + kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio + knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon + + kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils + kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime + pimcommon kpimtextedit kdepim-apps-libs messagelib + + qtx11extras + ]; + propagatedUserEnvPkgs = [ kdepim-runtime ]; +} diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix new file mode 100644 index 000000000000..a58e1b25a2ee --- /dev/null +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + gettext, + kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, + python +}: + +mkDerivation { + name = "kdebugsettings"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python + ]; + propagatedUserEnvPkgs = [ ]; +} diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index d6de25215339..d2b96bf6100e 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kdelibs4support, kdnssd, libvncserver, libXtst, qtx11extras + kdelibs4support, kdnssd, libvncserver, libXtst, libXdamage, qtx11extras }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { maintainers = with lib.maintainers; [ jerith666 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libvncserver libXtst qtx11extras ]; + buildInputs = [ libvncserver libXtst libXdamage qtx11extras ]; propagatedBuildInputs = [ kdelibs4support kdnssd ]; } diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index aa637d440bd9..0704003353ae 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -14,7 +14,4 @@ mkDerivation { buildInputs = [ akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib ]; - preHook = '' - set -x - ''; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 6907ce877645..a5db33a0bb5a 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -13,6 +13,7 @@ libXxf86vm, libXi, libXrandr, + libGL, xclip }: with rustPlatform; @@ -26,6 +27,7 @@ let libXcursor libXxf86vm libXrandr + libGL libXi ]; in buildRustPackage rec { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 8133bf1c7634..c4c57380be99 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,21 +1,24 @@ { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python +, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada +, enableNumpy ? false, makeWrapper }: with lib; +let python = pythonPackages.python; in + stdenv.mkDerivation rec { - name = "blender-2.79a"; + name = "blender-2.79b"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc"; + sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; }; buildInputs = @@ -24,6 +27,7 @@ stdenv.mkDerivation rec { freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) + makeWrapper ] ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit @@ -70,6 +74,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = optionalString enableNumpy + '' + wrapProgram $out/bin/blender \ + --prefix PYTHONPATH : ${pythonPackages.numpy}/lib/python${python.majorVersion}/site-packages + ''; + meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; homepage = https://www.blender.org; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index e75076e53d1c..83ba02933fd5 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,17 +1,22 @@ -{ stdenv, python3, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.6"; - name = "buku-${version}"; + version = "3.7"; + pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1639sf200n9rxgkvvhlhnrjsb7vn42p1fl1rx562axh3vpr6j4c4"; + sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41"; }; - nativeBuildInputs = [ + patches = fetchpatch { + url = https://github.com/jarun/Buku/commit/495d6eac4d9371e8ce6d3f601e2bb9e5e74962b4.patch; + sha256 = "0py4l5qcgdzqr0iqmcc8ddld1bspk8iwypz4dcr88y70j86588gk"; + }; + + checkInputs = [ pytestcov pytest-catchlog hypothesis @@ -52,7 +57,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ae99bb772a68..50395c9c1d00 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.19.0"; + version = "3.21.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0sann0aw6ngvmqp7049zg6hyqjrb5myq5ivr4r9x732c1cnjhhw9"; + sha256 = "0nd9lv7armmkjwxjhs5mhsksvig5n435kww1dy9fq5hxg7nkq5ip"; }; patches = [ diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index e48b32a783d7..f2aac4326cbf 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://cgg.bzatek.net/; description = "a simple static web photo gallery, designed to be clean and easily usable"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 0c71b3ffb0ad..01511b41b08d 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; rev = version; - sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d"; + sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 4ef1adb8e6cc..ad3f65346593 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -4,7 +4,7 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.2.2"; + version = "2.2.3"; propagatedBuildInputs = [ docopt pygments ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "chrisallenlane"; repo = "cheat"; rev = version; - sha256 = "1da4m4n6nivjakpll6jj0aszrv24g2zax74034lzpv3pbh84fvas"; + sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl"; }; # no tests available doCheck = false; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 673ecdc85496..068d8e794547 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20170714"; + version = "20180325"; src = fetchurl { url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy"; + sha256 = "0z2m74hhkxvxchxv819wy947v3wl13kxrdq4kjjazzrlyaky921y"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 8b24df1bee92..fa9d3e2fdf48 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 7781f0df853a..661a00a06616 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, qmake4Hook }: -let version = "0.6.1"; in +let version = "0.6.4"; in stdenv.mkDerivation { name = "confclerk-${version}"; src = fetchurl { url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g"; + sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 45bd417abb4f..75a402ba2319 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0j46h87ifinkydi0m725p422m9svk3dpcz8dnrci4mxx0inn6qs3"; + sha256 = "1jjb979dwdnkjca95yxzapbjpd6hr97hxz7sn614whvdv4vvpnyc"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 857254c3cb03..33b16e3242c6 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 0123e0c38d74..f8927319a011 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix new file mode 100644 index 000000000000..439b0fc25684 --- /dev/null +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -0,0 +1,76 @@ +{ stdenv, lib, fetchurl, python, pythonPackages, unzip }: + +# This package uses a precompiled "binary" distribution of CuraByDagoma, +# distributed by the editor. +# +# To update the package, follow the links on https://dist.dagoma.fr/: +# * Cura By Dagoma +# * Linux +# * 64 bits +# * Genric archive +# +# I made the arbitrary choice to compile this package only for x86_64. +# I guess people owning a 3D printer generally don't use i686. +# If, however, someone needs it, we certainly can find a solution. + +stdenv.mkDerivation rec { + name = "curabydagoma-${version}"; + # Version is the date, UNIX format + version = "1520506579"; + # Hash of the user's choice: os, arch, package type... + hash = "58228cce5bbdcf764b7116850956f1e5"; + + src = fetchurl { + url = "https://dist.dagoma.fr/get/zip/CuraByDagoma/${version}/${hash}"; + sha256 = "16wfipdyjkf6dq8awjzs4zgkmqk6230277mf3iz8swday9hns8pq"; + }; + unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz"; + nativeBuildInputs = [ unzip ]; + buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ]; + + # Compile all pyc files because the included pyc files may be older than the + # py files. However, Python doesn't realize that because the packages + # have all dates set to epoch. + buildPhase = '' + python -m compileall -f curabydago + ''; + + # * Simply copy the stuff there + # * Create an executable with the correct path etc + # * Create a .desktop file to have a launcher in the desktop environments + installPhase = '' + mkdir $out + cp -r * $out/ + + mkdir $out/bin + cat > $out/bin/curabydago <<EOF + #!/bin/sh + export PYTHONPATH=$PYTHONPATH + ${python.out}/bin/python $out/curabydago/cura.py + EOF + chmod a+x $out/bin/curabydago + + mkdir -p $out/share/applications + cat > $out/share/applications/curabydago.desktop <<EOF + [Desktop Entry] + Type=Application + Name=Cura-by-dagoma + Comment=CuraByDagoma is a fork of Legacy Cura made by Dagoma for its own printers. + Icon=$out/curabydago/resources/images/cura.ico + Exec=$out/bin/curabydago + Path=$out/ + StartupNotify=true + Terminal=false + Categories=GNOME;GTK;Utility; + EOF + + ''; + + meta = with lib; { + description = "Slicer for 3D printers built by Dagoma"; + homepage = https://dagoma.fr/cura-by-dagoma.html; + license = licenses.agpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ tiramiseb ]; + }; +} diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 5bb91c1a70fe..002d8fc8f23b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.0"; + version = "5.0.3"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0n7l7ph002z8npn08vdn0ghgkipz14cr73i9c69s7wiq2d2baahv"; + sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581"; }; installPhase = '' diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 6e158f5696c1..0b685e04a6fc 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }: +{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libiconv }: stdenv.mkDerivation rec { name = "djvulibre-3.5.27"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + buildInputs = [ libjpeg libtiff librsvg libiconv ]; meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index f8b175eb86a1..3b620fc0606c 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dmenu-4.8"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; + homepage = https://tools.suckless.org/dmenu; license = licenses.mit; maintainers = with maintainers; [ viric pSub ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum/dash.nix index c98efa547b39..c98efa547b39 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum/dash.nix diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 47dfa30436f5..425203be01cc 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1hc0ylkq89459wy3av42hp73p34pmh7grsa3qm8fb1k0qg17zy78"; + sha256 = "0ds3p7cjbavsbizm04rhzl8s59czynynpx1jvg367mwbi6gng59i"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum/ltc.nix index 8540c39d1336..7852e6eb790e 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "3.0.6.2"; + version = "3.1.2.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "1bay4vfkanxsa8pj8n99sj55yc59s84nns97lbvagyp0p0lclia7"; + sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 7fd3db860dfb..ab4159790de0 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,35 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintlOrEmpty -, withBuildColors ? true +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl }: -assert withBuildColors -> ncurses != null; - stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.8"; + version = "0.2.9"; src = fetchurl { - url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98"; + url = "http://pwmt.org/projects/girara/download/${name}.tar.xz"; + sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8"; }; - preConfigure = '' - substituteInPlace colors.mk \ - --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk gettext libintlOrEmpty ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - makeFlags = [ - "PREFIX=$(out)" - (if withBuildColors - then "TPUT=${ncurses.out}/bin/tput" - else "TPUT_AVAILABLE=0") - ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libintl libiconv ]; + propagatedBuildInputs = [ glib gtk ]; meta = with stdenv.lib; { homepage = https://pwmt.org/projects/girara/; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index b9cbf8064a07..b4fac899f66f 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = http://gkrellm.srcbox.net; license = licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 423eea914b95..bb1556c7c4dc 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + ''; + meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; homepage = https://gmtp.sourceforge.io; diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio/ais.nix index dfb8415219c7..dfb8415219c7 100644 --- a/pkgs/applications/misc/gnuradio-ais/default.nix +++ b/pkgs/applications/misc/gnuradio/ais.nix diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio/gsm.nix index 6e0856ce66aa..6e0856ce66aa 100644 --- a/pkgs/applications/misc/gnuradio-gsm/default.nix +++ b/pkgs/applications/misc/gnuradio/gsm.nix diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio/nacl.nix index 28836958e98c..28836958e98c 100644 --- a/pkgs/applications/misc/gnuradio-nacl/default.nix +++ b/pkgs/applications/misc/gnuradio/nacl.nix diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio/osmosdr.nix index 355ca0e95449..355ca0e95449 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio/osmosdr.nix diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio/rds.nix index 44ed89d9002d..44ed89d9002d 100644 --- a/pkgs/applications/misc/gnuradio-rds/default.nix +++ b/pkgs/applications/misc/gnuradio/rds.nix diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix new file mode 100644 index 000000000000..9fef93819492 --- /dev/null +++ b/pkgs/applications/misc/gpx/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "gpx-${version}"; + version = "2.5.2"; + + nativeBuildInputs = [ autoreconfHook ]; + + src = fetchFromGitHub { + owner = "markwal"; + repo = "GPX"; + rev = version; + sha256 = "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5"; + }; + + meta = { + description = "Gcode to x3g conversion postprocessor"; + homepage = https://github.com/markwal/GPX/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.leo60228 ]; + }; +} diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index b376e8283a2b..0092dac754a3 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "06l90m3lx05290lvgghrgqrcg6732p69dvv3bsyw7cyxy3fvdhm6"; + sha256 = "0sndhzz2gnhsz41cp0zrsw3z10rqm1j3mvkzs1g1lsndrk12bcgy"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 9b8628d15270..5f219dc4752c 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, - pango, gsettings-desktop-schemas, +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, + pango, gsettings-desktop-schemas, gobjectIntrospection, wrapGAppsHook, # Optional packages: enableOSM ? true, osm-gps-map }: @@ -10,14 +10,12 @@ in buildPythonApplication rec { version = "4.2.8"; name = "gramps-${version}"; - buildInputs = [ intltool gtk3 ] + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map ; - # Currently broken - doCheck = false; - src = fetchFromGitHub { owner = "gramps-project"; repo = "gramps"; @@ -25,7 +23,7 @@ in buildPythonApplication rec { sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ]; + pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. @@ -51,13 +49,6 @@ in buildPythonApplication rec { runHook postInstall ''; - # gobjectIntrospection package, wrap accordingly - preFixup = '' - wrapProgram $out/bin/gramps \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - meta = with stdenv.lib; { description = "Genealogy software"; homepage = http://gramps-project.org; diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 0a2a17fc8fa0..17837c6c254e 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,76 +1,38 @@ -/* Beware! -After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?", -which will have to be resolved manually, because I have not found a way to automate this, without being impure. - -If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store, -which then can be used in the following command to install the schemas file of Guake: -gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas - -It can be removed again by the following command: -gconftool-2 --recursive-unset /apps/guake -*/ -{ stdenv, fetchurl, lib -, pkgconfig, libtool, intltool, makeWrapper -, dbus, gtk2, gconf, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }: - -with lib; +{ stdenv, fetchFromGitHub, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales +, gtk3, keybinder3, libnotify, libutempter, vte }: let - inherit (python2Packages) python; - inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ]; - pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); - in stdenv.mkDerivation rec { + version = "3.2.0"; +in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; - version = "0.8.3"; + format = "other"; - src = fetchurl { - url = "https://github.com/Guake/guake/archive/${version}.tar.gz"; - sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y"; + src = fetchFromGitHub { + owner = "Guake"; + repo = "guake"; + rev = version; + sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d"; }; - nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ]; - - buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]); + nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; - propagatedUserEnvPkgs = [ gconf.out ]; + buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; - patchPhase = '' - patchShebangs . - ''; + propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 ]; - configureScript = "./autogen.sh"; + LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699 - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--disable-schemas-install" - ]; + PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var - installFlags = [ - # Configuring the installation to not install gconf schemas is not always supported, - # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases. - "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + makeFlags = [ + "prefix=$(out)" ]; - postInstall = '' - mkdir -p $out/share/gconf/schemas - cp data/guake.schemas $out/share/gconf/schemas - ''; - - postFixup = '' - for bin in $out/bin/{guake,guake-prefs}; do - substituteInPlace $bin \ - --replace '/usr/bin/env python2' ${python.interpreter} - wrapProgram $bin \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ - --prefix PYTHONPATH : "$out/${python.sitePackages}:${pyPath}:$PYTHONPATH" - done + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") ''; - meta = { + meta = with stdenv.lib; { description = "Drop-down terminal for GNOME"; homepage = http://guake-project.org; license = licenses.gpl2; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index b37a6ad732fe..624c15e118a2 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 2fd56e3c5552..6b0926db0476 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/LuRsT/hr; description = "A horizontal bar for your terminal"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 6b62b418d786..db50b0d2169a 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dvorka/hstr; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # Cannot test others }; diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 9349c07a62e9..75d18c7a774d 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -12,11 +12,11 @@ let ]; in stdenv.mkDerivation rec { - version = "1.4.8"; + version = "2.0.0"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51"; + sha256 = "04241kjy65pnp5q9z901910rmvcx18x0qaqfl31i0l4c2xj83ws0"; }; buildInputs = [ dpkg ]; unpackPhase = '' diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index d18546cb36f8..f231df3d8e76 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -23,7 +23,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.8.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -36,9 +36,9 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.5.0) + jekyll-avatar (0.6.0) jekyll (~> 3.0) - jekyll-mentions (1.2.0) + jekyll-mentions (1.3.0) activesupport (~> 4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) @@ -69,13 +69,13 @@ GEM pathutil (0.16.1) forwardable-extended (~> 2.6) public_suffix (3.0.2) - rb-fsevent (0.10.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index b5b21dec4382..7c6ac55c2012 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -104,28 +104,28 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; + sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf"; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; jekyll-mentions = { dependencies = ["activesupport" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd"; + sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; jekyll-sass-converter = { dependencies = ["sass"]; @@ -250,10 +250,10 @@ rb-fsevent = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; rb-inotify = { dependencies = ["ffi"]; @@ -292,10 +292,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 190f1d66479d..45bd34187ca9 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -22,7 +22,7 @@ GEM http_parser.rb (~> 0.6.0) eventmachine (1.2.5) execjs (2.7.0) - faraday (0.14.0) + faraday (0.15.0) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) ffi (1.9.23) @@ -34,7 +34,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.8.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -47,7 +47,7 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.5.0) + jekyll-avatar (0.6.0) jekyll (~> 3.0) jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) @@ -56,7 +56,7 @@ GEM jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.2.0) + jekyll-mentions (1.3.0) activesupport (~> 4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) @@ -101,16 +101,16 @@ GEM public_suffix (3.0.2) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rb-fsevent (0.10.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdiscount (2.2.0.1) - rdoc (6.0.1) + rdoc (6.0.3) redcarpet (3.4.0) rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 3a115f8a4b0e..b45ea5b9d079 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -96,10 +96,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; + sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.0"; }; fast-stemmer = { source = { @@ -163,19 +163,19 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; + sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf"; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; @@ -208,10 +208,10 @@ dependencies = ["activesupport" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd"; + sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; jekyll-paginate = { source = { @@ -413,10 +413,10 @@ rb-fsevent = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; rb-inotify = { dependencies = ["ffi"]; @@ -438,10 +438,10 @@ rdoc = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzhv04lp76iax258dh47zsxhjg34r9sg76vgikbyfywjzflvfyj"; + sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; redcarpet = { source = { @@ -479,10 +479,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh new file mode 100755 index 000000000000..528f1062c733 --- /dev/null +++ b/pkgs/applications/misc/jekyll/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bundix zlib + +set -o errexit +set -o nounset + +readonly BASEDIR="$(dirname $(readlink -f $0))" + +for directory in "basic" "full"; do + pushd "$BASEDIR/$directory" + rm -f Gemfile.lock gemset.nix + bundix --magic + rm -rf .bundle vendor + popd +done diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index e87288d71287..ffb898b265c2 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/johanmalm/jgmenu; description = "Small X11 menu intended to be used with openbox and tint2"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index a73e4820e6c5..6c14c93c83da 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13500"; + version = "13576"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1dyys4y859dazjqpn3f7vd0cpyglk82y3igrdca293y0n0hrmi7v"; + sha256 = "0pw7srvds8zs53ibvj779vj505h2gfrn7xqx13hkbacdg441jkd4"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 1cab20baef15..ad2381394f46 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mupdf_modded = mupdf.overrideAttrs (attrs: { name = "mupdf-1.10a"; src = fetchurl { - url = "http://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; + url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; }; # Excluded the pdf-*.c files, since they mostly just broke the #includes diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index fe2503625938..0d02dbba69eb 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -15,22 +15,23 @@ , qtx11extras , sshfs , makeWrapper +, kwayland }: stdenv.mkDerivation rec { pname = "kdeconnect"; - version = "1.2.1"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-v${version}.tar.xz"; - sha256 = "01v432p9ylwss9gl6fvby8954bnjd91dni5jk1i44vv7x26yn8zg"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; + sha256 = "0gzv55hks6j37pf7d18l40n1q6j8b74j9qg3v44p8sp0gnglwkcm"; }; buildInputs = [ libfakekey libXtst ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications - qca-qt5 qtx11extras makeWrapper + qca-qt5 qtx11extras makeWrapper kwayland ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 4daa1938aba4..0e1aecaab1d1 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -14,6 +14,7 @@ , yubikey-personalization , libXi , qtx11extras +, qtmacextras , withKeePassBrowser ? true , withKeePassSSHAgent ? true @@ -25,17 +26,27 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f"; + sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ + "-Wno-old-style-cast" + "-Wno-error" + "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" + ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/local/bin" "../bin" \ + --replace "/usr/local/share/man" "../share/man" + ''; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch ]; cmakeFlags = [ @@ -72,7 +83,7 @@ stdenv.mkDerivation rec { qtx11extras yubikey-personalization zlib - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; postInstall = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 91e583e2af4e..5351cd41b251 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -40,6 +40,6 @@ buildPythonApplication rec { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 5f3ac3d93c44..c626aaca66bd 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -31,6 +31,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index e3c4943cb2fe..092ad6bf4780 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.3.0"; name = "lyx-${version}"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz"; - sha256 = "0mrbr24xbdg25gd7w8g76gpmy0a10nrnz0mz47mdjwi441yfpjjg"; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz"; + sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 19a45e7d17be..5ea49f28afd8 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: let - version = "4.3.82"; + version = "4.3.89"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 9e584217c598..fd0a8ea1fe4e 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/visit1985/mdp; description = "A command-line based markdown presentation tool"; - maintainers = with maintainers; [ matthiasbeyer vrthra ]; + maintainers = with maintainers; [ vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 8451c783aac6..4fa3b4ee4353 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "17.12"; + version = "18.03.1"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; + sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 7b4b8f0d780b..18eb1800a7b1 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "17.12"; + version = "18.03"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; + sha256 = "171xv1qn6lbzybhx471j5a3rdqdj3xn0xc7gs181624r1kslxyn1"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 1b510221d121..000a916b737a 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { name = "mupdf-${version}"; src = fetchurl { - url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; + url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw"; }; diff --git a/pkgs/applications/misc/mupdf/default.upstream b/pkgs/applications/misc/mupdf/default.upstream index 07cafdb0c2a4..852233633ca5 100644 --- a/pkgs/applications/misc/mupdf/default.upstream +++ b/pkgs/applications/misc/mupdf/default.upstream @@ -1,4 +1,4 @@ -url http://mupdf.com/downloads/archive/ +url https://mupdf.com/downloads/archive/ do_overwrite(){ ensure_hash ensure_version diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index e6ac35d19a0c..02c18109abc2 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://jwilk.net/software/mwic; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 6587305a770f..ca381e14dd17 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -94,6 +94,9 @@ in pythonPackages.buildPythonApplication rec { -e 's,pyserial>=[^"]*,pyserial,g' \ -e 's,semantic_version>=[^"]*,semantic_version,g' \ -e 's,wrapt>=[^"]*,wrapt,g' \ + -e 's,python-dateutil>=[^"]*,python-dateutil,g' \ + -e 's,emoji>=[^"]*,emoji,g' \ + -e 's,futures>=[^"]*,futures,g' \ setup.py ''; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 9bc9218305c3..109c0afa12d0 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -10,7 +10,7 @@ with lib; let pname = "orca"; - version = "3.27.91"; + version = "3.28.0"; in buildPythonApplication rec { name = "${pname}-${version}"; @@ -18,7 +18,7 @@ in buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0phlkn6ffqncvsg7ph3l4xw388baddav9s4pbkvqqa8myca9g4wg"; + sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2"; }; patches = [ diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 060d4899f4c7..7448b8e6648b 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: -stdenv.mkDerivation { - name = "pcmanx-gtk2-1.3"; - src = fetchurl { - url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz"; - sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; +stdenv.mkDerivation rec { + name = "pcmanx-gtk2-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "pcman-bbs"; + repo = "pcmanx"; + rev = version; + sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -12,6 +16,8 @@ stdenv.mkDerivation { preConfigure = '' ./autogen.sh + # libtoolize generates configure script which uses older version of automake, we need to autoreconf it + cd libltdl; autoreconf; cd .. ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index e08035aef571..7da71df7814c 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,15 +2,23 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.1.0"; + version = "10.1.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw"; + sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc"; }; + patchPhase = '' + patchShebangs src/configure + ''; + + configurePhase = '' + ./configure --prefix $out + ''; + buildInputs = [ postgresql openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 1347840ee674..6cb00fb1525c 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://posterazor.sourceforge.net/; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 88628c63c9ce..6ae8f380fe28 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null +{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps , qtbase, qtwebengine, qtwebkit , cmake , syncthing diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 3a2ec62222f0..90908c67b4e0 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt5 }: let - version = "1.10.01"; + version = "1.40.13"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; src = fetchurl { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "0pgj8rsk9yxvls7yjpzblzbci2vvd0mlf9c7wdbjhwf6qyi7dfi3"; + sha256 = "0d6b9ls742nghzg5y97dx7myvv8i88f0s27lhr52yy4833hdxdwn"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 169d6951d455..7a4348260fd3 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { name = "redis-desktop-manager-${version}"; - version = "0.9.0-alpha5"; + version = "0.9.1"; src = fetchgit { url = "https://github.com/uglide/RedisDesktopManager.git"; fetchSubmodules = true; rev = "refs/tags/${version}"; - sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9"; + sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -30,17 +30,13 @@ stdenv.mkDerivation rec { qtquick1 qtquickcontrols qtsvg qttools qtcharts ]; - patches = [ - (fetchpatch { - url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch"; - sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq"; - }) - ]; - - patchFlags = "-d 3rdparty/gbreakpad -p1"; - dontUseQmakeConfigure = true; + # Disable annoying update reminder + postPatch = '' + sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp + ''; + buildPhase = '' srcdir=$PWD diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 734adf3eb589..7da721e9f374 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "1.5.0"; - name = "rofi-${version}"; + version = "1.5.1"; + name = "rofi-unwrapped-${version}"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "0h068wqf0n6gmil2g3lh263pm7spkp4k5rxbnfp52n8izqgyf7al"; + url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; + sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679"; }; # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi; license = licenses.mit; - maintainers = with maintainers; [ mbakke garbas ]; + maintainers = with maintainers; [ mbakke garbas ma27 ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix new file mode 100644 index 000000000000..44c6f892bf58 --- /dev/null +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -0,0 +1,17 @@ +{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }: + +stdenv.mkDerivation { + name = "rofi-${rofi-unwrapped.version}"; + buildInputs = [ makeWrapper ]; + preferLocalBuild = true; + passthru = { unwrapped = rofi-unwrapped; }; + buildCommand = '' + mkdir -p $out/bin + ln -s ${rofi-unwrapped}/bin/rofi $out/bin/rofi + ${lib.optionalString (theme != null) ''wrapProgram $out/bin/rofi --add-flags "-theme ${theme}"''} + ''; + + meta = rofi-unwrapped.meta // { + priority = (rofi-unwrapped.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix new file mode 100644 index 000000000000..6ee9966401b5 --- /dev/null +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -0,0 +1,28 @@ +{ + mkDerivation, fetchurl, lib, + extra-cmake-modules, kdoctools, + knotifyconfig, kidletime, kwindowsystem, ktextwidgets, kcrash +}: + +let + pname = "rsibreak"; + version = "0.12"; + revision = ".8"; +in mkDerivation rec { + name = "rsibreak-${version}${revision}"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${version}/${name}.tar.xz"; + sha256 = "1qn9xdjx9zzw47jsj7f4nkqmrangfhdgafm2jxm7cm6z6kcvzr28"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ knotifyconfig kidletime kwindowsystem ktextwidgets kcrash ]; + + meta = with lib; { + description = "RSIBreak takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)"; + license = licenses.gpl2; + homepage = https://www.kde.org/applications/utilities/rsibreak/; + maintainers = with maintainers; [ vandenoever ]; + }; +} diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 5ca8bfcf5dfe..ed54e523c8f8 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -48,6 +48,6 @@ buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; + maintainers = with maintainers; [ jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix new file mode 100644 index 000000000000..7c3bda8c06de --- /dev/null +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -0,0 +1,71 @@ +{ lib, python3Packages, gobjectIntrospection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg +}: + +let inherit (python3Packages) python buildPythonApplication fetchPypi; + +in buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "safeeyes"; + version = "2.0.2"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "1fx6zd4hnbc7gdpac6r7smxwdl1bifaxx3mnx0wrqfvhpnwr1ybv"; + }; + + buildInputs = [ + gtk3 + gobjectIntrospection + gnome3.defaultIconTheme + gnome3.adwaita-icon-theme + ]; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + propagatedBuildInputs = with python3Packages; [ + Babel + psutil + xlib + pygobject3 + dbus-python + + libappindicator-gtk3 + libnotify + xprintidle-ng + ]; + + # patch smartpause plugin + postPatch = '' + sed -i \ + -e 's!xprintidle!xprintidle-ng!g' \ + safeeyes/plugins/smartpause/plugin.py + + sed -i \ + -e 's!xprintidle!xprintidle-ng!g' \ + safeeyes/plugins/smartpause/config.json + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + + # safeeyes images + --prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share" + ) + ''; + + doCheck = false; # no tests + + meta = { + homepage = http://slgobinath.github.io/SafeEyes; + description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ srghma ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index e664a5a75274..acd79859901a 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/andmarti1424/sc-im; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; # Cannot test others }; diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 0a8d20a3958d..cc8c30043b29 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { mkdir locale ''; - NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with stdenv.lib; { homepage = https://dushistov.github.io/sdcv/; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 622f6e147524..936b1a389f1e 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: buildPythonApplication rec { version = "1.4.0"; @@ -20,6 +20,8 @@ buildPythonApplication rec { blinker ]; + makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + # No tests included doCheck = false; @@ -27,7 +29,7 @@ buildPythonApplication rec { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = with maintainers; [ domenkozar matthiasbeyer ]; + maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7fbf11573c49..513c5facc6b2 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "simplenote-${pkgver}"; - pkgver = "1.0.6"; + pkgver = "1.1.3"; src = fetchurl { - url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-x64.${pkgver}.tar.gz"; - sha256 = "18wj880iw92yd57w781dqaj7iv9j3bqhyh2cbikqrl4m5w9xkla8"; + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz"; + sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf"; }; buildCommand = let @@ -20,6 +20,7 @@ xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + xorg.libxcb ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix new file mode 100644 index 000000000000..cf5c4625c952 --- /dev/null +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }: + +let + name = "sleepyhead-${version}"; + version = "1.0.0-beta-git"; +in stdenv.mkDerivation { + inherit name; + + src = fetchgit { + url = https://gitlab.com/sleepyhead/sleepyhead-code.git; + rev = "9e2329d8bca45693231b5e3dae80063717c24578"; + sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; + }; + + buildInputs = [ + qt5.qtbase qt5.qtwebkit qt5.qtserialport + zlib + libGLU + libX11 + ]; + + patchPhase = '' + patchShebangs configure + ''; + + installPhase = '' + mkdir -p $out/bin + cp sleepyhead/SleepyHead $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://sleepyhead.jedimark.net/; + description = "Review and explore data produced by CPAP and related machines"; + longDescription = '' + SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. + ''; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.krav ]; + }; + +} diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 3a55ea6205ec..1ee2bfab94c3 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { ClassXSAccessor EncodeLocale ExtUtilsMakeMaker + ExtUtilsTypemapsDefault ExtUtilsXSpp GrowlGNTP ImportInto @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath - ModuleBuild + ModuleBuildWithXSpp Moo NetDBus OpenGL diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix new file mode 100644 index 000000000000..bc855db29ecc --- /dev/null +++ b/pkgs/applications/misc/slstatus/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "slstatus-${version}"; + version = "unstable-2018-03-28"; + + src = fetchgit { + url = https://git.suckless.org/slstatus; + rev = "faa52bdcc0221de2d8fae950e409a8ac5e05bfcd"; + sha256 = "0i8k7gjvx51y0mwxjlqhyk2dpvkb2d3y8x4l6ckdnyiy5632pn76"; + }; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = https://tools.suckless.org/slstatus/; + description = "status monitor for window managers that use WM_NAME like dwm"; + license = licenses.isc; + maintainers = with maintainers; [ geistesk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index c7512a8ac271..3562a4f9b168 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "st-0.8.1"; src = fetchurl { - url = "http://dl.suckless.org/st/${name}.tar.gz"; + url = "https://dl.suckless.org/st/${name}.tar.gz"; sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4"; }; diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index ebb50e685da7..6d6382faccd4 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index a337b5eae996..0da0b83d64ab 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -3,13 +3,13 @@ }: let - version = "0.2.99.3"; + version = "0.2.99.4"; in stdenv.mkDerivation rec { name = "synapse-${version}"; src = fetchurl { url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; - sha256 = "0rwd42164xqfi40r13yr29cx6zy3bckgxk00y53b376nl5yqacvy"; + sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 0deda8ce35a3..3f3956961617 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; # Cannot test others }; } diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 11bc76203689..f64d25471982 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "REPL for taskwarrior"; homepage = http://tasktools.org; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 59ea70e3da2d..2fef852ace9f 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool, file, gtk3, gobjectIntrospection, cairo -, wrapGAppsHook, gnome3 +{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobjectIntrospection +, libnotify, wrapGAppsHook, gnome3 }: -pythonPackages.buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { name = "terminator-${version}"; version = "1.91"; @@ -11,13 +11,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; }; - nativeBuildInputs = [ file intltool wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.vte gobjectIntrospection cairo ]; - - pythonPath = with pythonPackages; [ - pygobject3 vte keybinder notify gettext psutil - pycairo - ]; + nativeBuildInputs = [ file intltool wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; + propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' patchShebangs . diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix new file mode 100644 index 000000000000..67ca05fdb10f --- /dev/null +++ b/pkgs/applications/misc/terminus/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo +, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr +, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver +, libxcb, makeWrapper, nodejs +, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: + +let + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio + ]; +in +stdenv.mkDerivation rec { + version = "1.0.0-alpha.42"; + name = "terminus-${version}"; + src = fetchurl { + url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; + sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; + }; + buildInputs = [ dpkg makeWrapper ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + ln -s "$out/opt/Terminus/terminus" "$out/bin/terminus" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Terminus/terminus" + mv usr/* "$out/" + wrapProgram $out/bin/terminus --prefix PATH : ${lib.makeBinPath [ nodejs ]} + ''; + dontPatchELF = true; + meta = with lib; { + description = "A terminal for a more modern age"; + homepage = https://eugeny.github.io/terminus/; + maintainers = with maintainers; [ jlesquembre ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 42f3d1646c57..9aca45264af3 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A command-line time tracker"; homepage = https://tasktools.org/projects/timewarrior.html; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; + maintainers = with maintainers; [ mrVanDalo ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix new file mode 100644 index 000000000000..049a9eff347c --- /dev/null +++ b/pkgs/applications/misc/todiff/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "todiff-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Ekleog"; + repo = "todiff"; + rev = version; + sha256 = "0n3sifinwhny651q1v1a6y9ybim1b0nd5s1z26sigjdhdvxckn65"; + }; + + cargoSha256 = "0mxdpn98fvmxrp656vwxvzl9vprz5mvqj7d1hvvs4gsjrsiyp0fy"; + + meta = with stdenv.lib; { + description = "Human-readable diff for todo.txt files"; + homepage = "https://github.com/Ekleog/todiff"; + maintainers = with maintainers; [ ekleog ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 1f8ab8b438dd..e282e752b318 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 3810da40849b..8e8a22ed4e41 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -1,101 +1,38 @@ -{ stdenv, fetchFromGitHub, curl, fribidi, mpv, less, rlwrap, gawk, bash, emacs, groff, ncurses, pandoc }: +{ stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.6"; + version = "0.9.6.7"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; - rev = "v" + version; - sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq"; + rev = "v${version}"; + sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n"; }; - phases = [ "buildPhase" "installPhase" "postFixup" ]; + buildInputs = [ makeWrapper ]; - buildPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - mkdir -p $out/share/man/man1 - ''; - - installPhase = '' - cp $src/translate $out/bin/trans - cp $src/translate $out/bin/translate - cp $src/translate $out/bin/translate-shell - - cp $src/translate.awk $out/share/translate.awk - cp $src/build.awk $out/share/build.awk - cp $src/metainfo.awk $out/share/metainfo.awk - cp $src/test.awk $out/share/test.awk - - cp -r $src/include $out/share - cp -r $src/test $out/share - cp $src/man/trans.1 $out/share/man/man1 - - chmod +x $out/bin/translate - chmod +x $out/share/translate.awk - chmod +x $out/share/build.awk - chmod +x $out/share/metainfo.awk - chmod +x $out/share/test.awk - ''; - - postFixup = '' - substituteInPlace $out/bin/trans --replace "/bin/sh" "${bash}/bin/bash" - substituteInPlace $out/bin/trans --replace "gawk " "${gawk}/bin/gawk " - substituteInPlace $out/bin/trans --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/bin/translate --replace "/bin/sh" "${bash}/bin/bash" - substituteInPlace $out/bin/translate --replace "gawk " "${gawk}/bin/gawk " - substituteInPlace $out/bin/translate --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/bin/translate-shell --replace "/bin/sh" "${bash}/bin/bash" - substituteInPlace $out/bin/translate-shell --replace "gawk " "${gawk}/bin/gawk " - substituteInPlace $out/bin/translate-shell --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/share/translate.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk" - substituteInPlace $out/share/translate.awk --replace "metainfo" "$out/share/metainfo" - substituteInPlace $out/share/translate.awk --replace "include/" "$out/share/include/" - - substituteInPlace $out/share/build.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk" - substituteInPlace $out/share/build.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/build.awk --replace "metainfo.awk" "$out/share/metainfo.awk" - - substituteInPlace $out/share/metainfo.awk --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/share/test.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk" - substituteInPlace $out/share/test.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/test.awk --replace "test/" "$out/share/test/" - - substituteInPlace $out/share/include/Translators/\*.awk --replace "include/" "$out/share/include/" - - substituteInPlace $out/share/test/Test.awk --replace "test/" "$out/share/test/" - substituteInPlace $out/share/test/TestUtils.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/test/TestParser.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\"" - substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk" - - substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\"" - substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi " - substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\"" - - substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc " - - substituteInPlace $out/share/include/Translate.awk --replace "\"mpv " "\"${mpv}/bin/mpv " - substituteInPlace $out/share/include/Translate.awk --replace "\"less " "\"${less}/bin/less " + installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/trans \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + gawk + curl + ncurses + rlwrap + groff + fribidi + ]} ''; meta = with stdenv.lib; { homepage = https://www.soimort.org/translate-shell; description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; - license = licenses.publicDomain; - maintainers = [ maintainers.ebzzry ]; + license = licenses.unlicense; + maintainers = with maintainers; [ ebzzry infinisil ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 5b5c57579893..d2463616d677 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0s8nbrkqcb4q3m8w17sqijbds5irk4xpzhjpwkkakzs0rm5g10sk"; + sha256 = "0mnnrxm49s77s1qg7zbfciw0525ipsl010sciqdw8a22jg1rfjh8"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 201e2bcc6ac0..1c5c4d1dcaac 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "veracrypt-${version}"; - version = "1.21"; + version = "1.22"; src = fetchurl { url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "0n036znmwnv70wy8r2j3b55bx2z3cch5fr83vnwjvzyyp0j7swa4"; + sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y"; }; unpackPhase = diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index d8dea641c3ad..37d7aeb88e61 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; - maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ]; + maintainers = with pkgs.lib.maintainers; [ ]; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 90fa01661543..544c1252ff41 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://fungi.yuggoth.org/weather; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # my only platform }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index fe0348cad211..68f6c4df1593 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "wmname-0.1"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index b93295850bcd..71d95e138927 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { for computational linguistics and natural language processing. ''; - homepage = http://wordnet.princeton.edu/; + homepage = https://wordnet.princeton.edu/; maintainers = [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index c985f601447e..98b3af52d6ee 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -2,18 +2,18 @@ , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false -, openclSupport ? false +, openclSupport ? true }: stdenv.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; - rev = "v${version}"; - sha256 = "0n21y37d8khgfk9965mrhnh6y5ag7w0s6as1fmf76yx6vajvajsn"; + rev = "${version}"; + sha256 = "1iisy73pi4xx3vmqvy6whdzb566jqyjx4pdyx0g35qjj8giflpc8"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix new file mode 100644 index 000000000000..42d9e448991a --- /dev/null +++ b/pkgs/applications/misc/xmrig/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd +, donateLevel ? 0 +}: + +stdenv.mkDerivation rec { + name = "xmrig-${version}"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "xmrig"; + repo = "xmrig"; + rev = "v${version}"; + sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libuv libmicrohttpd ]; + + postPatch = '' + substituteInPlace src/donate.h --replace "kDonateLevel = 5;" "kDonateLevel = ${toString donateLevel};" + ''; + + installPhase = '' + install -vD xmrig $out/bin/xmrig + ''; + + meta = with lib; { + description = "Monero (XMR) CPU miner"; + homepage = "https://github.com/xmrig/xmrig"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix new file mode 100644 index 000000000000..248f629f2e91 --- /dev/null +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid +, donateLevel ? 0 +}: + +stdenv.mkDerivation rec { + name = "xmrig-proxy-${version}"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "xmrig"; + repo = "xmrig-proxy"; + rev = "v${version}"; + sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libuv libmicrohttpd libuuid ]; + + # Set default donation level to 0%. Can be increased at runtime via --donate-level option. + postPatch = '' + substituteInPlace src/donate.h --replace "kDonateLevel = 2;" "kDonateLevel = ${toString donateLevel};" + ''; + + installPhase = '' + install -vD xmrig-proxy $out/bin/xmrig-proxy + ''; + + meta = with lib; { + description = "Monero (XMR) Stratum protocol proxy"; + homepage = "https://github.com/xmrig/xmrig-proxy"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aij ]; + }; +} diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 3b05c9be451f..3cb416a5f7cb 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableGUI) '' wrapProgram $out/bin/xpdf \ --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix} ''; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index d807e8eb9ed5..bcaf89797b44 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-331"; + name = "xterm-332"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s"; + sha256 = "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx"; }; buildInputs = diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index eae5240129a5..ae31ebd1ca7e 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; name = "xtermcontrol-${version}"; src = fetchurl { url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5"; + sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l"; }; meta = { diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index d273d27944a8..0794b2b6dbe9 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/uobikiemukot/yaft; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 0eb33c845c39..676cfc12eb0f 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -20,12 +20,12 @@ mkDerivation rec { pname = "yakuake"; - version = "3.0.4"; + version = "3.0.5"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh"; + sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8"; }; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index afb38ace1d93..84dc14451532 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig -, gtk, girara, ncurses, gettext, docutils -, file, sqlite, glib, texlive, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, meson, ninja, makeWrapper, pkgconfig +, appstream-glib, desktop-file-utils, python3 +, gtk, girara, ncurses, gettext, libxml2 +, file, sqlite, glib, texlive, libintl, libseccomp , gtk-mac-integration, synctexSupport ? true }: @@ -9,53 +10,42 @@ assert synctexSupport -> texlive != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "zathura-core-${version}"; - version = "0.3.8"; + name = "zathura-core-${version}"; + version = "0.3.9"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6"; + url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; + sha256 = "0z09kz92a2n8qqv3cy8bx5j5k612g2f9mmh4szqlc7yvi39aax1g"; }; - icon = ./icon.xpm; + patches = [ + (fetchpatch { + url = https://git.pwmt.org/pwmt/zathura/commit/4223464db68529f9a2064ed760fb7746b3c0df6b.patch; + sha256 = "004j68b7c8alxzyx0d80lr5i43cgh7lbqm5fx3d77ihci7hdmxnw"; + }) + ]; nativeBuildInputs = [ - pkgconfig - ] ++ optional stdenv.isDarwin [ libintlOrEmpty ]; + meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx + gettext makeWrapper libxml2 + ]; buildInputs = [ - file gtk girara - gettext makeWrapper sqlite glib + file gtk girara libintl libseccomp + sqlite glib ] ++ optional synctexSupport texlive.bin.core ++ optional stdenv.isDarwin [ gtk-mac-integration ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - makeFlags = [ - "PREFIX=$(out)" - "RSTTOMAN=${docutils}/bin/rst2man.py" - "VERBOSE=1" - "TPUT=${ncurses.out}/bin/tput" - (optionalString synctexSupport "WITH_SYNCTEX=1") - ]; - postInstall = '' wrapProgram "$out/bin/zathura" \ - --prefix PATH ":" "${makeBinPath [ file ]}" \ - --prefix XDG_CONFIG_DIRS ":" "$out/etc" - - install -Dm644 $icon $out/share/pixmaps/pwmt.xpm - mkdir -pv $out/etc - echo "set window-icon $out/share/pixmaps/pwmt.xpm" > $out/etc/zathurarc - echo "Icon=pwmt" >> $out/share/applications/zathura.desktop + --prefix PATH ":" "${makeBinPath [ file ]}" ''; meta = { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.unix; + license = licenses.zlib; + platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/core/icon.xpm b/pkgs/applications/misc/zathura/core/icon.xpm deleted file mode 100644 index a863c5ddb090..000000000000 --- a/pkgs/applications/misc/zathura/core/icon.xpm +++ /dev/null @@ -1,120 +0,0 @@ -/* XPM */ -static char *freeimage[] = { -/* width height num_colors chars_per_pixel */ -"16 16 96 2", -/* colors */ -" c #1e1e1e", -" . c #222222", -" X c #212121", -" o c #535353", -" O c #a4a4a4", -" + c #202020", -" @ c #252525", -" # c #3c3c3c", -" $ c #292929", -" % c #979797", -" & c #cccccc", -" * c #303030", -" = c #1f1f1f", -" - c #494949", -" ; c #dddddd", -" : c #696969", -" > c #232323", -" , c #262626", -" < c #adadad", -" 1 c #bbbbbb", -" 2 c #1d1d1d", -" 3 c #1c1c1c", -" 4 c #5e5e5e", -" 5 c #e8e8e8", -" 6 c #9c9c9c", -" 7 c #242424", -" 8 c #b1b1b1", -" 9 c #b3b3b3", -" 0 c #090909", -" q c #161616", -" w c #131313", -" e c #4d4d4d", -" r c #dedede", -" t c #afafaf", -" y c #282828", -" u c #393939", -" i c #c4c4c4", -" p c #dcdcdc", -" a c #9a9a9a", -" s c #a2a2a2", -" d c #ababab", -" f c #313131", -" g c #a7a7a7", -" h c #e4e4e4", -" j c #f2f2f2", -" k c #eaeaea", -" l c #e2e2e2", -" z c #f0f0f0", -" x c #d5d5d5", -" c c #737373", -" v c #323232", -" b c #808080", -" n c #7a7a7a", -" m c #d3d3d3", -" M c #e5e5e5", -" N c #8a8a8a", -" B c #cbcbcb", -" V c #b5b5b5", -" C c #b9b9b9", -" Z c #272727", -" A c #b4b4b4", -" S c #bababa", -" D c #2d2d2d", -" F c #414141", -" G c #444444", -" H c #f4f4f4", -" J c #838383", -" K c #cfcfcf", -" L c #fafafa", -" P c #efefef", -" I c #e3e3e3", -" U c #8d8d8d", -" Y c #656565", -" T c #ffffff", -" R c #fbfbfb", -" E c #e9e9e9", -" W c #bdbdbd", -" Q c #e1e1e1", -" ! c #dfdfdf", -" ~ c #646464", -" ^ c #3a3a3a", -" / c #a1a1a1", -" ( c #999999", -" ) c #c0c0c0", -" _ c #3b3b3b", -" ` c #acacac", -" ' c #050505", -" ] c #151515", -" [ c #1b1b1b", -" { c #1a1a1a", -" } c #b2b2b2", -" | c #a5a5a5", -". c #c5c5c5", -".. c #a6a6a6", -".X c #bfbfbf", -".o c #747474", -/* pixels */ -" ", -" . . . X X X X . o O + X . . ", -" . . X @ # $ . @ % & * = . . ", -" . . - ; : > , < 1 2 X . . ", -" . . 3 4 5 6 7 7 8 9 0 q q 3 ", -" . + w e r t y u i p a s d 4 ", -" X f g h j k p l z z x g c v ", -" X f b n m M N c B V 3 , > X ", -" X X w V C $ Z A S + $ , . ", -" D F G u S H 1 J K L P I U @ ", -" Y T T T R E & W Q ! d g ~ 7 ", -" ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X ", -" + > 7 { A } 7 @ |. $ + . . ", -" X X X ].. 8 Z 7 n.X + X . . ", -" . . . { n.o 7 . @ y X X . . ", -" " -}; - diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index d280a10f6180..58985dced425 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,29 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.7"; + name = "zathura-djvu-0.2.8"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ djvulibre gettext zathura_core gtk girara ]; - patches = [ ./gtkflags.patch ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with stdenv.lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-djvu/; description = "A zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the diff --git a/pkgs/applications/misc/zathura/djvu/gtkflags.patch b/pkgs/applications/misc/zathura/djvu/gtkflags.patch deleted file mode 100644 index 6e8819e60823..000000000000 --- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zathura-djvu-0.2.7.orig/config.mk 2017-12-21 14:20:24.000000000 +0100 -+++ zathura-djvu-0.2.7/config.mk 2017-12-31 00:41:02.580154770 +0100 -@@ -16,6 +16,9 @@ - DESKTOPPREFIX ?= ${PREFIX}/share/applications - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -34,8 +37,8 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} --LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} -+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB} - - # pre-processor flags - CPPFLAGS += -D_FILE_OFFSET_BITS=64 diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 1ca7644f60f8..86fe453465a5 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,35 +1,28 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, +{ stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo, gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec, openjpeg, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.2"; + version = "0.3.3"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { - url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; - sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck"; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; + sha256 = "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg + zathura_core girara mupdf cairo ] ++ stdenv.lib.optional stdenv.isDarwin [ gtk-mac-integration ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-mupdf/; description = "A zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 215ebdd75640..663e798ee0b4 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,28 +1,21 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { - version = "0.2.8"; + version = "0.2.9"; name = "zathura-pdf-poppler-${version}"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y"; }; - nativeBuildInputs = [ pkgconfig zathura_core ]; + nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; buildInputs = [ poppler girara ]; - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-poppler/; description = "A zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index c324deb28e0a..07e4c5d715b7 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,29 +1,20 @@ -{ stdenv, lib, fetchurl, pkgconfig, gtk2, zathura_core, girara, libspectre, gettext }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.2.5"; + name = "zathura-ps-0.2.6"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libspectre gettext zathura_core gtk2 girara ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libspectre zathura_core girara ]; - patches = [ ./gtkflags.patch ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' ) - echo "$makefileC2" > Makefile - echo "$makefileC2" - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-ps/; description = "A zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the diff --git a/pkgs/applications/misc/zathura/ps/gtkflags.patch b/pkgs/applications/misc/zathura/ps/gtkflags.patch deleted file mode 100644 index 1464d2c8373b..000000000000 --- a/pkgs/applications/misc/zathura/ps/gtkflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zathura-ps-0.2.5.orig/config.mk 2017-12-21 14:21:17.000000000 +0100 -+++ zathura-ps-0.2.5/config.mk 2017-12-31 01:05:17.507268817 +0100 -@@ -16,6 +16,9 @@ - DESKTOPPREFIX ?= ${PREFIX}/share/applications - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -34,8 +37,8 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} --LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB} -+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB} - - # compiler flags - CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 2fd7d58e63ed..64f617782f2d 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -1,7 +1,7 @@ { symlinkJoin, lib, makeWrapper, zathura_core, plugins ? [] }: let - pluginsPath = lib.makeLibraryPath plugins; + pluginsPath = lib.makeSearchPath "lib/zathura" plugins; in symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 07bc2bbc5f0f..f0862aebafe5 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "29.0.0.113"; + version = "29.0.0.140"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1ix86jv4ckn5pcj37fgx4mncqjyvabdvwxp9zs9frdfbyx740izr"; + sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 66d41a9c1658..e30ec4228c8a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "13n84ky5fr5by71jd9ivj3q7czd2gxrnvbj8msskb62zamjb8z80"; - sha256bin64 = "16f2b9sxyljrmj2rcfzamf9ji01pkamnb6qv363lf67fshm37ky0"; - version = "65.0.3325.124"; + sha256 = "18dampi62wwvscywvdz8lil0zhxdr4p6bhr4yv08arz029w356lc"; + sha256bin64 = "129jq8ynj4y81rhzxyyfcfpllq3a6ddhiy766zw28s7d43q4zca2"; + version = "66.0.3359.45"; }; dev = { - sha256 = "1qy8gv859qhg5s6gi3mvdgg1s5wi69r6qkhd851nwlmmjhvarfg8"; - sha256bin64 = "1z1s6i4yx20ayr6a2ycbgd0ipy1ncw4i19k0g8jbn639kynmfxjw"; - version = "66.0.3359.26"; + sha256 = "09x7p83p188ms0awxj3kl9kdx796ns6m42smqd3jccnljx54jls2"; + sha256bin64 = "1aa24gvbf9awm59n05jkb4wy6ssr7fns4rl1hd2c66cq2d4mx3d8"; + version = "67.0.3377.1"; }; stable = { - sha256 = "1kkc276jfhw2kp9pfg1drxm1h98d2cwm4c5c7xay2pbrhkypnzk2"; - sha256bin64 = "1vv34g05x2jyg8hgk1r760g38rb3r17p5iwf1f1wqkjp3z6c952v"; - version = "65.0.3325.162"; + sha256 = "11w6wg862ixbgm7dpqag2lmbjknv83zlr9imd8zchvmrqr468rlk"; + sha256bin64 = "0r14w94aa7zg2i3zjpwvb7d6fg9yg0xkki7jzcpjmzwygy78fs16"; + version = "65.0.3325.181"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix deleted file mode 100644 index ec585e53fd23..000000000000 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls -, json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }: - -stdenv.mkDerivation { - name = "dwb-2016-03-21"; - - src = fetchgit { - url = "https://bitbucket.org/portix/dwb"; - rev = "7fb82bc1db36a5d1d2436088c9b58054d2c51f96"; - sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup - webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; - - # There are Xlib and gtk warnings therefore I have set Wno-error - makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"''; - - preFixup='' - wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" - wrapProgram "$out/bin/dwbem" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" - ''; - - meta = with stdenv.lib; { - homepage = http://portix.bitbucket.org/dwb/; - description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit"; - platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 463b476f8c3c..d8afbf9aa193 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "60.0b3"; + version = "60.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "803c819fa3085bc868ab3295ee1a6c7a6f7dba69fd5aaeb54244a561c252ae7fa7b710aaa13b7f8b7810145a737dc6d20e76fa35e85f3dad2535614681980245"; + sha512 = "f45033523be148f3cf43d800ec7186791045104eba8c6eb10bb427a5048e826152c4d129bf97a4efda41281b5854643f239b9a124b488740c1cd2bc55acb2504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7cb3ce289e989ab70a472c6cedf97f925034d5762e2256d6a01c992c3913836c8f8f7e202a013ff128b8a1db97d8e683bdefab19e618c0c819e7a31643eb75bf"; + sha512 = "8d4ca433ad148cd3ac62cb142009a64c8aa09e49d04a060040d42c9e5720ec3619f1896a7b2e91f9bc0f4a78be0dbfa30fef7f19c233b78228413335cbfc9a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f454d77c05721082b759cb550ab2c0f32d7e788ed5eeae2e3706ffea040d5f181245a2c7e9018a2050139606b460dcdcfca92dc73af99e92deb9021ee6be2839"; + sha512 = "16d132420f991376b3dc15d43f118aa12d1d617cadb65d16d645b1a82a65cc7a17a4fa36a03a4280a6e6c3d05d5f4c6d97d5f1df24fbb4d6420a16d271dffcd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d876e0a98aa1a702850b9ab7a3c3b3954e6f376fe7ffa32e6b4e22f5a8d8cc3568b3c70aa636c2af8ef7abf0d05c5d7895b8320ff41fed2c251e0eea06492480"; + sha512 = "2a362ddb4a263a228b93494b8b39071b85cdf05264ef1541df5dd75a84f7d7391b0d68c19e76ee68fb0a4cab7e4de6c1b39d2f97f8f16e6d7c06ad1b630562c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "e2cc66552357ccae9136b42f93db1c6b521e514ccfebaf65d5b635b6f3a1a62e66113c3b56c50806d77aa8c8cae53240b83f5437b3a28b2bdf735713ead45e1a"; + sha512 = "b9172bb80eec38221065e89e0e244c1a93f52e2a5754c0b0d93e78b338783188460fdb4aad13eb69a205f7af1b831451f07b19a9633ab1737e1d48e88108647c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9334167e1b9f236feb5784bf0be7dda40bf7be9162e57691e605cfd9a9e3e499ce6e5ddd1268574a0e637b5e62a5a74078a8bddd27951ac340c8e38ffbc43f81"; + sha512 = "c1b665bf08317624aec791a4cf97a240c8bd192f28b31a3a4283846628216bb98b60b50a44d7a14b37b0339fa7cf51af9f3a47cc1ced764f560567eb19c31d56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "e46010f4d7f76f88569728563000a35ec35fbcf48dd26663f93c774b1c321b5e7f8e0c4bb7c9a75919b01ebe70ca4eb211536714fecadbecc8fa2241c2e6f2ba"; + sha512 = "fefa5958fd2bd47125b5a8601fbd0834b6498a4ef4b38c73246575b090b94981d39f086534fa5844432554134f590ef28fd9ba0a9e656a4be16c82e4dc368f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fea813a468c20b99d1b817d57161e699f4860ab1e114204398483b609872972dff379d7abdf20d383ac8432e2f0cd703de71bf44607f3baec6ce206f070f6527"; + sha512 = "3ad059b65ac9a5d6e8af9745df0ff35ecacdd0af756fc1d5a22a272fd94c49b163d62c7a59ba5cf485d860dfc096209ebd814673b909c047a5c0a8fe3b551701"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "38658a9c361b2ebd57bb6da00a30bf7ff1a071e75b481007ae1b9b30b51d78b60b9d459a4b935c964f2625dd83d90e2e392a2fe1b6ed03e3e7139f669b2d07e6"; + sha512 = "0eae9cbaba7eebe0fbbac423538afc7dbf439c55d1d29eea9f14468764febbb3f1141fde29642f485f5d7c690ac1ba3b91c9fa436f1cfa50fa87191f1b76d6d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "b17cb97ef70a7667a114c2eb8fa4ab88aa2fdaf09055c1e30e6afc245a4d50eb6f2c3f817d176eabb06d297257f468f1326cc4e17c6a1652f501070780c19e2c"; + sha512 = "0c056092cac3a3660d8397a5f14f2ea0cfadf7253d23d97280d7ab3c6086ef1292bcd5cf42fcff3b1ac6bc55e98ba5aae707d5b205472bab9c37d4fc7869485d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "924bc64e77ff15665cada5f9431d5a34fa71ea0fc57e9d7a57879f52b549bcfdf336af0f11b00861d8b4e8d60aa4c8f7cf0b01d05a5c1bbb0ca4a89a6dfc6caa"; + sha512 = "f98a1efb8dc56319429a06e9b52d0431591ed70573c76e80a4b4c419c47a2d810ad9f3f9ea1c9a5457cd55e8f98155165b7922000d750033503eacab2e8b40bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5c85992f95f5b975e63eff88b3595effc4ff74d04610a86c5b27184c24435cc2f3f22df06d1a7e84893ea2a823bfaf7da9f534fbd61d2e54e193764e0c24a19f"; + sha512 = "475d9a65a6041570a4bed8c96e63aba067a7eb659a1f303b0ebf27e55478dbe3597ec7d968329f352498a58a5256b2fb36505e09e35d1af9ac1219adaf0e607a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "66cb534a5d5a770b58da042a92b6536fed714cfde257816e0a4dc611b6ac450ec364df8265e907b7b5482faffc8d5e200a86f40013a7e74f22762170d4c95d35"; + sha512 = "ceea5a1b8fd3f8ef3d719acb62c5653ee00a3fdf7ffb2e81cfc22936aed53e726d447564a7173e53f27946f55d37816a7bb01abde95e8a6c1718d0f7cea35437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8486b3d9202fbc4d800cfa33510b645af94b6fb1c6715ec8e18f0cc4d414f87e4902d615b6b46ff0eba5bfb2c2228c05bbf53a927fd9c52ec7f0b1ac4889026f"; + sha512 = "97b687e518ea024c510365b18a220ff22fa0f722645c927519778bb8ccbce55b1bc3a909d4d06b3cfb1ed20b3dfa3761593b7967f516623b4ddc8b26e97359aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2c46b7aa34ad5eadc9fbb291fb4ca320676e37991863f72bf4cfe2266a6298ba3157d1a0d2fa6a056661ff8474d988e103e8f5b215cdfc4c457c6b7d279461c7"; + sha512 = "6e846c894d67da44f5734f409b6822afc043bd02ac6bd3801daf47891fbb1b3bab10ded1f980f11c7f41a8ce4d59b6d99b20eecc33fb60d189cc15df9bfd63f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f9be3db1e0436c3dd4fe30fc3e93e05fbb129fb5f666d912115cea17c208ecdaa0427f4446f38f190165b10c3288573574a6abaf20288ff9d68d6fae200af7dd"; + sha512 = "4c647b30775cd27e6955e8ebc4e9b375283ecf0b068fc7a49d3a3f99212a8f318a83879f975d85c6c83a88735e9851296869374edcb43dcaa167c2b954edf939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "4091caa77bcb1d4602eb0f191949a88cef0e0fac5ab5b601fb987c1e8dd47442e9b2ca30077308fbf57f71fa6cbdb85f67df3187b71b4680ec2a51d558211e17"; + sha512 = "f1d742720553ce31bef0881fe5da8c20d5bb2ca99710a882c8805b26c35e2677653ad2d4ec91371dc724410d0edeb884813f8d88ceb0f9019963cc98121e6bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "7880561a54333992252b26124a857eebe745bb683ad9a9f2d34e7dca8c480f0fbebcb27562dd62ee0ab525b27e31013a7dbf0cde389cf8834353b6c3c2e96914"; + sha512 = "ff07e1c11f23091084361ff20404cd154e89d483b98b3d960b2e72567adf66192debe1862c1dd461477469d8c6b07a02a6dfbb9f0ff644c6743380159df5fe30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "440ec2334dc616da063af952c6a0a4e8966fcaed669d22b75be708800c033287bdfd66759d479bd2085bd601aea7a1bda27067341703da3d6a1c1b305d767384"; + sha512 = "2338b344b5507478c36f900f76e264580ed7f62e46d042252ea90251c1c80a9262746dfe7d40c6bb593de89737c848527fe33d555dd7aa7fa3971fd0d4483e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "7b9242da1d9b16c66073bf4cc85d438f2f849b3a0641eebc485b55f4ea3ab750c0bc74952ffbaf80b23840ac375e45984e6cecf7fbd6de5f2405f81b22e23f68"; + sha512 = "72cbf626c69a54d18d8c63895e59c2464e7e2f9e0c6f78e58548a8f861e7b2033533c3569ddc2ec3a2e4fe54d0e064a855a23485a68c08e1ea672e2499183258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9b88838076dfaf6b1f243940e97d02885b17d5ff82466ebc8fbc9664c95a62e59e305cdff3bacb99739d6077fb6d3742ef2a4106dbf423003c0d75bacc296a14"; + sha512 = "ee3ba405eeb7ee4d0622af5ed377e39ee4049b33637d122b1395cb00a9db8558454d8d371ee16ced37e1a9f5df7c07b8df5c0db67822117287c58a7b08d45fc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f685409b69b27efaf703d248ecec25dd89e52f462bda69d509240a9d1f1480abf2a8849efb9e73bc8056378a0c1e4646f2341f7e84112582e3169eaf7300e3c3"; + sha512 = "203e6881ebfe4e1c238b83ceee8e59666856640417dfb27478027ba204823f78400b03e7e060c8e070207654f522893c321a9efe3671a212fc3d93519bf6c960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e44ecaded4ada349beac0205e659cce7ac962d7d6cd97040af43c7f904909177bdb4ec38ba7ff57f9aadcefa55b3dd09296af49ae97357d96382f45a3872a963"; + sha512 = "51690eb72296dfe440216bcc85f31312da6c10feb251a94396944af3fcecefa9cc07a4a278775214df2841a3530575fd385ade2dacce18b33231ea7abbfadb75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "99d79640df9b80f380438d18ddf668b22df7ce85f99bbb94234ee3f2d7944c590b22b73430d2c73f3c09c05655356c6549ad1cd33bf5bd6dd619ee427c183715"; + sha512 = "2c802cba2c2d9c6627136f83fa3bf31ac2a1da1a8803a0d816ebcb16ed36111ace5fd229617e88a9a6e25818dc350261650969f05f3b2c3e7bd252a0d29ee54f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "5597c5d5f1959f7a473094b415b3971d4343b9317fb27e6646be99e6ee8e07e9d97e1cc8e51a77fc63c03760713e9644c6d292e33324d6e599270f424262f6a9"; + sha512 = "407f5e44710733635f1508ac205186a182891415615be886da185b856903fd3c5d4b61c55c89f4d9a5ddc5e275918dc9e2881a2d3c1b5f038e1d7f7d490334d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "331097eeeb0356e3c281ad1bf870252f6a3312a0aea9a52158ee45993b7348fb15896f73b174bcaeac4c1b71631952291683ee6bc8a35b7156cfda280cc951be"; + sha512 = "f6d00c92c423e09c61f23ce9c743c91efbc4f24a140d136f0b567fae3ecb45168eaf3ad5d886a1f15bf269c63cf8d8ed4f35468fb887371610ef55ea71322a62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5e78bca3a931bf8bcb94d33340dccef6289d32c5ccedc75cd347944e56f5c39f0780b1647924bac8faee94be51de39d93f477a959de4304bcac9f41ae51e52a6"; + sha512 = "4f8fe24bbda036402225b42b27bb48b46166bd9fe1963f0c802ecba2f186bc72c300d59e10a0fae384448ee2374ae88f311606d69b939669441c33dbde352795"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "5d8aa24b3c859136b833cd0686cffb73541126d4de14e5be5bc5a70eb6e109fc36e6415af0d2a5c680350d34d0ba13afc21b49e65f9e8a210efe82ff0b8e20b5"; + sha512 = "e3051d9beb78b3ff9fc2ea969ea9e8b672b03162f94a5cd290c8953c08f106d4bf141b749f3ea8c2d38a2d4711d3585fd0a358a45862b4968f6b1a1b38bccee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "8bd6b551833aceb552c52efc4898546b639349c398abe1c62b6476f18e64de7efa63edd844c3902300014415d78466f461d5f37c5d8335d81c86000127f6901c"; + sha512 = "a1b7c28fde683783d5e36ade55ae051bddfdb829f6568a0ede19d038ad9e5cf25fce0e5669d7fee50cecd8b476dc9f0d4d401c9d6b30f2c4589bb086731fc5b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "bfb399e2e9086550498f0f954cab9bb061694a190375c4f26bb6d414ad6047bdccf21c83e509da10e2f4b18d20a169cf2d3e2d33d76f20ec0278c4f70c5ded19"; + sha512 = "70f839dca4b337a3161b71ae8e2007e8075a0b8fbb1b17ccc0e78c9e1f34e50b5711e5678f183cb3fb14fb6b961fad82fbe32393f15c1476e57ecdf58881d1d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e6611dfd935f95604f694aed4d17844d11a8713045ad529e64a62fd77a06b516994fe4eaf487eb629bacb597cdfb13bf9387ff023dac6cd78c1edc9a8e008975"; + sha512 = "e242ec15f4b6d136d9018df3edebc2eb94ab9e02f0ec1737e10ad3f17a2c24696a0cc2d0314e3b09e07d979a2f0fbaed5a8ac10b9954d5c54cac0dd0a2b01ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "a2d1206cf6ebfe5bf07e4525ca21079024eb3f4aed9c7a7b1a3f9eff416b821def976533698bd2f59c53179ec0c2613be7e80701a1c4216eeceadb8c13b30f47"; + sha512 = "4fb727e5d8b8c3519fba218a8d4bd49a58ea4d7c20f3143b183fb6ab5d1b17cb373933da645c5d3856906a97bfe6648964495ff7a85bb85e01938abf79139f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "bd3ca95d7e7b66a70f961eff93fcae884edb8a463fd2f98cdfb11e3925eebf7bb6da66cde6ae4a26d23d31c10396d47331895b8200cc5e854a89704cffbed437"; + sha512 = "ee25d95b8f9a5db60fa5adb7c656e8f39a1420b380ddabb3b39fa2a50322fa104934380b6698cd4f6d941d9b63e77a98e5cb002ba9dd3548111c9e6d6741f7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "d47b65f5a863d790b5d6249d2b0201ae625303b48cd6327789ed36ba4f36ad12cc7146ebb03e68185928eda63dac3fc4b29131bc224009d571b0efbf9ca145e6"; + sha512 = "5344184aee16ccdd0b8de303c788134b8435364a760c1ea0a706c44f36d344ca6b25dc5dc6821c84cdff2c5f0a8a7da8427ef4234d94d649e951c901200c087e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "28a574d023f84bb5b5224d9c9d9e62292fc86e6a12fe34045397f16917d19d8f4319d1a08742880367b6fc85a62ae7a09ef29b111709ab4a256740adea2f3bff"; + sha512 = "67f5f6d342262e8bd3eb9ac0561b7bbf170b3f8dbe861e8b9c0607b087410a24c1e4b453502f77eebb5a045d5980bc9e1680bb0c6585223d4aa809c872fb9d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b01b97325b0265d060fad86f7cc77bcc14975c51da51639991190cba2f6c6935c48cbde0fd78850d579ea320dd2e9c87edaa0750663e5f0ac234932968fb8847"; + sha512 = "b4a3d6a3be694d00809de9d78a1b36958f9150714b8ec068fdf9e79982bff82d3dc7c54f9857812b2ea9b2708aa0290d4fdf787993697f99ff719b213e50b0f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c0791c6f41097142035cc0a32f8d7c3a14c1975c4f4984db778240169aa48c3e4e89ea46d21c5a206278b34477499806346a47151472ee9b47d596da5eeb4664"; + sha512 = "14411beefc9729e07b80f1f036ac651312fa4d257479882841f82b0c5c10ccfaf83f31b2597c9076dedd3af4dcdcd62ee660a38d48a864c09519bb1c75728e34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "091e89df6c761fb0d3629a430d91fe9dde17cb74aead6395d39377ef7b1038ab75a46e2ecc2517605dde3e512d6cc1fd4fea706ca177b03b6fcc1854ebb99c2a"; + sha512 = "a6e40bbcda17d41a9972e56794847fad10bdd14d3e09d9ceda82b09d0d8c65559667b69afa2807fb9ecd26b8daeebe29a8cef6975bfa9e769886bcb94526f14f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e84f09eaaca7f3eb2c4c8ab10f5fa48853b32a9b7eaec022a4f7cad7ed816d795886954aacca935ac4f44410c63c90e0c9c98f162a7afb517fa8063a1a26bf9c"; + sha512 = "39d93aad369a22207d052611355b8868159b8fcef54fb86bd7bb1323ffad34d90ddf870d4cf21fcd3db0418b7e12335043d683c5f533454e19201ba6b9090c77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "82ee016a8ec7c91708bca2ac498378d240ad45e273d6ac5c4bdecdc2a2f3c042ec5f2f77935ffcb9e391f35c8ffe3876b16ad2200db855818fc889568f0929bc"; + sha512 = "83f4351f9c7217aae381b2ba3ff8cd00d1e60ac0a05e87598633ebcf70804d8aa235f0b6af0f5218b90292970a5f18ba923a1a20b6343b3a8a5fb67195034d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ecbe89381834657d3fb8d395cb58cb5bd28d9e30e160b50c6052ae49a60f1a58d8d79218f0f76814106575e01b063d9560dfd2a4278bac7db60427310414c6aa"; + sha512 = "82a3f443e757dfbe47cba8c6fd0099b55537eb290529a3d93569d7f044147e37518e6be82bfdf1b9bf13541615007c11d12ae7feea6c20c35e5cf74e00aac1d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "9cbe123386fe1c15ddb0613f2c2cfc6b0990fa824ffba0bc0c25069c02de1915e82531f5d22253297e97c8362e0fe1e66eaab84387f741b10528838ee2446c29"; + sha512 = "71bea5afbb118e32e2e8c88f2eb88a044124068115301e1eccd892293fa59b2296d548cb662f6b67c6b52d8d9dcac6c7f395e70183c2881b72b7fd3fcf1fa759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c53e2b950b427a6d2c3ec7ca2c657581f1d4f4bd44b90771475e48f269fc2376ea4cef357e8c4d7d27869766e863b1302a860d4ef104bb664b119971823625aa"; + sha512 = "3cd583e0bf4d646fcea81b4c20a25731b9b69dacc61384e8aca6bbb3e1cbd795e31ff980f4079a51ce76f71d84c5cc6a3e486ff23f1ef2447d249aba48af9434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "4d43bbd65a4c76445a6dd5c35e6cf0013c24dee64289f4074a482d6ede232a86e04f751781dbbd65b18a08a96b4d6f45b5aa72dcf8062a23054755c4c58ce779"; + sha512 = "79393657fda529897b2f13e842f44f1bb76b2f90889bc86511a23238fe930eaa8abb55eb5541640fb214119ee2e0472b3688e75bd5f00c87f5b47b193bce8e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d35456acb515a56fb411e3df647fba2d1e2f312a0fccb53dcda3ddf68e839fa8f38f78bd73afd63c1cfb8954f65986fb3a7623217ec8d631e36466b531358866"; + sha512 = "b391dd863b6d336cc6c9c60c287e9f85f73c91cdc8463f1b3ded0239953ff7e0bf04cd8daf12185277175a71b55ba002ec74cc1256882e453fede8034c9a9a34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1197948644964f77108c95b9eb1b4c8132ac1b7503a9423f2d2cac8b52e7f6c2b30c451fa62573437ef74deb47017797e47f1441d60d40a17898717b95eddfe7"; + sha512 = "ecc51ff78e3343c72bd1337a025ffe81fbd62e98bf1028f892ef59591a3893bf99bc0f58dec5e183672c6ff9a7fe36ab140a8dbfd892bcb99206b7683b7f7189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "309b0d6d3f2da1b6539e6243ef9b44dc27f4205a273f7ad82659c9691d0e86cd99ec388b9469f9d97e11f45f534b06a702656f735cce0fd1c95e09a9c7cb38e8"; + sha512 = "e0fe7721850ce3dc21aa5fb587e205d3833fcbf1b513df3fe67e9e3326ed57411920c6ba7d8872bd92a5df073362f67b101ae865e0954731549c7b25cc34400e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "ee705fe4393f1f07317dfff0732a671007971eb3f0e5d2348532c3b681455ef7d680c5dd20fc8fa41601cb0164b66371ce685b39812684fa89523a97a6361614"; + sha512 = "fa1f58e589f1d5453e8b349f87bd798a0b7fbf396890b6531c433fd27043d3a599f218093398de09387b2bd1d98ab50e92bed3c211617cfea700bafa0c846f80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ecf7977f395056f0e346bfbfb81a2d74c5ed544c9bd3989e16b2f0dd6d5e3fc3b6fb48977d0b468f2a869efd6929279982a9eec33318c65a61c282996366735a"; + sha512 = "73a0214561b02b4b30e495c5e62c1883409cc20b8f26c7aaa2bc32edbe197e8aed2e4165122ae84dd3035d36296d91a30c4460e9a5a319fb222f0d813601486b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e51e235f2733c54f0af0ac912250b8eeb4277d29151da7a39c342c33cdbe381ee485aff5c2431cfbb088de8fb94c91b510efa8db614607819832ee8b13d86584"; + sha512 = "ff6d9319998a1c9d394fec7c484b96cda4a473e374b193b47de3c473ba91684000d5a909e5bc460b83fd92562e225476671d42781968051a9701a5e0f760a385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "45cb25937c1c791e3e55e9e70c469e28417048842e2993f917a7e7b340a0aa1afb985a8f1e6719ac26c1329299e2d55fa2cfde49c007b8444a97d16423c3920c"; + sha512 = "3b31ae6a9d84266007d7a61840782f3e1621a5d4b5dc05c7352e682132ede5225990712b4371edd59edd47004a87319e11c347b18a39e4477afc267186b2f1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f3dd9601b114a0ec45951d187b1fa1e559e778c3033a5b9bc75b02cf49f6856fe77046f4f1a75149a58920414dd5ee0c98801d9dee7992aaa7ea6204deaf7c4a"; + sha512 = "d5342196a66b2feb19352b5792bea6579e1921b573d583ea8223a3ec1e7c59df375a3ebe83345330bf42e6a01c54a5947111d0951025f6c57e55bf374bec1c52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b937202e944242c4a35da64add8e4dcd9fb4354d1ecee9144d1cd1dea5f5ac1989ad8e3376099fe60705cf1486b2ef350aebe5d55e440ffaf6d9aa619ccc4def"; + sha512 = "ab045e67a005d31da572c30c6a90266e82a892c3c99af55ba97de6dba0f2be029d58d6ea259ee13d63e15b27f124dac528879109ae4342dcbfb46eb376021846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "881062e5e027824b5768db1df6aedef73f93721d5f4e4d1de5a31d02b3ac8a6a87ea5ae7889a6ade614180e15189304d529ba03440fc0b030061e1306ca1a02c"; + sha512 = "aef5375d4d9ec0f34cc3417d68cfefd7f4ecb489a66bd668ce1bdad9ab804fea267557439bdab5d6685007a3d16cff85c9e92f7c1434e3a76bfcc94bea8353b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "b3939136fb7efd9712acedc71a0d45cc0129367f5a11a2798c788b693e85cecfdfce2b83a1fad2f8bebdaf7e973d963975bbd67c0ce342ba0a4d0d46ff2d01d8"; + sha512 = "d3c86d1afc103a1db53e1a03ae36f3c7da7a1dcddcb5ff9e2c8ec06ffe60a8e4f767a012e375191063f0c40a80bea08b66ab0a2db3ceccf796de15bcf232f04f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fdb3026d28c507c947f236ec9b44ee2c74f2e4b2df38d0bd23143d9c56c855a19cb99deb087f2253c1692436c1ac25590b78cc3ea713e890ee5d6b3ce70d2cf0"; + sha512 = "0effdf51a9ecb2312f34e14edcaa7ef40d392f6f969c46b1dc204471da276ba5b73416ede2cf6ea69205f67ef44df815e6038137c2400df2e2581564cde5b1b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9ee305e8b77eb8caed2e0ec5251f651d16eb7ddd748a23b4c3f17853dfc6018efb8262958f9843fca62799b8ae952b208dc97a4d51977b0e4a81ceefb2575179"; + sha512 = "f57499563c17f119472fcb48afd54d4df98c85c854814f872e12e5ef4d3dac3192905f43453849ca7f024b4ae9a96528c2f9a55866133e3ba0651d046fc4ee8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "17533028af974f7b785ee57fbd04e9ff0cb4f952269ebb9fba89a68a8e4af7790628afc74d87c1a338670bf05781cae5ba7cb8422d64055c54b39030a87a6741"; + sha512 = "50defae5a904a2dccfe8cd34aa2ddffa05a18a8b8b7181029f7b5b2a6bf612445bee2c3a4cb4c4f272bb97dfaaa487f2ed31dabf200631c53d963bc5f66fec1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e7691565e57153059b7b635bca91e83ce777083920e18d3ad26af960919a7505fad2e6da3bed3c179df0835225a331ad0e855256e87078cd2d023fbf837969e5"; + sha512 = "9bee6742358a2c726b23e5c51d79fafa92ab8a3df7ac4acd2ebcf9b0d6a3661ee65d6335ec91b4e02a0f8cc3c3b452ff642ff2682788a647fc5d29c80b8a6d16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "001ffeb0a229e1deb751f7a7ae1b70e42b28cb47e321fbd4f89f948302ee31a5cf0ca513d51f978f6482f175dd2099dca46987ff22f72bbf60dc094146aac1aa"; + sha512 = "1c2d6e3f62ff24b4590163da626a92e461b9e7035346309bc7cbf1185f21ce318ef6e072902249da5c59d1f37724e4079b1d673492d2dd94ba0f50c38af818a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a96853819e1bd1fa9eae60e18ab1dc6ed304aefe6d13f8cc21ff500cf2415c7f60a623347d3b3632868446e1769aa0b8b0acfaf036281b3d8e838f849535579e"; + sha512 = "be9704ccfae945863ddd60ac9a4cf4bd2642bfb11fe3adc20d396c9fb0a85189fdd31200e59f06aa4a1c50f46c799ab07864e7f677bec2133b9e2e60ebe3175f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "abf878e46f44d1516e3d1a0ad873065ceb6025a93b968b71e532ad98d7c977252b703362778b34743dae0b50d3a88238f09876dffe46ce09ca5f2785d48f7cfb"; + sha512 = "0bfb640ce98b3e16b01b12db7c28753d9d90d46beb7ca7f205fcfb9d90537eeeab6b29ee999108e549b257c26ec4e13d64e470ab79531f83895403ca7ebe7d0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "4f201854676008b06b4e790fb7f0ff39648bb14f7813e733038ca9a8acfd5dc2bcf527eb3bb45fdb58def786b0896adf9660c5adeecc1697bf459bb13b63eaa3"; + sha512 = "7f8ee664f3f4f91c3b13f2e9f0cfc8d575f9a0da263370b0575a16e6e9bc7ba9e449f62df6494ee9837fd8e4620c2d4848d0cb7d99a3cd675a87bd65c1ae96e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "6d5ecffeab534b86728a023c6507929e8dcf124e4f02431bcd40dcb5322ecb5ba38e39a1fbbba096fefbb9b0860c571408d8c7f0f90452baf3df9c4ced4e9efc"; + sha512 = "1161e096b7d01fa4de5ae618045cd0528715f961434eaa569f8492a7ef0c059c2369f2dca348ffe0f24376cf6ed529be9b7077bffada3b0812a4aaa6677a6c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "64ecd4446edf856c8249b18246ec2520b999118d4c0c815da472f50c4dc2434cf504059a2d11c8a72fb1ffeb76e7ff6fa62a55e52d478884f516773511465a06"; + sha512 = "cefca3f2f8c94cafea0e473a44a1068ab7a26956b9bf2eb3cd0dbdef851288df0bfc05ec0cfd6cd804963d1fbed7b5226cd1171d2fbe86372c977c22b162df4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0834f04f6c76ec8780d862e550c5e2bcd65acd7dc9b8629d194bb3407178fa3ae6c47d7f1421136f2966c9826b942c74335452a647e86c7b58b6708cc26c445c"; + sha512 = "7b6801cde7734c77318de91dfbfcb3e039012d048fd83014e66079d797a9d4b4c7394b7a39f330a24c82c0761436bfe6d7d5915e26e4ca18f4095fc68c728caa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c238708effad87e764a8ad86e08a41574d06a5f7985f8370a7067deb0e6d10c97c395186387f18167a70d28521a811617adfb7aa411084a3a1397465f2de8a3e"; + sha512 = "c4257963ea60c4d932326dc5fd468b96bfb6a35b35ef3c7950981ba92f6ba07dda586177ebfe20c386fb8b61d0ad406e102163f43a2f96e9710a4b0e7c241245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7a1fb23ac7ca6c25e385cb27026064d5d17a613da19cd1b21c0710002a5d5473323d05eef05fb21e3fb1aa89630e38c4838cd211297569885c3aee251f7dd0a7"; + sha512 = "6061bc7c8c0fea22bcaadebd2a264f0726b43c71b9f4b8c4b33ded9dea7ce9765e88fd1e4dd47935ceb5791a43785db5f4381fd2bd0181a281e62b6de025ef13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "306bade19239b1120e1fd8a879dcd98b695d966b94c061c10684e3ce3b9a2a6122d63b86f16cce9611306ef297dfd39003b5ba47ef29fbab33b1dbabc2097e7d"; + sha512 = "ad4b705bcf4ce2b819f92b45e4fcdaa2003b37dd6823e75caa153ecf5afb1940ef79984c8602c94e96ee2be025d46a52956a78de57e3261bdacfdbde605f568c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "30fc79a7bbba6cd5c75d55c3169e91ac41d2259d77ccfeb4569cd5bfa3c0e7164b0e03e5722949e339197a0b82d9eea1f3de622b958ad75e6dc94ce0d10b7c00"; + sha512 = "d74352e12bd6f7a948f9ef8cc383811f361c8b68eaa060ed9859d3680674c07a4ff922c818bc502fda85dd94ffefea679e6f9ddc927fd193ead7685f40beba75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b31169a87228bfd44f144c2c36de4c24165bbbea48d5ab93039108d00a34a68dd31bb61371c472e866639b7e6b448b6c95ea2d9fb40b0c333057390269b9af2e"; + sha512 = "7fdfb976b9c586cc5cafda4cae0e6d379eed5ab0524bfe5cd5384612667a2949e5cf1e741786828b30e8ba67a4150bf34c4f10f2cd2c7aa89caede413501adc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "115c549157e802ed556dd8eeeff282dc045888a7da767136ab3568ebbe611924a500dec85cb7c5e5ed3b712f1478e9ea825c658cd8565718db7af04f4eea1e17"; + sha512 = "3a967f09b09bdb3b0009dee7896cfe787b65ae15095e88be6acacbe79f69411afc6d90638f0cd82171a4f8f858e366821d3b3f3cbe0fd50b03172768ad2525d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "61bf3b3e09f21d9f8cbebe0cd0ea428a04dd8877be004f32c610b8938f17ddc24d49279f98d9701069855d15ce0c0f8359e6448eeb1681d89ed1e1b69f9196d1"; + sha512 = "2f9d078b65e479427c1a91714aa7290a2aec04cf3a6414df82ddeb5e830210575656d7e3cb35304c2d1fbbad264d85ccbea2e2408a477a396c368fcd4aab95ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "31f481aaa9db45b26b6d7236eb501e041cbaabbf47b922563f828f2415451ca5dab896027c4963bb22fa3c6dcdb26f0821e78f337c50cf6e8bb94246de86cb68"; + sha512 = "bc3b65a2db74bd04e31082b9dbf3aad9434c9db2021d28f6a058ce78ade53b6ead38b9a7f123bf58e8a25f25d76a0e5fdff6372b04e34c88f4cf7e58ef80daea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d877f2b0f4f082651092cddde4d1eb27ef261774b8e72de6e87a937a13f55676c8a7c1b978d75412235d89af7bb7773ef1f2f6260f3a7e8f63e3a2f8f769c12e"; + sha512 = "e1910f17681e058fca270e37939e5b6003195499080d747f3bc5a4ee9dbb960919a440a7f627050dbd0b66988067f32e41599d72fd6bf38f07e23ad317f83938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f63bae9f41368903b9f87f0afcea69e74df57c355803cdabea540d22c001a42c4147a9d9823b8f0e2f9fd89cda4da831f2777a917a031c94203abbd4b2d6b117"; + sha512 = "a5993b73b475483deab792e4f657a27994aea194c716246707a0612a7b5c4f6b8b7a23befafd7c6fe50855a11fef8513b5bf16cfc6125a786b7fc0d50b102687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a2692f38c092805471d7892657917be266d1b6e319809e1d506deb136bf14f0c3685a9237c07dd5896a1102c809340370cf95741fb8235e0d9a6a791d167a74b"; + sha512 = "306c7f964d09d8d73b7c35161e28dc856917e7798c1a6a57bae7ccead2abce5a6a6a151f8e5a66473d3ffac43e0d0e2e4dd9d1bfcf66b23818e6bec246bd547f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4b9099f2159cdbf4868d427ed1baeace54666d9459c6c68e362fd83f1f68fdfe053f5eef387bbb5a721019a13cd66d9fb9ca08899eced3c8b48f1b368b407d93"; + sha512 = "fb29e90b0728b2a0b23e2d87c8baeb6140301cd0d6d89fcaa3e047da25c8333f5eda67a5a1582f98c6711f894cc08542a6e8ab0a326726e02c08195cd88131c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "cd38d40e209c18b545a8b9cdf66ae09f87e09f319a7ec5586d45fd20dbae004a031168c10c3ef851f19976b240491cd230e54a1ab16e6c0d7061eb8762c5758e"; + sha512 = "8cc66ac0b88632bc40d92764f0efdb71a69949d29a14a2ea06907356fecac5faf472399fa2c55dd515579ed8c3501925286db600f9239a82a4963aafba2b56b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9e108970f376dce2f32ac4d337200b0ea0dd784a4543f54cb864682f988f72e1b8e0c99dff170a3684be65ac5736a2606fa9281e622d1c6068054989dd9e3b94"; + sha512 = "d346b5e10da51dd30b1b404f567673fec759ba0f8e44f0f0dcad1375df212aee58d34147599beef8eb78d12ff6911ba703ecbc3daf8edf206d19a3566a83cd49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f3ed96c5c411b5cc1a1cf3ac94d5518e741f3ddfbb7ca3c437aa7746b03b7bcac28c7a4252b74ee3205bc0ace7606b1dc50652e216ccac2ae6c398ef397658a1"; + sha512 = "ec97cbfb74a86d96e05c70f73ac2e45448720c25845cf24e9c45d8d3174fe540911b691fa12fa96ed4b82cbf291a539311247d2b2c8073f790e1a3054997f50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "36003ba95a33c7296e21f2e254c71f328c0f994d6f384a174789624fc527e9a5c94ee80f8784602fecbd6c8d50531032442c080fd657a6493418714daffdda11"; + sha512 = "86676135408c0d9c268f93a271d959dc250d6cbd9e47273abafef0e5d8ba86a03e560539008034b5895ee0e9c415748c10586be538adfaeb5c7fac5f3f54a4f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "eeae7d7bea78aae2530322060524087886bfed6e0eb90ed9c7be77996e17c658aeb758c7af9577f863016b3dee8d83b7dd5e61f3d283d932aa300ae8de2e3c53"; + sha512 = "7fd5bbc7c046a09ab05f8751015d9c04f01d8cea0cd5252ad49f7dae612ac87d65d5992e840bc7701b3d99c90869143c721e690e51f45ac0311e27c45471b23f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "9405a8746752fa132cb137f7c6d59a9649f31130ad3ae888cdde419c2f016bf45dbb97ebf13392678453d1506f98d451e9fc7ae92eda4d5d64c0ba443a528568"; + sha512 = "b1fb2a67f132d420cf47707e0f8c4cac748b2c010ae5df7720921e742c13af851b7962c6808316db3eddb31520fdc84367f9dcd4cd0549bfc5a0aafc02cd9b4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3e9491a63956451dc0cc7e2fc1e833f8ab2d49b8c5095300db545391a86aa73ea4ee8b9d7419906a19fcfa7927e27ee89b934aa79f90631b0c5dd1a9ebb0a764"; + sha512 = "979ba11bdc4a19cd0ff71c6626ec9bacd18738758b1748218206590c29474532ecf28aa9284e94e57db72b24330632913df89128a6e4297582ee64ed47e63065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a660a0ccf2a47c08834a183c54cd53f134b2421a4a9cef17e59b635c9a8364c007cd5a814c040ff9dbecd2373a31ce551c0df48ef7d8b194b53d5083535161d2"; + sha512 = "65fc8854f5dbe87f0f548eb755b08f9dde3141c765eb6e891fc85cb91814a72edfd09d0aeeec2d98949a788a11a775e49a8ab16829358d8499b5ee27565da4bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "cdae561346298b4bb8f85d0dbc6bec471cf755c6c5f89c5a58ef5e15bfd2143729f903b488366f9d9b35c5e3df6f201680e8941db5c0b8d4632efaeb34e93711"; + sha512 = "2ed2dc8618c8864497174245c50f6e4c64cb00225c7ce77c04a81619bf56fc5e93bbdaf7c215576e521a7951aae5d22ef606f8b93fb5d5a302bde3e92d2bfda8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6ba067baed3af7a543188f491864c052fc1434d888245f8ad5378eff52afa9313a7a5add5416c14794b5a27a5bac353a3e798a8176eba62f6289d89bee2f3133"; + sha512 = "f8bacb758829611b730ae584107964b4fdb3e202e45ce5ddceae9d6697c655377242a1550884051c7d6c18126fa24f8859ec9a8527368bb28348d16e69ab656f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "829f8e22039e732fba4d480212d3f7bf3dd39cbb0996475c17e29e442d2a5263f33f4c36a4775ad21f984393f8738dbdeb7e33fdebe97eae0dff01a5be7ff22f"; + sha512 = "b20773a0ee3be91af9635e4bc92b148c91f1cc62597294f5b37608368b1c5fccda1fc203938a8ad7f2f59274dd6dd74e98d1436e74b6e4cd8ea21a6cf2263cbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "62b6b7d49511b28e67b41a192de49b7dd9d4f806f1df488c850a5da14f8ae0c87bfded01852962f9affb112536a9fdce5ab338b8875ca49798f7c78331dadee9"; + sha512 = "ea05713f6f615280317d3deb14a5f8c3ab6895333333da165aac253c7cd9d62e6b913b56a850e82c0713abd1fa92c9f447771755b557d0056e10f39e54b5c663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "b00eb5696fbc132cffb2053c67ab1456ca394dd2540ed08e4aadb718152ea727f156647e0977ed30ac17701202c184f99e03fab58d7bce03c5030429a733a7fb"; + sha512 = "73a8207478a59a2cf2291ae848dd1e8edc7274b4de4feaff4703279750406bfb9f74a3928f717d0d2274f0475b449c8327cdbbfe367a31f35499fe3401029f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e81bac0aeb2a5087e252d92fad3aa15d17aed5b818c14c4d32114cb1e2002ef52108aca1e72618ce8b52fd6fcc75bb6a590c78b36a9571caa64956c7d33f7313"; + sha512 = "7a6f6ab7e282150b7020bdcc4d025883709088206df00f1eb47979a937f5b7f1b1f7984c3e9148e14ea669bcb4b9022c885816e52aeaf695098f55d9c00739e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "a3b8dbd4e3fb0813d719416a297ba6416fb6a58ded329ab1ae8ed32c29bd7f0721ce35d550db2e02674449da62dfeddfdddc51b822475cef5d4f1c215b7adfef"; + sha512 = "b8f7af681ee9f83d6f0ef76f860a399612a4431447f77b16750cc09c03e2b78b98f2b2ccd9b661221a17a2a45a3e383a12346215fc3970d6105c44ba4e655e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e5a243e9a32b8dbf48178e20e6f6df2fa779d2fe7c761c3e8b85641a655e41868b86c794d12fe987be4dbafae4577dbb3e45038bfcd6e22ab0a477e8718170c2"; + sha512 = "85978c209c7519862d72adc61065c52a2f7e2d3f37fa5fbc10190fc896506737a42bb33fca3f7532805617932e7f824bef010c43f51510b8c9e0609560c1918d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3ad5d0adcae8346b771056d92255b57f46badb0023597fc16cfbecf6cb8e9a7246ba3b2c7729bba9e43869f3a882b0daa214d2ba5d0c4f913350ff5c5994ce7c"; + sha512 = "c7dce64af32f44b09811fd42c2edbc58556c931d9e4d11e763b27d969e74d860a682108b5011335fc75f1ceb09107dc27ef1e4c0b196f0048fe8b3541bad8f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e380c47484bd56a7edc648b36008f8fdd95729c341e26543239aa3acb7cb56b41108f1685f4b2840b181c612c0235b3c38d815bd5426b6dffbfbec6eb3b94776"; + sha512 = "b63e73be6f0f7667fea700592407adf7599935c5a25ed93d140565d17f563fdc5c7e0cb688733916312287952b95f16e82496905c187d92832e0da296d925164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ce9f7c0e9fd901be27572448ebefbab19749f11c49721dba53adccfc390240e4e1420b75c0cabd2e2e73edc34e6104898ec3372fd7f7072623769bf72db53c33"; + sha512 = "8b1de2e32b3450c84184d20df16991ad0a84cefc745ef110c93697841fa5cb3f4bbd9d3f21c8df6807d6cacf97dea1b856cf651567858b4c7403738e7c8445bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4cb533495ab0fbff75a53b56411ce1c59cc2420dd9c463547f46067577f8b953cc59c3d2f203850f75708f38388591a086335416edbd8787070345bba4af28d0"; + sha512 = "4dacea538fe5885bc5030512ade78787be53db7625ca4a006c48787e6d62c4ac82b0c7d40976767ac483a6b88e4f44abe5339e7909b211cf1f720d584105de89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "aaa9b8dc909d7e50a65d904d9fd7384a94aa365df8d6c8e3852926533c9407f6a08604205ae94914daa74d251b212a9f3707404f945072198141267540314edf"; + sha512 = "6a2681ba41f8449503b9a55d551ca72a94c51903865062baf0f80e29a4cd98953ebfb239c72706e42795dc1a49d087822e4f13790298a78b0d12a0a08468691d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2db35215ea1bdc70fdc2c2e8eb576945bb0951b001784ef29fdaf7864c2d00d43122e58b45878e107afa7f0a85bbf332094a8c3cd08c04a5b9ea713fe6e25935"; + sha512 = "7835ee1925c7e097cd16c92a9455e331573baa0a7c5150df27698199b423cfe0e511400955be5fecfe342d537b8a0d66e10042bfbe1f411b5b9563dfcd2f4875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7020efe3d039e4861355cf56feec7dabf183432f49ec8f10792575a8cf33af0d7cbabad627ecaaee3d47988c2a1261ee62d509d664b4a8ba69d1e6d2b68f292e"; + sha512 = "bcad9e4ce854ae1a36ffcf82690cd8f2240aa04f0a525c1c0d9149e5ebed1e78813488a4eb8330b39e61399907fd421542f1b10c616819b2567215e5ff5f972b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "99939f05878be5a5758f9c45410682761b77fdde6559c31e511139955cfa18811fc0d9e19c2d7da254267b4c3bb6c34378bb26c8ed25f8b957a7e73af10f65fb"; + sha512 = "205217f6214d77d0d8a9c33f5d09abc7c32488bdbb7f5e5221968ed490c10f634dc2ae561700f63408ac38d020f6d17937af2b711f2451585ff34affd52dd25f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "74c2f0e8a9e5f9a1052e011a4af950ebc2bc5298661e7094d3776dfbe9b8ce4efdc6c7e0f6371277e530501a6bdc7fc4b5c36983679567d73db1d0434daaaf87"; + sha512 = "7fff85971ce1150b1ba030b11b637c51f166ddc038acd78297aea2251b3b2383fec376fce58610bfa3579825ba66d9859a8f3e7d2e33939c82d4e692d9df5b24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ddedd7552c4d85a7f3c3eedc80cb4213a67024351a34df41b0a8a6735cccf3c79f350f2a5621f8324dcbdd9fcc93d979829663d7fadca2367414013efc5d5cd4"; + sha512 = "f3bc3e70cbc691ff611b6bac2900d7e547d80ac84b3e1caad250c11e3b3776d9ab4db7fca8db0c6888378a540f966aa57e100becb810b1a3fa5b0e8944ae81a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "935c0697a13e020589cfb542ff61e5c67a0ca56f5a040d553b0d92f45efc79d7e5a1686e8981a88a01a307ccfe53284e4362850d95a8ad50aa5eae39e351e808"; + sha512 = "e9c25cedcc9684b88f442918e0a5606c1bc8986edb8c1ac8e885b00241a792c115f118799d425a876c462aa25abb36708b819ac712ed0c854e114a835998e30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d8d43189178768267a5d4d66a8ae06918d4ab77cb400e1a40863a42f81ca9e75f9cef82a68f99c8e29edf8e9b3fca5af917ddce2c0f5a9ac257d9be02b3a143a"; + sha512 = "0e27ac6e9ef47d8e54ed5da4e88b02468596869613dd214066bee13c11c5a3f614fce3dc92f6e4b49250a175195a14fa4e11e0a576e24a550c02fc64187a7da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "31835edca2286977c76544c6885f8b716c67c871276fc9856077d00292eb6130a4d4345ca56e7ae75c392863a598711f69882039145668a95194a65fc33d934c"; + sha512 = "06a1a97d89230b344d72544e7d16cf9249b608d5a8957efbd5fc72eeea09ca791cf17d040d3a8adb64493d2eb10dc9cc1c334a0236aa41b087b9dade15345f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0ba71a5ce4a1966845e1ffbc9e7253980d18ff429e7be9a600c9d3ce1f28eac8350b1401f6a43413e86c8d4a552a2ec3f490dddeca9e34569ffb5cd56cb3c5a2"; + sha512 = "6acec4d29d2a40e0d946fcd72ff1f623d54daf9d9c5c00099560fbb286dc91f1e2ba341153e97bdcf62f54fe616bfcf38ff1e6c0b774a7917653a7e422e26320"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "1e42024d4f5dab9a8cf37c6c9070617a5f4c631bff3c5cbf66a4a1d5d9e893fc320888bbefa6747a665b6941ecdc266537b539bdb6e165b30da4f832e38bb09d"; + sha512 = "b492f32f37ed40ab42fd628cd01d063a4705c8fd14ea599327f417231951a610b307cf1035cc81edaae2e784e38c55dda17275f77921e1a63936872d48944ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0189234479d4b7da251571860f71c88d7358609208bce5bc698a969f054226a07442864557ae51c4a25955cca4bcef409f6a8aa347b00a1fe438d53325925ce9"; + sha512 = "e4a2432e279ee0046606ebbe84f0249afc225fc1276cd28bbe989049ac59b8c2fd09ef787fbf269367b45ff9c8092c6779cbafa45a05382976dfde3479527148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "03d15323c53d30c52b71a9046370011f39a8a8f2386be45d1bdc014fff1d4ea6efe979a199d3ee63f1fa18b0c7f5ee552e9048863b6454418d89075a70ff9dde"; + sha512 = "c8172442b52b48396b57b36a9099c3dbfac36020769101c6c2fbe0a1e857700817dadea56a775d62f127fe8f86b714be0d1be63c9dbd8a2aff15b6698fca84eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ecb246da96e682d5bd0706adbfb2b6448c16c1bef9643db453d3ca17484b1a929c0eeb8f0a1416cf18fd7eba489d897f29a148a41050cb0603121b2c819e0a70"; + sha512 = "e199d2b24e0a1f559a551bef9f0658d23dd69b0a6f9e1c2b02885eaeade95144bea2a29bbdbdb0cf7e34cf9f7c6ceb49c407c34ef61f855e260b2b84436e38e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "1ffe32f481faf8c94450bf873b3391db3546f0692b5697ccfd76ac0fdc493a8fd9278c8c196df1b36468b62ea517fa120acee9bb610a66eb27c69641b4f22167"; + sha512 = "32552d0a4ec557950d64b0e67c572a7696ea7e58a99960b192e5b383ee30a39382c5b80e0fdb1b14f3643ec8c48a422098dbee1d99ad6b2c9eef1bdc3d0dba91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "9f5754d2cb8ee16cbc901202bb59696bba08848c2ad739fd689b295fc2603ed72803acf344a7756b19fcb046490ad2acb878ad065cfb177e1c5c0df1ddb9d0c3"; + sha512 = "07f772b65b234ecdac971fd0a4c0ba049d17e148701b286223e972cfc77fbfb28c357e60e2311519459806b48ee8f10f5df96686a360b5148ad88c6e9de3d545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "d813571e696ce1d4b404c6167016d591148de7d6e02b8fa1df2da5dcefb55ae71649f3a53485024ad90fd33be94c020433efd7911b6c1f6c25c8380f5819e6e9"; + sha512 = "1ae9d11b2911997ecbdf06c66072ba5584c70b33024a18aa348a50ce91019c62c862ad201d6cb7b427397eeaf0c7133136047241cc61fcba4cc761d9665bce00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1ccc37564d296c42f4b35a2214cc21d1a750e09e0c99555284f769ee7e3da9674377230e9c2467795bcaeccc2745d4ff969c4f5d4dab1bbcb216f7817bd7f100"; + sha512 = "71786ab9acb16d3d2bb102863efb79e716a67ab0b32c6a6475bdcf93211d9517b862939576d258b98b543be9301c26e210c9f420ae084233e56d497ab49b8763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "be419aedecd14cd7458eb984ffc040f2f9d0316ca1b078adcf4ab0a1ae6f2acb7c04fbf0b43520aa5492ab3c9551aacc59e9c986434d466eb30b48cbcd4e70d1"; + sha512 = "36067646d3459c6893f3504d5e9a7ae3fffa7291fc32969e98d4ce3223b09ccdf7e0b04a6b73fa2584f9aa45e9b38a8135fa243a88a50fa2cf745b17e7c17de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "41bb68dcc0cee8bbb4050b463648f8f59ed0f1bf4caf701f9c3ab9ba7830caf6655b368798cda6fde6949b4b04ecb1c73637d1db1aff5cfef3bbca7108d9a8c7"; + sha512 = "e6fbb31e7db958d00a937a8565e691c4a65b975c0cd3f852c9eb13e97ed195dff660bf36c40764d3f9169059884e384fdea25ec55e49226a02b693b9e2fc3c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "42126ac31e47ff7045f43277b80bfb49cd241fc1a00f652eef3f0c2bc2a5de05c4bea6906287bb72dde52f5ecf58726cb3ce8a42081916d3af06b3b621c88647"; + sha512 = "15d300f31ce324e89f7927e66e39c25a0437609817f321185b385ad4026eb2646f065f81a1cdd0ae1f7b120582603c83e8c2b845530a6d44871741a23f219261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "3f475233602a09976644ba68472538f85885c54979914dac838be7df912de4818a9afe170e82c8f980555f5da6889db6fc2efacd932eb850bbc4ed6b28a41e2f"; + sha512 = "7ee1708cea3282fb0de47147bc54d5738ec4420c3d8e41af445e138fe88b453572d6848de2edb7e48258bf3ac25e03fdcf22d768b220af6998e97fd16d4588d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e500aee682c57ebe120a312a127801511adcc54c7e19de33e8f80bea457175f6139a7e306cb1bc43d63f6d150fc4c98ed0709a62ffef885b3ff87a768e09cfdb"; + sha512 = "2dd63530379b00312b310ddf63f7796b6eec97edfe6638dcc82dbc2648c42e9e96932c73f16518687f922cb1d45212b82b04abd39b2e6e7aed54fa4924a5da34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "850d44141894ca1a5d98fe9e3391a4ce4f8fc3c0db3dff5c1b7eb7b75085add18c03da6984f433597102c77374133b2b4b48262d4ffa3abac8de6424feb6c3dd"; + sha512 = "a04e3c3202e12f7f53b11107e0db92282bb5d8fc6627f3bc8729c520481d9a3566d39c68c283a97959020fc62ce1095c5b19d8dd85577bd5b0b171f7b67abec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ee8bd8595897d43db06e8c3e3247c33910c4665111f1e2a0101af5eaebda726a44167fae82bae309d391de1901057b97901d1ee6162163bcb565c630b1d72974"; + sha512 = "87afb472bc3cf46a4af7d7bef7b063a09208927fce7060824575ddf7197e6f58810e5e36631402deed1cfd5d921323ba9326547a57792e0c8f4166c061214018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "be5d83bf8f06e55bd0a23a9e3338368cd4cb7f2126d88782d4916da3b866a72a6c0da213f3151ea09df4902000db55883aa12aee5e3f5e512507217cc01c5678"; + sha512 = "c963b697c4ecbde0432170a068143d03486156622294ab46e1426e3a3535031ce4c8e2b49d5a5b0de721cf1dde2abd60b6619fd4f8dfea90b12ce64ad4744ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "0291d7a79dd44ef0491043da2af90c8caf576ba8cae370d3c69f6c7fe866748ebcb68888da9cb5e144745a97e0b519d46fd2f57cbbcf19d3157ef5c3e2d4b3e7"; + sha512 = "f88736bd06a98e2a03550b7134ed4b6dfd06ea0506f83f0974d1c4b3226a3a37c1fbc5ffb085c5cb044dd282c594ec8899ddd3aa1ab153f9a5214432ffafdf4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "490ce118948632d6b64d8c4157da8ac3665239ae7db5ed4cf6e176b35812d8a73ae535b93bbc6f4243c4f8ad8f0108162b8bfc0ed89d8f74c85b51aab977897c"; + sha512 = "ae0368b758e8a19c96a4344a0519b2b5c645e6bb19a3babc0b0fce9c7b43df83a5586406144d08df049fa984ace65f86282bbd14307364d99139549e0873be4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "ee6b365694b32964e17c15d37a621732185af437750bf6b78297c298931f1fa7e3477fe944dc52da6a8d8f6c2a4ee13340a37a5efd43d6c7d1a7ac4ff7be9502"; + sha512 = "a003622d0b5b048087e80baaee0776ef0f41189bbab81441bd31f430947521149ef8671aeef02308049192d4184d2fa0dabea8c4b29eeff6abb005992278da7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f82a8e742f0605326cf4edacf5f3875d9de5aa8b77c67567b42898fd5b86575ca4e34fe11ad3274b53ee951a4fee4ba3a1050b075e105d675175b58169b1a02e"; + sha512 = "71a81507a18ee16d947441f76daaff9c35a7d1f509ec4699143a7018534524f5d0c64340541efebacdbc7a163955ae06a143a165ac178a5d26c1b87b2479d669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "16e9db59eb9ac08f14c5cf36496ed6425c210e5ab71bc290e72239b7ef6b38070e000d889e5747763e78bc6bcaeed4bce0c45bc0a3f60d5b27a87038ba311035"; + sha512 = "d9fbed6bd402b3d21eb2ba032c4776888629e68f9dca68421418e1d293e4eac154bc26b0d8297e814dca2cc754e69b33e307e9a896bfa8edc0f2da7a75a8cef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a6ddad3597feae0418e0bae57ecc507372da5a97b71048c2381272dc30e85109880cd56639f2089996cc5f652ca3b97f51c0d3022c1e16ecb3b143865db1d326"; + sha512 = "bb024088948f3be6d37418eaa0e987ddf4d9854e7d06513e1691c4944e1d8ad8fff1e65118e9f45557601a238f0adf07a1596e82293728f2b011d0f1784a8afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "9701cc05e02c4cd1f28f056c5b19ba19bf4ff459df7a8fd185864a4b0d5686280669d4eeba38b20570d01459e5e0080b2faa7118a18bc2da36f99a452f7f12f9"; + sha512 = "e3f21493b6dff7cea9564ee067445076b2a9967b752530a0f922a70794fd5dd120982833574240d0ef854734a397651eb77a8edd0715da6c8e1710c3515e40e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9d00704ac0b02ea27a06c0339b4937aaeb40cf50e3ec6390c3c56270cee589e480a7b7f014fd03d86db970cb70e67b762ad4b728ecfbdaebea1ea2fcb6a25bb9"; + sha512 = "9ad7444691a95c1b21fe149ab4468031a6886a42738f31d5aa81e2321c737d2c53a6d817523de2722394a47eeecf514d218d7e41158f42a80b9bf2ac3515a0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "33b0201e80bcca259edf60618e582b1c0ae0be1527ec105a81d972201a6439c9b8eb39fbcf9498adccfe79193dbcf98b7863c62bb0f230c0fe9912062522cf49"; + sha512 = "d3eade70bde9bae372fa275912f3c1970c10978ac9e83f84c018b02443d341c21441b100f723c6856a5b61b742285606c5049328838444e7813e7427e1a0feb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "b8de8b7f0aa9a399e8df81169567df5c3d4d20d40cb913749fe848bdd81e61eb5f0120b9836526c65ef58700120cac28fd43d2d8ea65d6ba28658bfc4b08a954"; + sha512 = "412a873708341e94fefcbb5fd72661559a83b4c897f5bea8a17051759afc0ba214dbb9732f65d5f4d9dfdff98498106a3cce73cb4c6314ec7f7bebafd8e63113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e10cbd32691c5797ecd2894b12d71568108c5ef48792ba8dc620b09b7f4819f6f5ab7ff41928861d7297bf2c72e1269b001afb8bf550ebef3f66a1c9caf7ef0a"; + sha512 = "59f0b8e533575841f768cd80390d8237c2db3fc2f2e99bd87011a8868fdc76ee8e5a87401c029f55c990fb0775fabc163ad4d9ad1531dfdb7bf9fbb9b601e08b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "45a04cf4dd3007cf8976d27be5b318a978e04100b4121a63e9d5feb11d3208fef85cfbff27d71e0f46b7f70bdaad26a9a588aa7c89adac61e8ff87e3db46df64"; + sha512 = "29cfb3bb6bffe5960968cae3096c63d92e50c514fcde9a26940e8304b688a869d6b03ce7479df514281fc609ea767c69fa66fc1f42e9b0f3cfe3be9ea0efad7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "77406b8edd59e48099675d3f2c9abe6f53259645f718d465aaa6f11ee12afc88a0577baa5f9e3f0efff54c025510d4ec4b4277f35401d8cd8fad212c1aa7c215"; + sha512 = "f7b425e76607833cf4ed8e4381da101667c94d2942fa06a9be94193da350d03e8bd0f1f6d500ed0c231bddc3db5e458e9e94bd8ff77580ceb321ffdbd8a5e320"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "0978497ed23eacc9e18bd348e115266d4cc2d16ec51255cce2d93f7faa4d335067961e59ff44a7dc3adbf36dc96aa1b8383127d617a82dfb22b374a92e2cadf7"; + sha512 = "4f4a07552616989448bf5eb12d0a0ddbfb12b10b8f876d8a08f86bf58f113436b364f99ec26a20fc29eeef1030eb81546e0db1e92a8c86f46f6db1e60e784698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6458a6352c72db89496426dfcd9fad79cffa357d129fd3fba80a13ca2c903d9846820f453e0f480758bacc1fe0d3254a2e8f29c94db00a139402c83869974602"; + sha512 = "5510e8a069b7444c20af0c95258e21d5d7e35baea46b83ed7fa3546af41e76299191fb8e14beb459c79a4a2aa5f195f6c99240f5f54a54291e2bd7256e8a9979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f60cd6e3fa1d51e4f02044bea5af0a48f6c5a37865fa96238712eca362ab3ee9d5900b421ff2c0b1da30ac221455196940f62a3393a28fcf2f756a6830562797"; + sha512 = "c3b140194ef9fefe85f2aff0cfb44c49ddbfa3bef89b9b53d4fd92eea4532753d19617a57809c7d5413833e8055547daa1296e4cdc8f6d2a1cc792adfff65a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "4ac19276ff52f8ec8bb939ee87cec2b462e8c9e056bf6b00b2099fba0fdeb23602ba3dba0a4b93e03acfed82e3d6e6e9846d8881efaea61361badd88ad119738"; + sha512 = "34e457813bdb5201b862dac75309ed6e0f4d7915111e9956517de12a809cf7cdf8f18238dea9e480434334d61f0e02cb1d3b7b63ee1e83f4854bc76507093838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a463e9edf4ebeedc1be086d43ce798e0556f852c3e8f10f8b935424fce6e9af3dc7912d4e4a5bf1f3e6d9855588cad9454035cd3b67f303713bdb203379d64ad"; + sha512 = "b65b6560c82225baed727e8831c549512d0d900f41c337a759d941b6d78462221649f6ccf2a3cbf889a838518c773cadc034d70cc34ae1253afe74af8e173220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7f55648abf6547e236551d7409e598702c00bd17a844c46ac53fca70c433983bdcca8728902f8f040e5a8ee456bd339c15daf99eb06e93fa6145e983205e8b77"; + sha512 = "c0966d7b799648a279dc1e53729bb1eb740eda31cbe008623e617085ebd2c6e76fcba68ad038b6b25e9f22032ca6075a66dd3fc068de7edcc9a297ced0353793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "41c3e4981e582c3c2ed24b3e463fad58d6e57d60d5336dad79c568f821d03f5f1183cd16e6886f136ee19d27cf0a2c3e066385f1f653a4de37c82ec9dabb77e9"; + sha512 = "d324a1a87dd4ce1d39691e1f5bce35b0576abdcff72786703f9a1c336706faae885b7cf3578fd5436d3a6c5e30aea2f80276cbde72c38bfc546fbfda60ba29e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "1bbbcfce541ebabebbde96b76b9ad20caf5d88f018b8d81be0eb6887d1ac45f278f71032c8e48901ea527bcbb5b97da2e0c30c4ee644cbce3e4f2b913ad623ab"; + sha512 = "7aea87a05327f9d322931c79f39635d4b395a648af26177cbf2b4bf261d2fce0c756668f0de5ea6d3bbeb1fd51f7d4673882573a5f67ebb4406434ab42dae86a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "6006e946d16d59e584f5bba96c0016ff0f82205b8581d5d43f8e1789a3b3f14a8104019c85847b4c9b13673b47b48dfe7ac572c12e08f7a7593b2ce404bdf75e"; + sha512 = "cb0a81af96aa96923a49ce75c5dd6ece2597c1c7741127b9727df9f403437e41da674958dc3680d60ff599bdcfe7320d3c18fabb7cf28ea1db27a321e25506b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3391a9dcd336b26d069c609f1806d0ea98bd9bd85688c006a5ff271a494d33d3d5f969122c12f845348bbe6065ceef5a67516816f307ab7409ee68a282d4fded"; + sha512 = "546a0f63b7221de9bbba1d055d9d27a220d61527957b236031a062a092d73a55dbc8699154c6cae7d24cdee4715080fc99c4d15d592a7dd6af8a1f05811199d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "5026484442691f9d5b2c7c22759b8ce43cbcf19b5ce91644341fa18039f851d812fdeae64eb71fa27e016237aab33e3fd0ca6621c723e0c56b9156165d5d88dc"; + sha512 = "8ad727a32508f339880f10cfb059c7f3efdd2a195490586d59566e622f99d58a9f0e72d2975453e795a51c6087b0e400c7deac34fcd250510eb85094df08128d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "64726b0dfd6ef6f2823249d794a1f7fa8bb31dbf54e120f13aeaa7aaf9ac56860b388e2cb6c1f51f33d4dade9d703ca323493570a98cde38adb4ff7d5ce76f8a"; + sha512 = "21d1b28d39098f9580f8573a85e50c2ad9aceee4c9183dd4a6c9ec673cdfb1411c743c44a26737a662fcf9b4acd9193ffba69016a8ad1ad8a2e85eb1723aa55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "08b0c2fa6fcf3caf7174bad1268e1ae8c3ab3273f4d6780c6aafba7ef68b7cf0535010aaa2af2af17b91ab48f979af2d37a57e980c4c6fd0b3bab04b020d8cf1"; + sha512 = "71bc02ba091f38f0cbeb76c14e0009152a37a6f0adbac5886918fd2b6e75d04f3be3fcfb85230cc88664199422c15041d44991d476b8d5e827e502b145751fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f7fa6326c1c10de051727d4c83eac04c633f730a08dbdbad3de228d30b0f57a0b158891c910348083279807bc9ae7eeb43ce0a317fce338c1c84553a3498002f"; + sha512 = "dde038391cacfa4acdb25b3c703cc16a98c1a6115f82907d5dc40dc9512c904772f73e8f27651ea0dccdaf703bbe1dc4fa8f8249937933ae7ddbb51d0787d9cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "1f020762f8b8cdbf35b316ab041f16243d6df19ea84457b68b6a969e5ae504dc58886adb2d28267cbb6b09cf3664db4a8b0d475ab6b0cd382deff5f15e627f96"; + sha512 = "5879b59629f09cc265a1ab6a477899538f1ddaafefe6357fbe655698096d084df9e0f0cb7c7b4387e3ba14d3997cb36744c7e9f92e8967a44124df59cf1d00d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "3859b99a6ad2a14c176d19db4ccd3ca2ec36e57a92661af12636b111f6cb39c64c871066bf5334df90884ef103ff6be5d982e1603dca8feb98bc0ba53b02f9b2"; + sha512 = "fe41667306010fd00ad3611b4c426373617c5eb64345ca3b08d86f0a28fa2055f61c1ce3320fc5b26223b851eef19168a2f43ed2e4e00167ab937d1a1f3133fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c168e337f050b09fb8006b550781a6da6cce79a3fdcb21a51c6d584b45569e872480d6a950e56442e755c9fb5fa7b8a8760525977ad13fe4372f67738e48484f"; + sha512 = "5520a9cbabd270113dedda63162a21af2d284e0df6a9eb9b5b9a55d11989eb1ab72e6b0cde32245716de15e7d89ff54f26ea67b56871c4ab94de690a015c80c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b59318bb6ed70da73f6803319bc606ada26a371c22e561f6460d2968da013bcd976602dc5b30e6b44af8225a44cfb62a121d5c215cf693196e7ccc5b23548b84"; + sha512 = "e9f33a0476c90be99f3e66da6f4c244496a5b20a45dd81b8294446cab71e423e8a6a77442b2af268b87b62b329525690200b54996856039cdd857e5ba4e07f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "35191d28de35f4e37ae8184ecb3c16f2ecf10cd8dc451f8f79471d480c3cc885c48abfe5723cc367625ab9fce570b79ef5898457c98198b1ca34905cf195c7a3"; + sha512 = "e021722d534ab811c632fd472ac1b3cc24a49865fc625476db9e142b8210dad7d9eca87aac1537b1447f38f2264b7f61ac7a780edca4929637f78587378fb66c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "4db053b433dd7adbcfa5794b276c7c107d0601bccc8c85cebca4796b18d0c8001ad1ba413c4c1f755e281c1ea16eacbf722f04e4d600ec77bb9ee13bc5fa12d8"; + sha512 = "c7e8e77b2a71e57d8114ea0f4aa3f9653bf5fa695091211534ec1eae3185b68c557550e8cf7a506b361310b95274e4a5f21073957af25ea4d19c8fee33b07c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0c32453132f2a220d47337c55ab41211f6b3af64f9c365f7cabb4386399fc877f670193f72157cfb7b9d6cc8410346d33af3546609c00530fafba0c7fc07e480"; + sha512 = "c82b411a66b0385ec8e9708ecb9e68a3c6cccb4088d299727b639adcdc41edb740b79721025c6ff17b8e3b3f9783ad7405ffe1da3c3e844f82e640ccf076dae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "796d5f0459f2cb67e5fd7e763a0b30009097aaf6bc6767c21fd32bb18ec45fbdbe600384dfcf296a6c29bf8347d2e922165a1e3e9853ef59ecfcbf56715d122e"; + sha512 = "a45966d7dd15c325588705d209409730ec21f828c5dd690e705a8540b58f278f4ec67d3ea17c4fa0c94f2de9765de7fff71c2fa2d3dac851f01bc5df856f6c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "189620d864ffd79b78942ddc177d9749285cfb9f3c289a1b3c8fdf7cceeef9d3695ef586bc07845476304bebfa8af285bdcb0d150e7d1e5661d2fd4bde46db5d"; + sha512 = "bd205990181115edb1b9134c5a7ddc7725699ade854737b8d27018b80c4d6d5d0774ae92e6d64c5bb160f85bbe8a3cff7033893dbb698adcd4bca0a189b6dd20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d17696909f8d3c3016c270d1dbd2c537acbba8846105ec88c46f337cb97ac05372a1acb4ec0120bf9fee35b5e3f72b65235b6f062120d63e61ff20c37e09dde1"; + sha512 = "0cf7a3617c4cc9e8fe6753b1a6eb2199b3ddc8739efac499c45f41b79f319c4cedbf8c9e522c13150a7afd622c569c66057f934ff03176ca33cd35cf51a792c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "dd0f67d9b205490f1205a6d33eea76c18bea40372f08ad84bf6e8ab4ab9e1abd71ef2ff729d692bed8204ed374c13f191e04f8140acacdc373eb897122ac93e1"; + sha512 = "a65f9f11ad6dbd82b64576a1dae5b76d30a353478932b5f8afd046764f9fb438c10d631935ede3743155ecc05612247766a1b3b603e3a9206538e68e015b6eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9da4f47e384a45b976de48967bafdad35b2ba418e2d6e260ba3c6859be2d0b67251099093071f4c0c93b61d877ac1316cbf6a217926c77cc35841ec7a4b9a160"; + sha512 = "3385e2cbee86b9fbb44a1cf719a3fc6dcfebcb67f8adc884bf207e887651befa00f55aad6c74e009bbd4b1e07fcf39bd299abd3ff9d1c9f44f9ab33a1f4bd129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5698c5c4f0db7d7b9725bada6951519a87a960aec8424e4c725826fdb7316a0b69c891ca32ce7d53d43a2839f7e523a573bed85892428047c41c4e122e168dda"; + sha512 = "0c3a323e1e72cc8fcfa153def5ce4b2fb90d69e16ca4e4b6472561b72d7cfddc28e8ee3f90f5b9909837330f6521cee5b1ee86329ff0db245c0ba94cbc87da9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "beb075342de69736b207ac5a7e804575843f700b5bd4166885391cc667616ebc11aac255b1a1d897d607f673d0dd4cc0c7cde0b5c3dfb5a3e492373c63a06d70"; + sha512 = "18e7e4fabb8a42491bf083863b2979ddab9a3a914ae476b2cbb8a290179d3685164543e637bfdf905655c482634b1914903253d7ac120bb18d122d0e60ae1f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ca5632727eb2f99fe4cb08e151ce270330652ee7ba267c3fddc7ab4213b2b210f3cd4077e528026dde4bcc7e40cfdbcae16bbeb9448942736691c16f37ad302f"; + sha512 = "2f7a98b86c52b35ec5cac1b866b844474020eb0076cb5a2fab4abf6bd12ab3882a54b7b324ee3491ea173c206655aec3f854a9f0a29d934405359c56a34bc9b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "548f91230ab8d36e60289b6b22a985f1a9d5af286330734add837a1d75e021713316975cb09afd2157133cf702dd32e9e8b4f1fc07e2d92fb64961ea8583b453"; + sha512 = "18b8472b4af585b65995b3d25e6fe290d5758a06b1cc1dfea4ed3a6512a8c250c2d3e0157a274a35677183b2e4a89d1b0970d310e8dc319ec8aa8f1c02a6b70b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "063c0746ba10471a6014413a374768ccad89eddee8d2abf5cf3680fcecaf396676fc9629095d6629fede3e13bf72b7e7a096814771986b2c73ca0084cb767970"; + sha512 = "f62dd81c30ae0201d1f7f98804c10e8e431bf19ea3249b4a4edc71ad2103ecb63efdddd5153059837dcf4d70499bcef5b874aa69a15a391255af0d7c37a65b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "6a8e52f2f318ee0d4518dbddc7ef8c80bb4fd2e0f7b5a962571f5f7bda24bd81c04c712b4a0e121ba3084ded4d5320f0258618e5bae333869b8a1e13f6aa6fdc"; + sha512 = "955b9faf5f17f598c13d51d9845c4c520b5cc93c0c0433da189cfc43d177665f47f2894f77d2dcc195da7ebb16870200d49703e45eec6769624d6f4c52d85879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ffe5948bdad294311b5e57a417fd47e8c719cb1c918ffc3113a90c922610cad6d1c0ab26fb4c369a89f4968e4781a425fa2de895b39395f84cdc91727cb76ae3"; + sha512 = "6a400ceada231224f3e38d4583ab064fb6a2aaaa89b886f21eb51435ecca32c5cc0bf4c67041a3e04ff2006b1d12899679e0cd6e425e39b005ddb5ca80e4aaaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c57ea4d7168069797601ecc5f809dfb1af98a197f3a277caedcdcaab93f7e245e7020d8317a60ccd3e5696fa72f13b1a62c51f6eb78e608e943f05614f47d9f4"; + sha512 = "ef19a79b8ccf2c5418009abb06131a46b7205899a71b48baac0958062f73c54fe000ccee3984c42cc2fec2ceb2aff3644ee260754af5ff40317c375e22edd9c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "858b988345519cd645d8b812ab2dc13ad886aa6cd8cfec594369d890d162664871a4728119f257179aeb1b16eaf317db71863fb59120ca51c31d74dd535aaee4"; + sha512 = "590785f0a3cfca1f8f7518cd6cf93398d71f1bd01e5bb6add5c79e3acb7fe8322d37b77994ac33d4ca33e19a81dce016dd0dd479fc38a7ba611d7a4d8fc30955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8154d4883a05426d6ea6956d280d73f5bb9f4be10a95ae0909e74bfc0a82af418fd01d847be2afcf91866b2f26e616d40d5a90f7a483510b16ac611926ea1f24"; + sha512 = "77d6741dc35da55b92cd3eb5ebd3a32a96cde805e53314cdd64ac0ecca6a74bbb042af6cb778d344cfe01e88ef5005c067f964609404e55d4076f1427479d629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "10dcda386ec18b02d365ef3c0f6659dc18002d1620e7b1e8426d2f128aef983389fda0779b6bc46b47bbe500069ad7331d0180ad2d0d0e539da317a4581f397c"; + sha512 = "1aac86496779b9b6b570a7e7b0b4c8b443c4ac13e5dc548290d33dfc64ad940d6058afb7cf062d8e89baabbba5d55f285d1724322006c15476005cb0a04c163e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "13ee97b06dac091a7c162353117cb9c4e6761229b015b61c61ea253f6ebf39049cfcabaf297519da4819de478707d79d679578965e4d8c123bfa3d9ac4cac7a2"; + sha512 = "3ae95a9255c6dccc8551d59b5428345a672b9c39fc08dd6e5b509ddb64ae0af197e6f1823e1bee08a2393c54c17077529a474757aa0a4bb70de3d868ca934023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "ff97a465cd036b16960997e367ef1d6705599888e89988007afb17628ff8efd8c312e3cf10570e5796cfbef0576cdb3984ed0228f3601be40cf40433d7fb344c"; + sha512 = "41d5e3a61b7d8ede3c040720fd6be629f948a8fb55617a9cc6333c275c00304e990e6a0924d2eb4fc16544d855208cb2bbfa633ff829fdc37385b51492e49416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d6c4e54b0f65b26651cdf1cffdce5945d2b9ab47e1344f18a57ddeadd472287f8bfe3db150ba17ae342fc6ff2cfe70d6f067b9ce69875f20adc86bfae1c82e39"; + sha512 = "bc409d8cb772d57ac8729ec61d5fb71b7df32d20ec9836cb1c2870bda85ac8f1d6263f607ab0be0e2818795969bdd4fe41b48c9fac5827b363868505867dcf87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8f0c4ee9a619114cc244872940a6224c29bf1121369ca448ef828e5295def03d483a0e36264cd4c174148a182e60ea561e73761f07172d5c99952f39392988ac"; + sha512 = "4c2c6342a08da3991c4b6a436cc638be0f600b34e7fe02d75fbb6c10d297e693d2aee44624e6ef8543164f36b11a466f4f7c7bec709682aeb870e591523d72b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a963c1f43ee578f078ada5d7a4bbdf104f3de01d910171e44be284ba7c2acb88e101a3f154e344800d38feb2571ec8694dc1c19427e167ffa0fa71656579bb72"; + sha512 = "6708d0ad517b3551302f0b3533b8e365a8c27489b781f375fb469e45b8e9c84df11e0ff4299154ff7e3132e233b5b64f9e41432f61a399ade7ee0409fb1c5654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8621b33463145af2390fc4dd08443576070a008ec3119e9a28761ab46cbcdec537ea773f6d0004c5ec6ebd9a823d4ad3f358bddcabbf153b62a0e2c5046495f2"; + sha512 = "cfcb6141b3bc780f2bd27f9226f5b0f82d86ef9f22a15066ce57f8f156727f437b67b3f165c2b450fbf0c0492a2c9d246f2fcef417a511164ca29a4a7fbef6ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b1e6b26af9101b3f6b6de836fbb618b75f58dd18137c1899847e0b0e59795c94f24f35515e24ef77be25825a3ed1921fe78d230989c71f59a21eaaffaad7d23b"; + sha512 = "2df73ada8ee40a4a6f01143c4dcef7fc5b5efd486a20057e86c1036d68018651c2451e02c10ba127a110fcf8bf88f43928ed8b65958b1c7598b81973b79ef9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e56acfc28ea49ec19e93aa36cc470baf7188e9ee2817bee6e57fc37d99c953925123981da0455af7375b7d8d4a2273c9f63a91a03a454d29b96d2964fb5d7616"; + sha512 = "75f0025e6d7f6d63fd4e017ec68dab3de9cda824944d73319580861bc3be599d5ed6e4e81b7b4b4fb8bc8be7d530ccc52dfcfa920ca160682ea20e499a863b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "76c69116f962c4f41df1e4a0bc8015307f424ef86513f88c972c2d61b533bfa5bbb07e7a540c91bafba7313cc53b0c5002d9be0b2bbd483a4801a3874a7b4229"; + sha512 = "763bb5692bbb818688ce3ec8ea78a9734b4de8ee29ec9ca8516c33e406913907affe211cf7146428b176c230353f0468824bef69c4f5ccff69b75ef7c302a1b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bb500d84058a6451158f0cd4cc6c057eb3fdc1d65bd438112f5df8396425d7113ddb96e833ee9ccf5345fa2cb6f089a0a19f46ad264ba5e6d579b943329d5561"; + sha512 = "eb0eeb897688fc2f2c29ddf31b76e8e67a40e620f7892bcf2379f2d28dd033070fad749d58770709f73610dbfa512331bc090ef5f4a8c561b196485e30dd27da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "0e6e5424e797a1c5870fb64aaf5b7d84d26d9bd31d74894efd5c7e326c0582a4ce30e7610c463c313c6cfbfd36f3d518a60577862e56638fcfd0cfb8accf4629"; + sha512 = "6860fa25a9b2a1933784f0d4bf2cce6066049586a7968fcf3dcf1078f1964027fddd28c4c18842073befdfa34ef5b9a470d6ad06f014d86677e548e1b4b6de98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9d0b3a76660ae382564bc43268341225aa36d3241908fe727550529fea39066ed924ffd59193cac882d8aa0e306b2608a78d6d11d398e6ff81a9059158af3c84"; + sha512 = "b060723474d8075a3b0dcc32387983a4fd159f7399de7a4dc606a11dadacf2b6b8af059238045fda70597c1530ba6007b7a07e065ce153a5b992965d1889a964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "556436ce9648c7adf9470495ab8a2ccc33864e92c2e41f4a7af7c476b249035e4e55a43a888ae19e03e6b42fb931767dd1683f7c444a29aff79f931388fb7437"; + sha512 = "ddb772b303412b1275dbe563b991038fb5b860a7cafe3c79ca4a85070cfd1eec1394850c6478e3e2c89353c1d90e7d99ada1b2adeb35d5b55c7b190881c1a920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "cbbdc94b148fecee3b71bcd23af09354fa4dd453af01167adb8ced16b9499afced409dee7c1a23e02aeda9a452c1a3eb36510ba0b5bd8879cb2f7ed4aaa39bf7"; + sha512 = "91e4108240ee7e2573935c5db84ecc3a6d1ffce5f508f6a725e66d7d633c23f48d20797bb664a6e079e0ba6f4ad6a12abbf80a43cd51cfbc925a2b10e0ac0473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b21e8aa88ebf570aef2752a2b186347794df3677c4e3a1248b20b94a43e5eb2961545309f0b47b2445601256cb18f277caaa330c9ab12106fa5ab963c6c15226"; + sha512 = "e4ca27faf36e60fd8db2d338d6cd2bc57c27d0c446e7e434279c8c663235b69b16dc2a957ddd0f025ec71650647459152dcc289a72b90f8b94b9e50d69ef2989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "29edf3dcc7194e6fd0d5d27f354705cd25afc1fe53149964d8131844f1b1c3f0a477c0115a291d78a9d5a370e4918d39fd6fb6c5f5b3ef150bae6052b2acc382"; + sha512 = "bfac00d8b23fe24da516c22e2e200f68ac8057b09fb3d93969622d4c703d2a74e64f86d6a0d942c32eee4cd6fb50f1324035a6d9be9e6f8d98781eba28d582e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3460c285dbc67cac93b6ab4f477b25b56ab0ffbbad20c302d0901578c045e0f65dd65767de468b5f6b594e69837374405a1338bba7d67e0d8447c76f4b99a704"; + sha512 = "3548acbf07cd5012fb75f739f78d2b4c63f01253a06f094d0433f7b631f8e3ab33f887459afeae7f855193c5c9802ed96f862d41e937f517c6f84edead88a624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "85ef101a19505520b5f0c15c47ab3699b0dbdc65031ed12b000ccead70a0efccd489d8b0a7140d9d3cf93f906136e63cc51b62de160800b2dfd7dd25e035dba0"; + sha512 = "ff30ce6eae9d2e78aba595a5a8c3a6579243ec585f705f949402cbf930f7f375b2dbaa36df40e888151831d2a2feefcfd91eb698330df0c8ae67bf469e782ed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9de749c7e72264b48609d0485790048052394400ccc91dc0dbcddfecef2a6c81ab2035354aa15d3f0293339a086099e68d414f703a32b00a6c50a4f360c665fb"; + sha512 = "1d052d53ebae70c01c9aff7295d20323403a067275b59e6f66980718654a3858d55271d31fb0812a22a5dbd7cc8a1db8737aab1e696f4fcc99cd9bba42cbc812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d33b836d739967701a95776a7b19c1b0d6ca681ff3e471defbfa1a25c8bfad681dffde12f92d04ad2a47433a245326f0cbd0efa0654b45ae5ad6eec7efe5ba36"; + sha512 = "fe0c271d4af2236ce8d2b489eedbeebe185da434d0b4080bae2ecd222bf95b4b3828860c3186cb79434ee60ffd379399b15045c8231ddd56aa5c210b8c52c856"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5d8754131064ce271f708b30c658cb16c360b083deb62095a3a6639e547ae672cc3554300105fc6a1a947b71e732a612bd208bdb5a5a8da2d59da63c1e9be9c8"; + sha512 = "4ef2464fd35bb71ebe6d86d0e213e9e5d33a756ba139d38ccf903ae852dc025e5bc34727cf4a8c3a8a851634c975044b9c9f91ce64adec8cace79ae1d3e67093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e3dfd19dc6fbccaf4b300a44eafd8f9b10ba9838f8650569df5a397204c2374fd797b00b257a6b7e775ee2f9a5ec46ab37e1fdb0008ec35207b17fdb6f407223"; + sha512 = "da7d14a85785ec5ff6fc01bf6c18b7468aee74d5cae30f11515588ad403a3cd571890843f4a11beab08577eaf78ae3af6bfd757cdfa628c36aa95feaea6e5a5e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3a6dd626ac69..5b01daeef510 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -174,6 +174,8 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.gssSupport = true; + # update with: + # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 0ad35ee1c1f1..bf7e7cfe9d3f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "60.0b3"; + version = "60.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "59a2c232a7551d3f75843bd71f5d1cf804098dc7bf3048bdac03c51d7e7da32b52e10aae2499d28d0dbe6cbfc5b2fde87c0624142ffc4026aeb4e790f927e889"; + sha512 = "3cfc027c422936911f669825d03be090788fb94a33e0e67b2b7d58aed52b719eab4ff1a7e19ac368543a4b662766a41062971b9a5fb5588b76029fd8a78dcb1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "869b80d3f535c5e63ecc3c91150b5739d5f4d27137e11f279b534645660c761ec95155702c852b5bd915d41381e8f8c11f8631902bd0cc13f310b30d31aefda3"; + sha512 = "a8d96e9d9529b4c068371cda82219bb334d54e069b3e63caa6de4054cf917eea2aec9e8767d64999ce72323ced179477e07791ec8bb23d8231fe268f92c72042"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b5f850afa0491da07705ef4e3f48a1aa0a4678744a2a19e6c4f52041f91faa9249362f983b6b0dba030644ff67b065e25315b50d1429b9967211b4873d355a80"; + sha512 = "18b5d0188d6ddd22c2de16c02a3b3f8eeffc25cee1c1afcb2bc9f80c722bca7c15f9561c9215e65a5390b45989c235f5720cfdf01005d7ef7e1ab1119a7ee294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "843898c216e1c531151d2e123e1c7b822259915130ac198a7f115dcb11af079f27514fbb2796c00f6059d18d0d7b412ef7758c0a6b9b0e985b5272ef9662cf18"; + sha512 = "8f8c83b0f4f0031dad8d3fef2db67ed7ee19e794a7c20525dd91f5024cbc1b7d1b0c9c847173b2aa187050b8bbf68f537b7ef91ad7bdf557759a3ecb4ae7a98f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "f02f956b244ad48b94d0c45307d61b92a70d6cf2acd58789fb453287d0f53c47322dd538a0e1b17627a7e568728abb905a835c29c35add401bade4754d987dc0"; + sha512 = "866bc322de99f428e09ce5cafa26dadf77117ead452a527fcaa536da749e9eeda0a82f4d1c5e1aceb202fe931a79fc99d2512acc643a88638c5f37c48e19454f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ab7fd7a674a7292cbd9f79a72129a212c95c8960c2673de52a3b566efebbaaff316820a5f2613394592c4bbe249876197bf4dafd9e84c6cee35858521358a49b"; + sha512 = "e91d908997d5924be2f5f7e7afd30a1e5d16d2227ea066a3136a12976fca7fcc89989160a3249ba47145518b53c4285cc7a9d39440cf8953c1729179efc1c690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "c9b7e536ea19b74ad5774e95a2195718692a99c7e59a0fd482cba9d7c62250983d0cd7689771db24b86c909df5e52a009e7d97be76807ad21dc5ab838dcf923b"; + sha512 = "2dbb8d8df8177b4f4f7c69d321817b3ffb4f4430fd8e8250c2cc3678d758c01d9568873270b7aef2368145b6f5ffb0e358ed6c74864c9b883b6c04e11709fff5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "33d5175f1df479f85d582c8e95255dd42f004c5e53e5a11e31344db85eb1e49c7c83c2b348db840cfee44aedb17d52bdfeef63cb8f3e9a4530a33d34d05c0e5f"; + sha512 = "6728628f6b71a6d495b49dd32472a64ddb3c41e2d9e2923cd033a37f19d1149ba5d3594598209ff5b59f0aaf6b0c2fcfd4313fcf34c9ddf3d5b6bda034dcb6c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8d1f3c82a6543b8ae7ed19e5c6a34525899ca1219e2206ae2a6bf391fefa37447d611ef6896ea5210c1aa54e65edc23548dd76eb13f42b6939624409540729a7"; + sha512 = "1b71d585449f3da51da9c9934c9f5bf15b618bfd6a80e5054137c15c16b245eddcd50458cff69fb70ba2ac050b7fb6f316825bbb49e2ed640d63055a4b80f145"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f1b2f7dc2ca26c0637a3cbf9d649750e2c8c885a40b0767310ca7624d8947c6ba09e6be9529814524c876fb9fb60390f47ed88c131227a14e5af9369456aa363"; + sha512 = "a84a384debb371c3cd7b4c4a30cd66f69cccd658c089c10339c0fc7c0b0badbe8600f18451bec4352cde253ba7c4cc9566def047d7df9551214dfe88d0965ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5c6c8aade30d76f496cfafaf8c0882e72bc10c733486bcbc315ee5ad41565957f67c9b821b5b77424a67619211d5eb959c731beb28117c8b31ea18f9e4516342"; + sha512 = "b2f2c879b067d752c69a841c40b319db0d36a2805d441ee832246da199a0099cd359c0e925996c152d67e7d5f733ddcc776a393d86090c455f4c5cdfe79752da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc7f71477781a9e9cc50e41fd1507293f48892cb2001bd79360ec4ff65e96fca6f69d6d063c9c6e44c0e982717ecbe6a6af05f14485c13816e415b3104d93456"; + sha512 = "db7d9c6e991b3be123f80e62f5b1f9107ae537f3a298d65f910c71397183129a4527e324f75273605a5b945516ac5d2bcde05a3fa3de9748fb880bf0582d4e74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "645a7bb1a4b5adbd3d7d9e190fe8ac24cb81d311457f426f8592a8427a263a0b8ded1817b8026241b1f3bed8e2e526158c7f1339d4584c1302822bdf21ebe870"; + sha512 = "df4dbb35c37726af2d5fa1dbcabd8d926f171896b5dda453a07989cede18f58705617e67f9b0702623ee4cbfe570cb81fd5cd9b93a050d2b75e28843fa5a81ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "12c3d21eb2c7a121080a645a75966caf757e886222c292b4ead3a23278bf35d4242e1440ed5f7eaedf1cc4a7436b6ca2130fd2accb075714c71a1ec31b1dfd06"; + sha512 = "2386672d892863c4d1ad4a063270125703aeeb2f2afa8bc09cd6d813088c9c80f5837096207c8a662d28025f9c457903f036f79aca3fc3b7ba97660ae861f1b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8cb1dbe49d8bf0696b6291452a7e389da21dabfd1bca59667038b2fc9647b588ab1632c5d1a8101c1352807c57f42ee1f909c1e1c926321a8583300f99a0934c"; + sha512 = "6f6d1604cd1060a5efa633cb09ef8525369245ef753fa7894f17299d0df2b3bd62c7d2ac8cacb93cf93961dbbf9b240a43d47a0c73cbcc7ea09a2cea2b86755a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "06bc6712e27514529dc17379d8fba4537440f7cfa7e84d2b4201386a886030f3b4a098b6230577a36cfa9c9968ac8c1432100a0047f86c0aa32d8fc1971d0122"; + sha512 = "5b8dd67086cfa08fb76b066e2c10be109e0a4eddeb5e4579aa9366dff50642f5e56f6aec37f9aa21299fab0ae7005ae0e6ab4db05e079870e2f4620a4d96c54b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "123a40d291431478f8fbaa13eb2197f3dc885755a1478519ed599b84fbe086c377b6208226e0409f156fb4d90ca1beb25fd255583018ae605d2aa4c5bf84d258"; + sha512 = "31347a1cb6fa703ccbf444830fa88f8535a2717da85fee09f6a544ee8aba1aaea093f4ab1368f0dc4fd7b0dcc3570bbd60bf8855de06a8725d2ee1b345242bad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4b556676ad9fa3bedb4ae49685344cad23da8c47c68efe986d14166308b6de53cb2f0b696d89e55e9ec1a3e7d523016ee7b87f539d4d6b02facae2014e815858"; + sha512 = "20785e095d45c22ebab25f4a2fc224aa6e4a4b7c86db1e94a304c41598cba74ce1d1200effd78bd185e5bc90a11bb66f223e28c0cc65d6663229bb724ad1c791"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "eb53b6c9a000c4b7277d164c39f0d53928fc29527cf35a79c1ad1418f620efc00a16663ca0a59db3ee7a1d51ca9b6652777154827e916fc0346685080ea0bc8b"; + sha512 = "e070625687172f84d1d5d82ec2ef385291a60c2bf011a4a075892413ded629ac16b7688d2ccc698ace07cde309e782a1b7b16707bc42d2b47ef9394a0deb6872"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "152b9ed4b6674f1f9f83caf6b344d83c8651beec699fdac4a9cca4ee82012bd8c8096b3bd6319a87b8ba3295088d56a2aa8be965940114b2fbbf85e102c63620"; + sha512 = "38df16c7aa84fe2cfbff1e19e702b2c1ea4e2c5f1523cd3094144685fa1d5d561e00270881d0a113b14e926f540b25ceeb1562ecf4876cc35cd93fb794de448c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8c498c56a8266389fc43c80971bc379a1c79d6769d8560e2620320f9ca502c420bc5b671be09dd50f67afda11a45b6fc56c17373e562691527190bf8334224d1"; + sha512 = "e9846b81293eef5d593eb5175d9d73b7a42de7316c23251d94015da0554ec15981932fcbade6a5fcd726f6a89c6db461564f7ab9351342b9c4d8d915eb768219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "68a54a00c74b113f2f4c33c92d872c454da2c97e34c81c91e5807d2725415d81a6713b68459dd75a1602f908012d60883f9d483d23fd638dc0d43a75414319d6"; + sha512 = "53cc5276c35d94f263cdb4ee4a92dbbd356eeff382c2a69dba006f6b5a3ce022c528b4e6102374b97c618e70ef7ad692b1799f6ee3987b26378b742c18145cac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "1be7176d5a5708fca376f9146a8ca49debf0e4702365535685d2a3db68628892881b3be3ae3caee972f3839fd48528513131114c5044a31d6468c1e8606a9eeb"; + sha512 = "2b0e15a85f5d9a7fe6e8ac198c86d3746d880f96ec13f8e78d69d4618d86e73f76e64bc8dca214a73f2ed95a12ba674f57c697e54f0b869760129176dfae14fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "b9239303030197b776debb5726a25864e54795627f59bfe4c0f24913d56a04b5d4f4f69ae1fd8c56d105e8edb185e64bde96226e043078703c3b5805b507ac4e"; + sha512 = "c751b4ec0567c5fdcf3b8660ab7bf100366b9c819f78c957c79f217a0e7658d1a7c4bd141baced6e7ba36596a8c07c89b825ade20becf380249d90e0517e1096"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "4b603bdd4f1b484a87894f3252418753e2f52d6cf298cda6d18bcfaddfae5269ef69ebd0a7e9d85da8ab42ccc4065809ab34a0ee36632c4ee4cc65fe4169cb99"; + sha512 = "d556386436ad4c226f0986500de244a2efc5cf57ac8d792f328616deabb5884cbd3127d0530add7f7a9dc5c2ac61512456abecd6b1cb8c84c74b2d2bf18d9113"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e27a814f7408198c200165da2fe6cb40fe0b11626e15d92e8224c12acf1dd133e419bf8f98b09dde3bc505b77750950f568bff295919fd1b38112e879a6694a5"; + sha512 = "1fdfea27dd45fbec3727804c49c8db28e624e8240a8589d28621b4f03ca12d184395632db2f629032eebbcd6f0d0f514eb3944d60c2b54bef3c187e06b9add92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ef6d2814d1ff70e2799a8a0d5c6aae1f711819db6e816f2e153e84701e93a0a7debe19dd0975a4092d8c179f0ef5fa8f2c53b1d0d046110914634fd3bd2ef301"; + sha512 = "fc171dc5fad703344d0ec1a9d1800650d0469b1d4f10533e102031c776aaf14d5df7b9375a73583112b9bbd1d1e7df267873da0cb3e7937f5473b2d4652f19d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d41bb50097c60e239b539de8b9b08d21552d556e36606078ebe36a48de8e07dbb60b3e2940c0c531f7632efd2206cde2fcc6294a1f3a74a5bed7100c75658c0b"; + sha512 = "7d8f9c31417bb03d02278c5567eff23d07cc2d9de93a5874938db0108c8c0eca0c0e3f924eb8d9887b14d7c058bf4b4fbe1aee1925f0a150212e76e11a0b587c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "d3a2a4aa920c864bbd28dd8cdc091b25d6b8d386f73144d6236ffbe63a99e74af6f6420a82bde6b2f8e35ddeeed0cfc33a1e9aadd425d778878aff3b447aecce"; + sha512 = "95b43192a707943cda58d98fba2bbb96b745d6997932113c1807f12de7fe3fe165c9dff7c000dafdf21192b24eaa42c874f068e3cef6a2e7c6cabb8f0e1fcc32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f66cc73bfe130295e35c44cc2902c3f1ec7b271d673974e13e0d8be630f671ca548943f13c04a01f45cf5523b3e67147ed28a53794e714409cbe2078bdb0dd55"; + sha512 = "3e379c3389fe3a1a97dd3d6ad39abca49273e6e36bfcc9b5b6b2eda948529bf6e744fb9550b89edce2d9ea9145a2c7a0a5d9466f2975d4c2193696871b32ec58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f377f98e9d3b1774372add885bd45900e9d5a792d3b2c9c96f1ba4db0f7f03a7f693e400888c2d98a5fb67d4199f13f2262e0546f5e53491803872cca5e94ba4"; + sha512 = "a1b6197535661193818b0ece5d28112073fa03824aa4bf4de999b554acf751da7117b073c875c7b2265b05af0bbbba7307b59c0f4ea02258e7ed438bc6e0bfaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "ef1b293fc8569a23c2b60a47f65d672334a5ee8d20470460ea6a2972ae7e6be91ecfed3c3f2acdba614e7895060253444fdd805df00cb08a6a2abd4c0d98127d"; + sha512 = "28927abe6b2e33868c37473378b5915ca325ab26e87b6c83566cf9a6974eef28a1ff1a800c164d2d79d613ab1482c0e563597aba20de2179b8645e8dfc5b40d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "774ca258ad68a2a6a5c9943e7b9ffac96a54448217125fe61ff11a0ede25c96498f7153f3406c1322a1f83515147402a8b506aa81732f2617e73e388fdd0950f"; + sha512 = "07e3f102f8324d3b613c972651b80f83575129a3d23fddea3d02d3880bb66d3697c1d7c9cb47fb2b8dfb24acb4bf9029080675a5295d3ea1d2f7b31114ce4d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e29c6aadb5dbb9d456a11ff66d4b17296d6cb4417e4eda85a2666a79d6d2fca65b93cd7ceb385456e950730fa165462df164ffe17ac7696e359d96d08400257f"; + sha512 = "90bfbe9cd103b981413d57f74d416098ee1bb284e871bc40676fd8f8240a7fea891b4d68a079c1d23d2c62e6f84dbeddc884b4ba31e446dc59fcc4d1b3422469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "487f9e0a439c2738f1eb2c55fa89e56b7829b8c66dc893ecb23f3705d86e1f8bd5948c2ba0ccf3a7eabeda68385371a49dd74b92e3daa2cc7fe07b958134ee60"; + sha512 = "a71571118b26ffb823da9723a6c84a2f10c04c4f52b0a5aa9dc6832ca008071bca761adc71b67959fad643711f1ff859b7e1093b5df8a6f26fb03b01de8c234c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0e526712e2f203e1ec806216144abfcb9ef96c769f8f736298053a8ad33d6f9e3bc6e6f6b36c4aa93cd45ee8a6370a15e0da6aa312175e142b574db8f5e628ec"; + sha512 = "371d1292c4b9fb561bddfbda150eafe227f9c0c6525f5b9bc4ecb178c2768c2e837ae6f213cbf0dd4f64e16d51e56fbb0775d4df1b019587d5bb51428f21fe22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c21112fda5525ff7ded643407fe2be5c6b660449879a80dfd57b1f713c98679062cccc577a42573bc2bea9adecd660551c7f31c6962905cd51e6cb8eb14a22cd"; + sha512 = "2477da8f55c599acfd8091a420885f795841f55bb7a0b399c2dfa51db860d9ef03626cf62c6ed99c7c89d7549d1d0b5053c44580894d0c896169fc23dd2568e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ed6d0fc2a82ee3c0e14031d58bc2074dde5160492de7920220ac8e72ca995b553ca8c9899d9d8f256287a302bdfbffd65981d64d8c778fbe7e4f55365b6c317a"; + sha512 = "b9849c5d545c40bdcb7bae8d5e3447894a7637d59b1b413f7a42f9fbfe3509a45afb03b20bbee3ce1a625a08404f903a1b79bde183f51b043326d560794e501b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "345bac14c394a432fa4ace22a439eaf2d16e6e0dfb6dd97e356c2b623000d14675154e34e4537b0f5bcd1e90c1111a263e7ba52a1ef6e81f6c8d0109a6263690"; + sha512 = "f5c014f18422c09f96d63efbd1dd3cd5e880ee5f4c1cb6a2a0eaf939a755a952ace065237b74ed8c4e70508062f69ec545d24aa55b21416cbdc449e840e8bdb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "702f85952d51286576c729c84e2709b32ffa0a1dd03c2911c1b20de7510e1a006531389c2bdbcbc1fd99fd3568db5a4157daed9c65a4be04648872a8200a808a"; + sha512 = "e35e1d007c0f1371fa4e95ea6498a87949f9f0fde93dbc960f44ad14fb8f2d4587a08fd456bd6898ba864153344a2ac8093f45264d7305a5db88fc920a8e79db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8286e8fb299022028cf17466c199badcebb23a9aa743d4c64b2737d3112a5d964fd0b534bec6892aea9d67877dece66c25b1ddf15e08a745924e815064768891"; + sha512 = "cc8740fd82ca6cb4aff2a5bb2bcc02d6d3457cf7f10c619b087c94d278f79a80da26a7f5f5a995fd77915c95789e1d263feec9bf1b52a9e511835565861e0bdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "598d84026a03835044c8bb57e5f27ddd131a045c49c779a5813d06b789bb062ea2d4ed92f8d5fafeb1b2ed5dafcaa75e9c06f5c8354cbab80fba1d1db6ce61ca"; + sha512 = "7547c1099276b4683012cf286482f37af3d8e3c0afa6f95aff2e2030b7ef81c5accb4116ea178134c916f9ff09cf9aebee30c0a698c8f88cdac6f91af64ee66c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a410f8d101396f727920c4fbb91d1ec6885ea98317a1cbe7557d6ae7b40a9e428c6a6482cbfcf4857dd0b652cea8a6b3953fb76455234b2a6938cd55d9f9ccac"; + sha512 = "ff3db0fa7c76764d836b94b7a8e7028a2c3f39c6a3340e90cd1396564bcbf9540b9adb9b235206146c3fde2b8845968817e5eb34095aa5d27cf5ce7cff885504"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "40fe8d2dd6f232ecfb0f48cb93f837cbb9f731c07c11d6c51c44bd596b050be89aadc610dea9782d42fde6ac8779cf72eb6b459df11d6ee1dde8b9960ec13926"; + sha512 = "c13fde2cc3d39d87203239e442feeeb9caa7a0fa03fa1b98f7c49eddf79ed60b88fcd4ceaf5a3d70fd48b64270ee770bc03bf0bc4fbda15fa72090d0e0b3ce03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "319fe8680ff501e100ae9b3e5a818d6fc69c1dbfff8e11e6ed55d9e25628b7435da4632e5a6b92758a0f2215d79f49f2aa1c1f98029f146af30e1be36dbd47ea"; + sha512 = "e688ecdbcbdab4a821ca17aaae031874c454b8e78cda40ab8d2ac8258a71730c656c6ea5e8542fe3bba975f8203c63bbc82a45f47a4af4da606a446a5a9c0d75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a1826847c504931ab1554cfd4af989ab7046eefd9d1a28692a0b39bca390652d6e30d193076fbd59977460f5570b973bce1d0fec8c1ef6195ec70a836cbc5520"; + sha512 = "72d6977d4709f04b282301b6f1b803e924f1b1f1b6488b871206cb323457c9cfc01d0a683dc24b3cb16b26d160271d4f234e5f8308f01cb7c8183059e3036415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3e7b49261d343eca5fb0828d7a5b6d298222e31066a7395d948f34d597642f1580e93852c2824d40262d142e679dd2169a05626721ed7185b5d0ae31759d2b37"; + sha512 = "380bb6c5e7dba01547fc64e10e20234e571ea1aab0dff8ef8fba971a25038ea99694e235269321b38b346872314d64bc31529aae8623cd21c934dfdf82f2f87f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e9eb9c11cec68272ab8bb60f0f099c81e4de395736663f47a1221ea089ce651f844c16e3594b1ff39c8f60d3a6cb40a28b08e8df1ccb2d458f138607c3020aba"; + sha512 = "12cbea767896b7e20b0c717666b87d7de9f6f818c4f35920d5a0eaf847fc6fd29911d1e8f3cd8bced453e38493359f4e3e644d9c1d92e91285caf9e9b8e75cdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e94899aacd5cb5d893482e99997262f021a8c4670f5696999d78f657d7f6edf60c4f9373efef9c20bd552d7b55cf335e797a6d0c7a975f7223d40ff7c27ddd65"; + sha512 = "3be7d341d036d4899dccaa6a92fdf117a46a441b4eb481b65f8a94e32b15f5d98662a4bd5ac0c45985142027af811cfa0bed9ea1d7d1ec45439df5b9b6210be2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e118054c8a2673cc771d4b2a3f9e4db4195ad487adc51a9e747545271bea4abb241ad264e474b30a03f88056477d0a26a3efd145a67ae2b5f9eb771d04c946e9"; + sha512 = "67f9ae05aef3eb743559401bfe1abe662f748ac11f788fe1407b9d77f6fc2974e8e4ca9e107d2b9500e01283f07a06d35dcd7a1a7223c92e09aa38022e077b88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "fec6a82125d6c6d9c42dc36e18553570717233c5a23535feb8264a1f3c4fe766bb1d21def103aaebd92942d0d957810c3e3cd7dfae9c94432b306783855b182e"; + sha512 = "e529d48adce27340bafa07dfd7da2b6eef3559ba2caf2be59fc953028b48c3ead9974632ceaa1ae1a3c6983d2bd7a0b3beb094e8aa0cb5bb28a9e4166a8c50b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "376fd767808b561233b14d65fcb39668d66078e2ec7f77005167f505a7393cbfbfecb7a2b643353b4dcf0c06b736d86100ede42d235cdc1983b31648cb683530"; + sha512 = "35fbee4fe54f18627a647a610b178a5387428375ce743c8c91caf24ebcd37062183dd8d64b090925343e77530a0dd3a384ed5e4b2f8bccf9eba2815213721a46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "335007dbee3221ec42fa2dec5d7bfe4a9b4b614eb02d83ba6cc4c37abc6df1f9b5500ec65b326f06fb4225c65127bec8e3ab5d6824285c2e76e6ba5248d0a8ff"; + sha512 = "5298adaa040804ae5311da123475f746beb2890406c47d0a15d530ad1754f78fd695c0355b3709e7416537dc1965ea8d714feb12865d183788f0962104a169e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "dc587b11b62269e6fc1b02abc4eaf99ed1121f1089f5c42854fbe55abdba7ae44fad1893df6558313ce0c11377b47937bb3acd496106411291a9b91a51947ab8"; + sha512 = "0729b8a96b8cb56b2e57fe29355792b70ba253aa1bcc34e13aa6f8c1e63358c9b315c2193c3f72ed40f47544c14f2f05768a293270bd07a2b735af9bb000ab5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "290d192cc9a46b95494e68e1f36c57d6c790554f3d1f05a66e8737a0ee59e26dbf53381a17c17f85c81a674292a4b7708ab5e0cd9f9f4ed8d21eec3bcdab0039"; + sha512 = "4df76c0efd75cb75da4756add7a95dfba2a8a2834c90639687e4a963072e30d22dfeb4e9f5cfd4ea471bf97926844e561a2043423957baa1d60a64b9f1d152ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "9ff963c28b5a1452c9e08ae7cb5de82991c282c7e5a6621958ac4d797bd74647b9048dac9e34cfe9558cf16fb1bd84f55373cac7b1b336e2f65b4d9635aad3f1"; + sha512 = "7d44c52fd2b384a6212e3a5ad11ab1523d0689a61562b05fcbfd7578e47fa39368bc1fd605bc6f4a27a382f4a62bb5301a103a5cdee7e5f8353596e80edf3723"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4378e5c31835efc3a7215ca74d85408e583e00c8979d4a3e5026e506765b49448d009e8feb5f2a2ba27d7db734d0ce3c0a1679ef1fc330e1637cb764ae7c8578"; + sha512 = "953f22af390aeb1f13a10a47003f0f97051e83d3cd0a8f30fc9e3f7e99b82519da6ce0afdfae5f89e88b6bd017af858010aab624e1de8ab39ff9787b9d804dc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "da43aa7ba706d780420cda16d409425be026950a7c71c43327c8271fe6ff13cbcefb179cfdf3c1fe79cceae2d6cee6f9171697fb3bddec3b5589b8b1881d7a61"; + sha512 = "4cde6ff0a032c6c222e2f36e33398d6acf72b0e944d9d9b6c75c34893082fe3847ac87e837848b3866e55819fed1f41c0a1807ea2c2dcd264f793df9548a5ec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e31a35622a83383f00fc9defbd9d8e39e7819273d0698f802960adc094072427799254ac89f2a4de42070abb1efbc93b9298b4c076161a9478064aba44ca6b05"; + sha512 = "d6ffcad6fdfdaadef0b8225f30d9d0a80e7f918d6b2ff6468f4e460643034286cd561dd63391f79c3b32222d783c09842fe4979c6d94dfce4ebab41fcc6580be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "df75c385915e6316d8a4f9d04b4092889636e0de116fc2c33439047ab8340c3e17f87ef23dab3206197a2d807123f62efc61421770583e3f48268d67296cc39f"; + sha512 = "8814f08d6d26a05e7f003280a0272886a44fcf3b88da93d0088f0d2a9e517c34c264229ad8ccea8efdf15247631e3cd28f82b589afc4d2d3973127e1227c6c67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2ae471d5cd45b4c2c5af47df903eb550d2d68910c4086767238d8df05027e9221a3619f810c816d1079dc1e0012bbb7176b9a690d229c8dea6f7a088b5fe19d1"; + sha512 = "b80fdf0b0ac0f8decc7e4329a23f8ee1005aecc70f7d0d8a000eade3d406221ffff8015beb99c77403f903487ec71870dafa92003aca86f5b0cfdd8ee1f297eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "01c936ecd336a2b29efd4a63c9f168da42a920a140502c3d5f160fa34f14e62b58a934dc5f102091999768bc2c37077acca8094219462dee72a91ce113f44bec"; + sha512 = "63b69aae0a219ad993e557d7125cf91ccbe8a19310a17a09536d5c2a80e7f3292e3aace28342a4b8eb73042ac2ce5d728af5a745416b4b6401d29fae95c7f9ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "af11baccc3925a2c877e5833aa0ee24673dcad71faa4e25020da1a62ec7fc3106036c46780fb48012358f8198ba6b56b7143e772427327c110a14c78eebc5b83"; + sha512 = "18ddb3ff53baf7efd11ccb432d87dcb7a89260c080f29691785bd44999a43e8f9fed99b636b26bd21e557921b82ad9e69d729c498bfcb45077adcfedcc3208fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b84b2ce4420d4ad9e9e2417dd8435645c67a133a9594cb39df81c63e60e64c9cf33faa2b04b63e508696596185dbaf276b7e08dc27581f46afe10564ef31ff49"; + sha512 = "2164dc4beed74c24bd3015d9d294ff0361bd5912728fb64854ce5146188414d4e8402d4ba88ac20944e499e24be103853b4820433a99d6aa8e4e48bed5b3abcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3019e9b26b56a82b08046d3430556eda6ef22bfc576f704aba6a4ac9decc2f317c7a3fc0b1681346a7b9df7be335e899e123c50ab2b6ff6f743ef804a34c988f"; + sha512 = "476e3031b7a850cd52f2f20ec712b1fd0f4f55dc74ac10985c5957ab74b303b1eb4cb00ed1303a820ad4a6cea1729d282794e9b8f6b425280a05b413d86f8975"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "40af56ea7072beec4893bf9134e16bd5693081396e7cd135e2e51c6cdbf0a7e0dbe6a8a02119a822c71258920bd42ffed1d7f32c0a4cb5cb2c4f7b749e645184"; + sha512 = "25d07f7f5013a1bd7de9bf977a1b16d193446e0003000362073d26f982139ff8bf0d17990173e77b40a808f845fd590543b7ef1de5a41d3bacc9491438d4aa36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "7934f158163a28de2c4922f690c479d95764c36999d5df45afc56589d62c93aa3d0587535489acd0a2ded2c5ef9c084cac6938c20d08fda91e8fcc0b03c057cf"; + sha512 = "131dc61a6c8a07c593e304cb5c1c887794a597a3ed98ccee1188081da0002bb2ea29a946b12fce1ac7287c5df74864bd881e9f99c2c485b2fbf7684196489248"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d7c383bd900e3a2910d3ae599a582b5e6ad26cb6c93618a1c4c34cdcaded45873f995c65805b417da425525b912d6e883455641a844aac21a2471b457c7a608d"; + sha512 = "115698e54318f4107c565337c266109925310d79cfd2f1908fd5a6114128ffe827e8e81db630665907a942300664af2ece8cb6888be80f009d6fc2d8d065cdd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "48c076fbda7a15e7a36bde08a8036b6987f7450872129506adbd90ae554db50c4d543289dae5260f2358b63192f06e06bfd964a3796caf41a2cac393dbdcb9ea"; + sha512 = "b89572ed1e0620ec29a762e49394ebaebc98ec964a9d98e8896927eda35155403883e734880ffed51d13405641c569085824ec36356cb2c3e8d57090b5f0301a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "cbd6c317d82a2f19d266381bbaa9ec7d7db0cf9c665d9407c36188f95d4e45a1c97df15b62590be8dbf60347093bef95021c55f584897ade06c3c3cbd111e18e"; + sha512 = "4a62b79d27361b324269488d1dceb4405f469d8e9a5f4764cf46a2ca31561d759e3f63ba5c23b21b45a43e07181aabd06f01aa699b04b9d1b75f0ca338e161c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "96a88afcf2d3b20b88c3f1550b623dd844d6f6e9d86c4b55af5d857c11dc57b2000de3fa685743e465ce3b89288eb940a3ab8984847566eea27717c8d94385f3"; + sha512 = "d8407d6930a11e73e1338e13f980f7575df5233dccd633625175c21387c5c697c5ad3fca95db99d52b50248b257586145fac8d57ddcab8d4bb7dc97dd7dc6dbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f6b77caefeef02b017ee434b256349a0ad954eef10f506ed95d82dc56835c1fda70431617bde9601057928d6c03fd98642cb84a4be81a6c4cd0a0de418f893f9"; + sha512 = "1e963bf3f340dba469ae928d87fae73c112be3d8df0bd5b0667c5d7ba3a140d919b96bee2cb1a40a235bc1b80a174ba8a8615dc4ffcfad156fe87e1da2ab0fed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "746d3576912f8820fac11335efa1289011aed4681d2725d9f0d1c48001e06d01bdf704503bc5632061786e9360a00c85deabf905dd1a9e48c2fc8ecfbe32d6bd"; + sha512 = "60c29bd2eb3a4abb984d495ac7e1679a66e951022b975b57ce1f5c23db3f2c43363f22626842d0a2750b7275ddb711f7ff868ddb209d37f3d790460169c5ac29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1fd8b03e844fa4bd010fab41a36769bd3ebe2d09d0b4272d626964e175afb6564b8cc05f7c7c2daf4451edc468276f0d9b69e45d37106895efed75a8284ac288"; + sha512 = "de2c7b09e0973a6b2c86bda0f5fe2a5e29b4a18fdb53cd73301a135fef2212c0fc792c532dda5131cc9a1ee2b097e9a40d5ff4fa4e07f8b640422f9bd2e14490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d48b30585b56ffa8174008dcd8f6c5f82269ca60990bbf5fb327392b4cb56df086f1a87e8027f6e523c36905bb99d9f136450abac6354b13580ebe6d9d13bef1"; + sha512 = "2a999ee49e7152227bcc18fcb0c17047df73b27c6330eba701ce12c4283dcd7643d824310cde1bf7571da403e3d3e9db8c34ec04ece7a3e72aa55a8e21da483a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "2ce189f455c839ad1bd701b6faed3dc408a74b463b7282ee09ed01f002b1aa105f158aa25e8b6dd8f26c90801af300961ad025ba4bdd9d1d588ba15cb7fff897"; + sha512 = "c62b8aefcd8b5fe59d0e2e643a73b0f6e4c8e6334ba5c223d44e14bead88e81f3622b717afb5af24b7f3d668852572942d555e5a38a577c242534d4328269b68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "be2bda3d0b6017b777b078a0c85c51a77b8400132d65276c65721092f9c3602be0b9c136d630665e063cffcc081246118235181e89e41dff4edeb218fc03954c"; + sha512 = "c0738d209d9686dbd28e8219fbb40d497ee418450210613749355c57a64578b5591a78f38b78bd3dc2d838e65738ae91d6c69a13d9eeff5e2721be46e7ebd66f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "0895b75497a40fdcc28663d3dae23913873d01ddc5b0c34192634b0704c7d81512a43306ef8ca25190f7b590cba8d753c59afed151a5761ff18ffca45b6623b8"; + sha512 = "925db7b71d25a8e1c5485c92a4c0ba420d541a5c8c919bfd55a7a40357e83ee9728488bfc38eab789ff205513110f6c8f5894ec02d9fc5f47f9ae829a34a71d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dad44023860cd62bb141467ba6eee2624a5184c2a26cd42e3564055548bc074db34ca4aa4f6ed27df02ebd560deecf814e640174101043b1a65f2390b73ff0eb"; + sha512 = "c718cee842c5bd456282b1daa7b697a7a1bd5eb63108a5ff63dc4dc8f4ce67fcf0b433e65b6128877636f8a2bcfb469d7340052a9347d3b43ab5d87c03b82b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7e4a048f64646202b34b19731dd0923f41981b2f1384a7fd2fadda603159d724ba02e1a07d9718a8264a3975c9d778b7ea0c9ad89a8a57032b685489c2bb2b56"; + sha512 = "fb650b4ad152cf230c23a4c849671e2fc96982d01785261ac643375e51eda259a9ac725d668b6d7fb50d3db14e7a2dc26babe208774a37444ee25eedaeb8b414"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f52bb0f7241450beb5b4321554d8d974978ee86913af213246275a44fd2470fe8aa02b1e20cae770298da7381285bf263e3cecce7a59b3b5c4fdec59a03b752e"; + sha512 = "f2fb270f51fe996b829e1d49bfed793ab6ef61bccedcc6f3cedf02b2a50aa214e2942c9f90676f3339de8aac977b561879376513c0815e1157c510ecad29f2d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "47b8df4d387f1155944b575cd99a5e3dffdfa241f230c9e76cdfffe0c37390713fa0c64b87f42740c87efbe52fde49f36680f549d953a2977f9db2fef0769980"; + sha512 = "533bcb8ce4d54fec85f0c74e04c6ab6635ccdc462bbd80771919700220e2fa48a12e1d5afa684a2cf4d00bd892fb3ccf219dd288926a16c13eb79dd64b9c7bcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "bec6e7592df7cdf1d44b4440a54ce3e7b968dfeccb055952efad14fbc0c40c098cd99b41448fe4d6257cb2f292be0bcc2e3345b851686ce15b5fd1e4be3e1396"; + sha512 = "d0e3d28147a6ef4e33b25790c9c205016d7495c0342221dbe3e3c56cc7de34c8fb4f319fcc8ca39fe14365c2ebc44bef4571e42b9254b6f093ec3eaf4e28b3aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "a26868c2dc5b489a6b6c4085d61d4ac194450f0a987751da1d43fcac4f0a77f4f2feb158730f129d630fc2d3ad09ac2dc7c21a98cfcd7ebfde4f7c1006cbc9cf"; + sha512 = "a883303cf4805a251344be37563ceb16197fe41c5120f549449e507383b0737bf8a7ffab58cce6c13e57432e4c452a8cea8abfe4e776cf962436621f16ab1692"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "003c7056023bf71f3bdff0da37f8ae66cb8735598ad6ffe71758cab1dc51f9fbd6abbb82f94b2d783d5298354778690e118977b324f96b7ef4b77870226f6e6e"; + sha512 = "9b2cefd313e9bed5d21dd937c6427313cb186f268449521af18bb48077f241f2c7fcc2a62145287dbcc9ad3e6532beb46a58fe3a05c195ece2eb5c2b9be9a76c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "1ed62850e036d808e121164a5ccdab32f2c8a25b14b06e6a57a869cb35912a9c64ab61a56820db913612317a3bc0ddc93e2d6a8b1e0b43278aca361742f16406"; + sha512 = "6da0c24c43ae42e1ee778ce6f190b3159824d16b9072f72af13b9a33e43bc08551b66e7f0f6f101c2845bbd8bc0b88603390205888b640a01c36a61925eddf35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2cd3d32932c1243bdf58f1ed138b23f9e954a393f43539e9c01fe4348eb67efc1879d803d1e566dda3317b87c1ed9647c542c45b6c31c9c795fe696cbbc22292"; + sha512 = "17ec7de363cd11814d4de5df4c88350bca1a30033f98fdcd415c408f40b34aed5c0c10cfea0d94e1a31f0325878319b7b8cfdeb787bde0e65320f4d914c7a3dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b3e81e97920ca93902e7478ca749f9138b2d8974cb7e7d2496ad29ee82c40cd1d7c2230861d02689ab4ade9525823e52c7c736457cf1c3279dd1ee6ff3876f14"; + sha512 = "821564902471cc3b36bc14a9f168262dee1b4e527445f93f8f8c39b7db2af71c80eb4637da2471247983c600c50ba44f6581d6fdf792ef5774fdb08bbe357aa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "39779c6af211b751095ffc93c8ddf6402d545ae139ee6f5a492ed8c3b765cdf9ee626045cf189dc908f4599bb3054cbc26e70e24fd66fdc7d44b3e8631f93e7a"; + sha512 = "0757f19aab0c1b9fdc9d80e82fa5eedeb43e7302903add9b4c7f68e030de42527237d2f5d1b1b0fc7d88c3de670aef25c3014546e01783b65cc6b25fa8a75217"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "049c3602b06b9fc825e91ab51a7a8e1e8119e88cad178fbe137cbdbc0ca6bace8a3192970172e757bd10e608a030b5f5dda78564fb2269f2468661d95dc8daa1"; + sha512 = "811815fc732896e6e90a860647152c1c9196ad7280cf7274b8d224aa5ffff6ccee1c10c127d6750c4bf5b8ccef5659eebf43241db32b516ed1f95e3d2af99a52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7c4bbdc7edf0d7ab81f3ba959e7ccf9d9df5e6f2f5068e23bd4dd9326aef3124bc95c2f70374853a2ea3816a6d94d6c30db44d81e2647ae5bab8a84bd24e9474"; + sha512 = "bc07e863014d7be3a783a90b4373794ce491b57fc47ceb55382c816cd47c8b19e9b71d209217ff4af79e0b333953c4b791025e3760c7a04d7f8d2c672d9e36f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "67aff8c6cd90d9da7a3ccc84e17f064e57167c7fb253f919a1a64403e6f8e67c6ca1a578a9266f9ecb5b70c6cee22f413df935dd34d2ec349f364a69d843d9b2"; + sha512 = "1d48c99480c0db287b4ac3b7f183a6b708b61b1ebeb542aac37133bcb3dce61aaa2ab38b4fcf08130ca068c79494f6e1896ed3f0d26d88ee364f5c48842d8ddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "7c2248656469859d2dbf880c94b4bafc62e62a8c84cee589b5837300074ac6cdf95798f4b9d810178abcdb1005d47df6681ed3a414b0b3ba0a3ce90c9ddc53fe"; + sha512 = "ae2c95bcd342bf2362266e460cc6303653771926789cf3ae689bbef6bb4d59c24baa3537329315ecf91d7a483f1f97a961049c2e866112978602096470cd28d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f2e22d21d78cc09fe834b2e3ecfe33a648340ccf26c76bda307a1842e87d9fbee91fa86a6dab763a477602559fd777078e507445542099885b9aa9859fe56d8d"; + sha512 = "6c349ead6a53f417bb693dce2fc06664796a1781ec78a38e4b2df72505808cc63fdb5629a9264c9bc93c3a8f61be6a832b42a0a1ae56c38e064c61d105ecc09e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e8d45d60913daba14bfd527a6e59fe3b2c028c47425f89928a4933443e3ec608ae744db50326814cbe716a35e632cbaef8573ec523d41fa63cc1133d12227b96"; + sha512 = "df4a98d33d15d1e4cd8fef2f5ef80c8db43a47c7715c4f5ef8c3a8e3afa7515193557c5a779dbd93b905ede42563d6c266506dc881bae5b534dd2f5d091f593f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c2a32a8dda48dd2e4e01ee23231788188050550c44812460084eb7dd09d042e3af0ae11aa6bacb671046be1effab018fa0a4d601e583910c4d8c5e269963e763"; + sha512 = "853dd4a017b7f53b32c08a3984ab3e0584ea461e3fccf18fafaa461ca07fa40450d248c9b5df38800c8978d2d74b024861ab11e385b6edd99fe6637c2af6fe1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "45e996b79bbc96515b8d2e767a92f25d5814fd035185e34ab1b32d1f319b908663f6334a1d95a0f34550b9416d283d152feecb47f4ee50b40560cde226dbeb3f"; + sha512 = "76f72bb1563001978c39de8b44a01167d1c8a4bbef7d6fa34f2f904ca039ccb00534e4856413fceb0e49d2afaba06d40ba7b92c8c2cf9cdf55412755dfd8382a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ced9591c578ea8b335b01bf3aee458ae9254e1c744f699789fa54eeea2d8918dba4431ac65369f86e114f2be597395bb34e466fdf5fd291b688a00d99745a41c"; + sha512 = "df08afbc8bfa7d82d9ea2e5e212494198270cf9f401aeab34d31cd36df8311f92d8cba0cdf46d6f82afec42897a3ddbee0d949d73a17ae962efcee72be728d3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b560c780dbd0776f4833b037f81028ec349681682b6e575229e7149331026356411bc13ee743c0037fd38c15bf86da39756528c432cbdb036487e91ba9eb714a"; + sha512 = "9dcefe6cd21b403bf51a54addcbc4776db92aa1e722f592ed5bc2cb39a52a1255c88134500ae0905193dadec89147ff7bf95499180678177e29fc872bb71e5cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "f967733b7fc05009d65387e7bb185f64ad33e8adb659475f4f995f4df686ca47145ee841390834c162c604b27185ecaa225c9ccbb011dfd007355f495403d892"; + sha512 = "ec5a3058b71d81c2e30804942d8d39ecb2ed4f8cf801c0464993b4521ad5992dc9c6bc2aaa63b646f7202a19a4243e37f32e1af095827a63d7ec044e9c47754d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "06f27ac999ade5ccbe214052590aead3c7fb07e93348b10632c044c0efa4bffc1524e72c2e96c4d2ab1adcc112900f15f36f1cfd943b52718be6c78ee718c1a3"; + sha512 = "814de6c9e194b42d2d4b6f5f1c0b88d5bba4f64f92a4819f8fead0c3806c52a3b9d8bcafb11c02abaab6a37253fa27efefba5133587e60ec25b76c94a004fa35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "13a99f40d7062438671c1f1700be98b88b2a612aa88ff546e9c20031e5e3c8d2ed78b801468c63312d82cf91bcafefe48995c57bb2a90c113282b843e0c5c93c"; + sha512 = "ba5afe64785c45fcbc7577e519bd996dbc324cf1da87f0e3044db968f9e67d16cf2958346ece84b57bf34775b05f27cecdb6043bd09bbd594dbbc277624787ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "15427ab80ea609ef48113ae08ffc3e7f43fa375c84d6028b361a38a128a14ace80a974058d1b748f31c308ecdbf08ca9bc3e509db7a1e10ba60421247af26932"; + sha512 = "fdf9cefa473363a7bd7027b05f412a260aa69742743cd121900f1bc5f2ca45c45011d068a6db01b6c5849d53719beefa4da659aadf7116e9c2b17ea251188586"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "91a31afcf25deb27bb9ea29c1a859c2b6057f3421ba5cbb971e35b79e76856b5ff76486dc449485fccac13258f004d967886caba10c8531ceaa9b9f867cd0c1d"; + sha512 = "f6236d368e813b3aa88847cea48510be3c2be2fb7ff054eff0c1458205db70f645d83f6ef20285f774686ade01f58751cb082fdb2dd632511089ef2c63209253"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "527f8f14114648dee8079a066bf5baf07d977ace0f6e7d514f0a494aacc7cb91fa0456f45e43ae167537af5f038ed72e44b5b985fc3ddc01a7f61871074033cc"; + sha512 = "74658505a2462cfd26032a837db50bcdd092a927f8f8427bfa3182301f25a15da346091d73689ffcb0c0e7c59b154da343b7be917e1ef4e1761948bbfe1bcc7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "791e69665bbe33ce84be02caf6f3b304a2012affe6508426cc4daf944c6616e613062265341a3e78b75a88c4a9d70ea5cdfd829d082189564a8905eb6007e86d"; + sha512 = "c168ac1509e7fcd3715b8f1eea47c64999028256b442f11ebfacb7809d61553f251fb1e3fb80bbe4050c7fd0371e6f1a417b7fcb3eeefdd0b2e30e547da3b8a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8121500520000276549b13b1179e817a7adccedfefce8727ad3cd45f3257dc404d5a72208b8393fca56ba2d00d3bd19e569ace9b14abc09faf971211c4ce586a"; + sha512 = "a2440702f8382ff965b17641e9d9dbc6cfb4d536427f92f51a3b8df63ae61ec869760d6eaa38202a7f19acc0ebd6895f1c57a27a5ece8bd1f6a29781d5a298da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f72b870b007c5b25344f384bebb58a4034895d5d7a3f662a8262660f6d8bd4238bf6bbb9620264895fac6991c7d004375c83d37f5595104eda48c4f2df32924a"; + sha512 = "c1aa573de2ed71b85392bff6b8c9279633a142ce51bc26e690c02ed059f6f7db47cdde3fecff902617d27fecca1824b8ebad1b10a7889b918de2056991921c76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "912cce6d5407107b0c99f44229746207ac901c4a533f887e41214ff46aa41f3618c7acbfb38368c67846bf6be80b9714ffb4dd27d1251e19e538abeb21861956"; + sha512 = "a728779adf7644f3fe8363080d93a8180ef2ba09fb78f0d05989fa57585f77897757c5b587a318886eb54d805ee8de625c7cbee44908badc14b47dfbe2dd2885"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fd344d214b13dcf70f32438ddf2d4ccc9edd58112ff4cea199300f2d59ebcd6ca3a556f88c5dde4bba9af27cb570c985136fd2aba47ef6d9b8b2455a09a44c08"; + sha512 = "5bf79cb726263b8aab120c6b826a09524594bfd8ab7c6464937d23f02e866e353cf8ce71adc8dcb621d6df71e4e7d9dc8d60eeba4023cc3d7c8358eae2058d40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "efb5d9f802448e7d16534a586225f1882d429822a595789ffb01ce92d047777ff541535fa094547a1b8724c61acd5a49ea31f9bd976c1f1d5f637ed08aee0665"; + sha512 = "84f717ea9067ea2ae636aa15fae1821e2660c84db5c6d3f1f656d9170312b31e44abcdaa1298a29adfed9b221e72301faf2fb1253672729c7fe7ce275cf37b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "c2c42d915ce9087bfa3748c4aa1e2a5481174a8a69b3c7fb675c6e5c528c3ed13b7d85a3aace049c75a434f47f35105cad724a94f0642291372e0dd82fdd4abc"; + sha512 = "66a6ca250c2d916503b825c05dc108e865ef63aaa851a658198869a0fecbad3e31b7572873b2b39f53220c0c1472e30d5822700512675cc9b1df9cda782185de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "8155b335afc8b377e9a4cc12507e0108e02624850211c46e1d9af13488325c06d14c67c12012d46bcb95d0d5f3642a1ddf93161fb6ab0e87ed8a56a82bcb1aa0"; + sha512 = "c953bde75215054be5be2364394aa89bebc4489dfd930ce1088ea770fe5b94ef9682f8a17065674dc674303a558dfbc77973c751b7e52d975b2138ba5be823cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "cddf96afa80f6935f018b69bde2368f8d4aab03c2669df1df136419e6f9dd7de7c0662530a696f1ff164837225c41a92ea5224c2aadc21e45db8341544c9d78e"; + sha512 = "d2ef4e665ce29f2df4ea9a9322962bf934b4e8eb8f2396fe532e2873a68a3d7124c53f3afafc541ac67799f01b8e75595de849a2a7d5bb7f552e0893add7ffab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b8ccb59dd3723b71cecbb1a3b47083f718f39f3f2aa69d5819f99d58b8a9d42902df04712e7aeef34401721f693e2a30b68353df2cb7f07c0e462708beca176a"; + sha512 = "e5f8b77ca5fa59d5236984e6141b909e2d232a5d279a295eee7fb83eeadf17d0078c936d2c560bdd9ce9df5809b0138547946d9052842d93e699fb7ad7161062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7b2b6da809040f1d0a7b89134a8a9923ff0e43872e5c49a22866db5344e0021722ad38488f11df51ac19910509f854ed7e316f88cb6b03714668e7c580438271"; + sha512 = "f241d4d26266231e063bd556d07b34477eb5d93452ce29a1c0518a5414eeba3398bfba5b6113a9c7cbc7ff3dc5371cd2eb470de4a00891a97a9e8f5a6ffb6d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c4c90865c7703935675619831db10a1935cdd995a0dde10db022890fd31b02c20387157d080c7724bd1e67d639c434db9a5a53291fe0a3c97b07083b909b8714"; + sha512 = "2e72ba457794ae8c40f0cc84a7f8f4ec66a2157a61853fa9ac7fb088e9320b85ca6d2b32653266dd4042b786596b9e03abdaa8f3f26157d354c070e3bd3cce52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "30d3720e3ed73c312e3d0cabe41bc95df6769a1b61bb9eefe8da358bff5fb2906ad7199f989242a2a8ad84cbc30b3ea8b4dcc8cea125142f1588f50ceb9551ca"; + sha512 = "b3bfa0ebfe62ddaebaaa35a90e220e6092b269ade846a07f45f12ba78050ff1d9c430ae98c84467dcb4449eec93c8216aaf9046a40a74b23d289beef89c347af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "4fc63a75904ddad55379c7f6c7d6fef3f882e706c4a6d0cf27e990de5ff0fcb5b852fef3777f524e633040137736cfb1548f87f517e52419089c380801183126"; + sha512 = "d85b8c718e82115f1d653e4cbaa87e5713dbf4046e7c81701b6d9f7d7d3020142de5ff181bb3a46916a65954a743716f0b2898d098b8b582a14703a7a0169abd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "52f0251533b86b39f8ac166de96995e94ed1797effbd74cc487cf8fd42191fb98d04ec099ff850f053b9cd4e4c5188cb64673fb116db1bf18f43dcdfc102f102"; + sha512 = "ad456cf1fb209f0a7f3f567fb79684657074eaf9f40bfe46716e52c482fd3f6e63cd4ff2bccf9d47a2a70d59c02c1953ecd70eff89f95608c25caf100be31f02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "6356befb14fb2a1d244df872912fe339ea0b2dc5148236a71a30b3f4120910fef56abae24e35eb871264db93abf1ea045342881f29e8098902935f7751351754"; + sha512 = "c70393c2ff8eb5bfaefc5bb646a327f685d16ddf5e9f6839d9d064fe51b51ef12e82716dc247fe9533f97bd33641d242049d1cb09130d29bd72faf497f989bad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "5522edbd771cf7233e8c805d45610acdc9832a4d76a4c5951f8dc5565810ab8805810e2543a66ca36f454e068411e573f73de3fe21e34e6b32a3349de869c9cf"; + sha512 = "6a4260b28a9d3f1bf118f4e32a64395a636395a98e0cf33546530d3439d74bcb773dd4493c9634c16f455cd7d034235d2c1f06830371033940a8cceef7a786f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "34a18384fafcd017594b94e8970da2d3521c8d90f3afaab0431a9a0d275630dd64adb892a8609a518217f097a3749ad65db646428cf28bcff5c9d6a03bdbd2a4"; + sha512 = "e0a0812ac3a24a0b9358f68a63d136b4dd0d140bd299bbc7b9b4c7a72e88c6ecbd149d1419478642b0b9bb662d625f9134febe5d6d210f9856fe99a6bd566832"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b518c72b63ebea3d30575548e8ce6f15961d0891918d8e83996bee2fb9dcfd01fff9be4340b67733b356f2b77c0308727b2911317832099561b3e2ad050296dd"; + sha512 = "171772bdf3fd38225db4f1dd0321f7c47101f804d94ad6b558423761ac0a3e464ff992b23e118c2ee05e053213ebf27807413007c5dab0bd9429e6612e52acc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b1beef1b4049c8b1c828ab1e201161edec47e3e83da40173be576a17d8f269edbc538882f7d5049401cbfeba409c5e668c1781e2a519b88038480993222f01c0"; + sha512 = "c7f96bc59b36c6ba7c4cd1d2ad0ce4e572dd489edadd39690aadf4cbb7e4573353fd73cfff94b2defdb6923a8a23d1857ec16621130cc106bdb6000fc054f98e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e2c4f71b6a8bf6d33dc76217de9215d21f5f1d1712fa981ec8ca8c203895c7ba94190b7be51f89c9fba03148052727cf76449c6130e33ca2d4965ecb5e4194e1"; + sha512 = "b4f28a2c5b303af01f1fab300a3c09554496cdae9ea15a0a6ab816411e7493a8a8fac2360e12a39be050a8de9ff2bde5bc4f6f8e0b6dc25cd8adad49a0d7514f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "136d8600eb4635213d58f7ceb0550d821e937275e849e3f1b7dcc7e7aa4b4d8ad497947187f6ff5979ac5bdd2b677c20a2a3eac7029081436f1c6707010055da"; + sha512 = "d847c11a5f207a27221a6b022cbb78e770a6d060eeb05065bd770101bc0238c0309bf4aaa063d070e23c1e8ab8c955c4318c09215bec8184b279f653ea05838b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8d130eee3db7e528bb6d82870f29fafedf28ef474ddb4a263c41f914997a5e607e048ebe438fd16f687e824ea6917b495563034d4459e1e53c08e613948906c4"; + sha512 = "9a0a608abdf8040be460483ce8c291eaa5cfa5ff719ac113c03bb1092ace9017f9beb10cc78edf8a6169452f6f46169673f856dd58f6d8eb7cdb49d9378c82cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bb484ab3c756bf1c5e591405fa22232f5e0b32cbaf0c0192edd3ff75e80a9f7773edc506c601f8b11593811c14636abff7a50a1cbc0944b664158543b8171052"; + sha512 = "ca8e503ae4c7e6e457dce0674116a9beaa6360ba50df5d97d0b56375794c940c91028bbc1424f5f7628a80560220a169c8a8ff59a3739e2555bd9b091842d7dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "618668015e76163856467b2603000fed75505bd9e76d1557dd290b7a92da467280ab9ad30fde78f004ab60f883f783faac6293196ed9fd409f9b854e0ddee577"; + sha512 = "842bf6fa0d8b6ad46a17e1f1d54207522cc6d65051138e73063fbc0c9623ef56d0861f524d441105ff606753e95a072124c3538dbf87ce333d22bdc1a448bc3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1445d4f5750b9100c5340c354c9b6c67dd2be5b73500c70def5c1522d0825ff808da868b39a60ec509684e77bcabbdf0816666f14b2dab7d5f48c4b6282ec1c9"; + sha512 = "f83218ecd31e86ce402b47cd00abec4065355e64e9d884fb5aacbde86977cf8e0ead693fd939f27c735d74b8b483ec18d4b185d7023c2124993fc52109238234"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "388da3ca86d5c9ba4adbd3ec90834941e2148c57138e6973628caaaa32d44ac8d18f8f2fc584dc43f0302c4c3568d2b6cadb94db40ab0ff24020e4fc3cb4cc7e"; + sha512 = "5d00e98297f9a9d768467c981bd789fa15945a5c70ffcb2f402f68cf13efea72106de8aa947963d58e25365d17456538e6e76c8bf4ae62f8ea5c0aef0b4d109f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "62423703ead40cc91179eccd15f9b4ffef8072ce4f236d3a1685ce666426f8a0bc670da82f360dc8c2dfef4b927ccd408a4466b7382999604abaea11626f9149"; + sha512 = "a30c6c7d0f50cc1db0505ec34ae1d5714737305c3e8e1e1660b6f519aabb699ba2a2bb14ecb77e1deda1d30cfd50ee69de3a308be004ca6a4b9e6df50eeb94de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "162d7d4ac4baed3c16b119ddc5f3b0d71dcbe7e26a3977ea375776a033a9995be45a2069bd50e8bc378168731c983f36bb8b6b7f5551a1e10bcc1b9b3d471b2e"; + sha512 = "9f3a5a32d4be8c9941293eb1d8c18968502eaa28fad44ae89df20c2170809b850a7a0460a95f6aa189c148c2c54a881ab138d12f3029f21a863c5307e4aa11e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3fa114a52582387ba51b04729c1c4895b29c33dc743cb9e4593750389cd9d943f96cd127fd2b49448fed527bb1bb36ddf4579ef78502f66925627277f02e46df"; + sha512 = "93547d639642d8c0ed10f23344ea01a66b43f99ecdcdd7a0e2e1a9b2a895a1fc10b44231db8c6d948a19a84b820a8dbbaa9ecec4df0bfc4555cfa62385ece6f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "62d16ba8dbb06fa54e1f4d6a383959740a466bfcceddeddb19dec45ace022ed272913d4096b43050bfef3a53c43329499794d5abfa9a6e911fd35a0f8df31cf7"; + sha512 = "73c501b9a4a329acf953881a795444baf4291ca6dd152cc05c698f661b2ad1f979fa7f45f4cbd6abb6b79b6b41ca0079658d32c1b5cfb6dd166eff486f0ff067"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "02fbb3eb9f13a8f340f5fc5c340de563041bfbcd77bc1f7f701b5b5eab6463bce6f3110e962e4c1a0667f3dbadc234511c3ad35718e3d84ea30952a178f56e7f"; + sha512 = "b505c3ef839778b713c42ba61ab2616d389184e6268313537ec12e648c341c8ff57b739622ec118daaad900b54fb4f8eb57f43526f711f59f368db88f788aa51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "10f64025be270572da5d3e35672b2656f902e896bb3cc7fe24e99b514c4647727308609c9e572f89f836fda677ef00b6a3be4ea4844d966437d53124605144b3"; + sha512 = "744247e1441b2c44cd427179e5008ec2a25bf4b6d4e3195c910e8943c76deabd63dd5ce5c5ce6de2968d5f00e67990d8fce2322d901d2a5bcba6b2fbfb4f51df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "8f3db73e145bb4ddc0606bc8adbd228dec27b20c6bb5227897ece926df2759209966c61a2b67d4e6618fc205616c187dfd9e26e63e09ca761b2c9da3d53c113a"; + sha512 = "1784177b07a777972dbbe14b259af9c0f5e4e8453d82ed0a9dfc7c0f548f6909cd9a986b4a03c2c40a5d1e88bcaea32c75909e5f085c652637512e8cc56ce38e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f497c48ed108134f02d977eb7f0f9577eddaebacf3f1d177f95b1e481872b94ce9f6f7c5914d6fc1c0464fe999670dbd3a2935ff76d139b49d529b87adbce5eb"; + sha512 = "7a56deb3e7014ab4ed95f70e537c1613fdbca8a0a538820f903808e8d881a7259033ec6d0c8512ee17dca4b55dd5bf54789be78a6018f6c21f5176e7d9cef09e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5a827468b04dcc308384e95017980d87249082e894998c77662b4d455bad5e8f91134e9c88ef159f89af974029302249a898ec932e01b4bd4d62c0b79b31718f"; + sha512 = "d47f44b37418d61131cf1b804e2914b6dbfcb8bb30efa771d2d41d0e3768e20660bc4c8c3b36b1611ea3e992825cbb9548a4c3b975578d6c218fe10f743d37a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f1bae26c1699036a832a021f0336ecfb8b61a378cf62ed6c8cf10c3a65e6546703474924b5f7145f30c2e9a458545ab6bcb999320a04bbbb65022731a23881b6"; + sha512 = "8e9229d45bd3484c76fcabfa66845b41de87b33c1dafadc9a06ff6d36396cdd9a1d5d86a7e85728b9b658c39197962f20f374453c594cb92b82f0a14536522be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "3df882e3542af5a1a82e344cde5f55f852f863ec652eb66f49e6f6145cf2eab3ea3b7f5a2170e4ad87a5dea0264f5002eb8d74e4e6e1662e3aece695ec6e405a"; + sha512 = "f656f3bbc00dd0c3c4a0a9c4a7d5d74f2049c343284b891ea455ac093f15ef24bcb4acb244213516272b730cd42798115ce3e9013cc7ac6bcd648e97aaf6ef3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "235ad09d75274a5299226a99911596b16b6b3facc19a896865dfda2467d2352446187a1ae6b64259ad41089203313b76d8486c869aced85bf8aeab692b860879"; + sha512 = "de412f63269b4e89bea1fc854c9a0ac9f37ef73d19ec900f32aef0fb444fb49daac0bb2e1df9ad01ec01810f64eb8f9d96d17816e7f062f5f3a324406a863efe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "b038b36b0cc8d0be3bb02b6851e9246bb849ba835cdc160c48c53df9ea5e937e0ed57c1d5e6200b11cf7c751b2f0e5cb69543d2e781852a9ae7e612a88a78b5e"; + sha512 = "5b6a9f82c85318e21a4a4bb44e74db28e690372d3fd93c8ad8ab4db8b1efcd9014fe365df1c95cae4ab4e7a3abde9ab4dc8873e8d9440c3a5716cce8b38407c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "12184beb0c93718200e11f17ec53f71062c443881482a2406d558f4c76652e81b2c3c3b9b5750a03a06fc1460a31f0146062e94e6a13736d7654649726c2914a"; + sha512 = "8a44046e7a0c0345575fd9b715dddfb88bff2cae6b674421724056e9142570b3499c645691c4c0bf37cb4ed59026a6e4827801b32fc865e6e2f9ed7653e13c30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0237960a4cfe37ac6c88b9df34396c19287c9d8fab62ab6668fd5aac1e2277d9c1a8e468379cd8929a5ccdb5e86828ccc0fc4a33e306203989764745256564eb"; + sha512 = "57dd98bc122a433f4f2bc0a07d167344087a26bc7dbf728a9d9770b61b108f953826d88889e73c2c6599fba5edfeeca3dd6eee2377faab254bd7f741ae30939b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "01acb4ca4726ae3ac8daa21aa0acf33fee71777f5dfdf496608afd8bd33dabb3c84bda1fd9c13230bb7b8c956db2409821f89d4122d9fbb29d8678cd8f9607d5"; + sha512 = "58e47133a1a1e018ef4eb64cf099abc7676a63d3edc86024d024ce3e95e2c007e37480dd9e015bf45fa7c53fc46f9ee95214199d25cf57dce8dbac6a56356c22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b2384c56a236420ba479a8a3e24ffed3b4596e8af8e46b868e718412a05317faa6bc7e0c39410931b31cf464f24300aed3e23c66a7cc3871ed88dbdc31c07aa6"; + sha512 = "7825ff6f4f2645e4577dc472cba3e4cb0cbd8f7881671f99f48df03fd509489ae74c000705b212fd5033b7da7345b09aafd68171009f5ebc40753f7da43e36de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d6b9e43c73bc9c38e93211abaab22e4f04bb68f31eb8351fdaab6c45bd7b70fa56bdcf3bb87901a569ea9917b59d7054bfeff1776373099268689238136dbadf"; + sha512 = "0401f4890ba1f21c7dc1139046f0aa6e218891c69de964c7e0ea32c50ace9cf743990548b6d544c8047719b189f4af4594231c2c30abc48a8dbb888c9f6ff339"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "d5e303c5182e218e3e9173483e32160e78c9a1ec812142fcaca35f970a043a08d6ecd8e0a4de1ce06fe58569be456d2e44ec5a3ef234d5ebe4fb9c8521d4748c"; + sha512 = "f54ca89091125043d38ce7a197ea2e1675cd3f308ca0f93b0d57cd1ad8e341e2f8fc41dba925c85c12947cce4cc4ebae13e248a48fe5fb229e4e06e4ed0e1436"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2b32e8f2257a4fa7576bafa69ac00b149d30e1114a0a174848deaf4cadbbd6b7073029515ae1b1e5a905bbd2dc53346507e8fb8dbceb625901bb9dc44da3ea85"; + sha512 = "c6aeb9254c51fcaaeeabb973ba7c6b7cbbdf1547300b8149abac8b35bf9d319a3d1efd7a9d252b23d6fdcfffe0f311014c17c475b27bfedc15798fdd8fa08fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "53a081d779acd8d10e9591c929c5bcdf6122d5a9f53a9b496556d4a4a7efcfad783ace2a99af5cc11ac295b16e1a055658b1b2cabb8385da2a99494f41280b91"; + sha512 = "f3451dc01dad8018b4709a6af7c8829d41ee3de4e028b3529be556480e0c5a48b257dc33ada9527b88550b2f68985bb71b1fe7cb6fb84e505ef3165a58d94c1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "473130d04c3e559159c9801d55961fe261b8f45c593e7b869c31eea4c96f4cfc517a35c2f505c8a45bbc62405bc04d9b1d941614f6d9b3dff6eb8a05d50ed934"; + sha512 = "3364456a57641e1bb20bc2255c0eeced49b67043eafef74867fdffb6e6abc3eeb3871159859bbd9ff4aa823f8060409db068fbe2f44a16c09ec2170a6b8f858b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "4f0661375fd0bdf67356c9b742095878e2288324b23da18c0f9c105c6c0f7d0bd8d4920423f4415ba9b164417936ed8def36fa945538599ca6544abafdade820"; + sha512 = "e206b0ff442462a150b60a72ed29653e64e2d277d887e622f31fddf2332cef1f75b6d6ddc27bd9c5dc89bfd87b67ce3fed72491e4d29a77809f4f901a2e87c18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "cd861dcc4e17ea389a42deb66feada2e614e91eaa8f2911de2c7e7fd66257759f937fcd96b2eb976ca7c605d7ad37cc3648bf67ec944fd93407ab9918553a6bc"; + sha512 = "a0873fc6ed8c69e205d4c01783ecabbc403317d94ea7fd21077e00f8cdc264424c00e32b6dd27202b2d6ed8ac08299eb6693a38c288cf9b9a24c722745ab0eb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f1c0a5ecd076df26dc635bf0e6f6f43e4c00135f914b9393462efc6d969dd6ccb662df1c8745478952896950dbd216cb4dc88e0a1fdf4608a926702eefb4d835"; + sha512 = "95183a50d86bd9463ae2ceff374c2c16d563cde9c2bd7395ac900195fc7f663239289baea37ecf9941abd0d8b43b5c63214fd40b8eade0419e2ffef2aad51095"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "2856270b337da7de6be743e3ec3bd2badafc14920a46d11e2b260daede010588c9634c2badb7b402b0247fb770f8b0c869119a1be8719487689ff48783c35753"; + sha512 = "758cf8c198165c0579207ad8d67d998eaa81c32a8ddd269ce1c76a05082349cdfe38c0fd969188e7d4e86eb128b88cf88daa9e3c283820311972773b075bda10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "95d8a14c884976c31be1230cc1f08706b8f1032d6727b0a88eddc8d9a2b1941da783d9113dba9963f5a3615d515a7906906779f8dd0d445220ee6aa633c2f6c7"; + sha512 = "b38a18191221d6fdf1386c72ec07e198d10dfb2cb33bca34aa5d960f5c7be2ae61fb543409559e3308db188ec949261eac4949391f8b699f63948fe3177a2ec7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "c8f5706cb28419c2ed311b37dd4391898e5ea55cc70c3da9018eeb104be696d80e9eb6e22467601e44b3b11d48695479a9448b97b06a37b63d042f22056255f1"; + sha512 = "f0b09948695397b53cb3fc500d6ae47aabc4f84da9314867816e2c4f21e4228e601731756b1b87253d2a2d5f6057fa115bf667d115de5d54ef4baa1a5dc181e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "db68dedeed06365f5378c91241ba21474fa490234ee2f0e8ce8d5439879bc7e79a6b8a81ba4883c5b6f9eeaa86c8fafb4079681eda5c7c1de13bdb7a6587967e"; + sha512 = "46ef2273ff40e516c9deabe4b42bbb57abbc813a6717b0ecde42720e9d54ef3b332df05f48a5db516f8030aa984bbb0d91afbe3f0b84c604f9d106c39e124bde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d450c55f00b33546a37cc96b2daad0ff9d9bd74a4c8219fe2e584e683a813e328059851bad48f597c60c0e5afbd15ff5f2547249e9318ed1a4198f8db43ef653"; + sha512 = "43a1803e07b496571f35e005b8ba0adfd9281c9c907b00b92bd0fcf37e9b4c8236af90d145456725feaf3ef2c7baa12f9e5651e88a239795d90cb401079ca4d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3da1c044fd4abad499d44fb4e30942f6e92f0bf5b0bc98badf4cd7a4b63a62bf7a6752483964112bbc9fad91ec87ed40cc64fa5cf9c14edebcce22d78600e352"; + sha512 = "4a79bd0bb319c8851828a4a395d7a3f12df8ac812582048758ab007a61ec656785322687dadc46b023caf6fdde6226b25fb31e2c08ced97e73832517196c5b1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "69090fa168e4acfd16bbf9c0569b2d537570cb798b8d2bc5da26911c1030063ba0f1366b6453810c31038edac5fd6fbd988efec27e923d08ac61a2e2f654be4b"; + sha512 = "5c5c465daedb590f848415ac1781909d3645a3634da35ffe76c8e91b9a154f3f848efe23f348e0da4e2e7b79d92b41f98988fb68e59b54103ddcde913a7c8cb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "86bdce82f04c68e32e581d32ea1dda301e68f39a93d762d4e40a85def20490d54cb62ac4baaa4770236b098bcada9d9767f5a6bde263968919eeb2063e5a6fa5"; + sha512 = "338af2c5ff8fc81401cbdd4559b8371bc18a77f07c28c87d71da2d4a164a697aa6f4651e631a507c94adb962059dd6ce772d78d75b2b9224e22e555687422b9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e3089af377c2f5faf97934e40e6abd782b4b518abf1bd6dbc9655dac192523051f11b1e7a016465c76005d42cf5382c21ee02ee65b80cffb00384e0b9f0889e6"; + sha512 = "95c2dcf9a5f9abd0c2f12e9a40f9f0828a1f05c20b981d0b6c66d85b6e57c689fc443e8ca7504f592baf2e89dceb7e01c0aa9bf34fc06165bb1dcdeeaf5062bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "fa001a1a31036a26dfb3914a24cb882ca3d5065f0687e0bbb4e33814dfa16f5f8f5d9cc44d24e664be7e87a7ef9fe21d2111859150bedc6f30d59e3badf9ad43"; + sha512 = "89c255dd709b9215d2fc933b6d09b0205495455ceceff96dcb9e2ea5b12c98b9fda258aaa12f5aa0a1806067cef1a8434c865c0d7a53c039b1612e0c8d548aa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "629a28f9a05c758e1d748206cbd81db22fea7f847b16e42674717ec8ea33c035649d82a9418a691aa31507368fa2ab91590cae207439031703c1a8c8382d6a7d"; + sha512 = "39e6043e5caff0925e1f9d475c3a3e1281023336eb79cdfece1a8a5a73d973589258719b517cd6686cfd69400eeedc7b744287286e055e4cbdcb188818c3e94a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "5f5065f0bc2a515daf388f70d503743fdd2d55006b4bce58c9c85fdb06644c729eeff3a2ecea9b2a29be1a0f94147838287d9c7624e44df60014a1a99990a050"; + sha512 = "570fbffe7e1b70cfc0613e4b230e3dc0bace2225bf52b9b5ddea4812d1a9795aa385ff97e2471209e9a6aa3c5c03fa861741bc8f4dc499a2cd3ffe5cfffa0c0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "0fcdcd5a965a8cbfdb1d0fab0419588b63b26216f65ca206052c0e36257d6b6d29a4c2639a0f8fe456ff8458e60766670a022c84f18426a60c3f230282206d55"; + sha512 = "bb58207314655f500418321d6c04f9849a6263495b0406ad0ae53b43de395dec471ca401dfadd157307d942da3cfd94df8f112cdd4aa37ed249920fc64c8d4a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a86b3ed1e28aab56223b1a8ed7d184fb526b75fa27178eedf676909aae0931cbca7948870d50966b08ff7ff3c79efd037ffed31a74f89f25d302c2fbcf8d4952"; + sha512 = "744a0b481604d7f5ce312f0d9cd979e768e5c53c4b251bf3e9e6d97c67450d951bcd5bf4f4e38e830a17a08e6fc98aee30fc862db27013909592ea1e953a57dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8e844efc0fbaec678092e97594aa4afc57b40ed6f8b38685a680aebfa4344ea6813a2bf2a93452e9b24683713493c5dcfb8414ecd51f9e2c334b1a5aab7b447a"; + sha512 = "baa1bbbc3c813a168b742a4b20c209c66bdba60b799cc307b99bf08e8975c72deebd5ae6a9aad53d7172305eb2a09cc6292d9f9533f3318de4061a8744e9686e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a74566955c633d173c9da3c0300e8e8e327fc6fbc063bca00b934a2ef8dc4fb75e993e9ef263f2aa4709ba90c33593e990cf2fdb0d6a9fb944145c31e7cbc667"; + sha512 = "06840fb56bebc72b391907853474b29104107d7b7e2ee719ba48a2197cb166507f95d69ff215f29cfb806350e588c84d5f289460ae8743ba03c7d6c212b91b0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e7cb5bc617eeba0977a749d5cd16f0787d588e73e20effc0a755bbc85ad9d3d422fbf0114a290a959202b0238848f7f525de8f58fda0035755acaf405fe5fca2"; + sha512 = "48e4c56091a1cece6ac3f93e769760b71b8e79cf223ead1f2ed4ac3de89c309cf50bf9a6e86c9b7a22b8d84befee91d65d909c1fa2bba8b04cc7502dd0a57e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f97c705c1973122181052599a81f44710d0a1a9a7369384993b2636653fbeba2fa77a30e2f13e6dd359c6aab28d55a3a0551180b4934bee35ca79201b90d4f23"; + sha512 = "8a1af26ab745b2efd03ea44a850cdc8a9f2e4259de8c568db40e54fcf57d902b898eaa7240a5d2621a7f456a8ec717875d1a2e4abe4f8a0c67e9bcd1bd9b4d77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c4a743e2ef548d26e0aca8392323c63d3a55861e5e9dd35f1b1c7fc4ff8b44aa54c5fb9261ea98b0a7ff4ca21edd3ff46e3b8791fda9927cacb9e75440092047"; + sha512 = "784a233f3098ca62ba0edc67a27af8fceb49f778f500c825cbca54c595d9c5f4a918a16c9bc6d121838981dc006a28bf53d3e3e0531861f261f8ffeb638c0ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9ee0dfddf90dd63dc1069f83ae2d70fa4ceede0ef535369aeebd2629f35b3c54bcdc05ad337910d5e860c39ddbdbd82d3d6c3ac979ee835b16cbb99705594328"; + sha512 = "a585d1c972a039f82fb69268f4a7a6daa9bcab77db9d045720f5a98cd788ee1be0128bb9f112098536975cfc9533d369e6b6b0ccbe5a1e43e93406eff45da5cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6ecf4202844494e297bc6232d05e9da34dd11ac2a3a19d7014ea54ad27a2accedda42c31fad1144b22f9cc839109deb90bda9592b4081a5ca731f2a5aa5c0237"; + sha512 = "93d5fd02be91c5e9b0304badbbe360b8755eb5e383168555712ab316ac353c2c8853a9f34ab1a028ede4f31b6b49499c5c31a0e992a0e349b6eafe6fe523285f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e772139fc6618a7fad213c710582fc9bbc3d63ef364e83f92ff72e66d361e25ab2af750df7b8f53052ee9be8d5ce10cf9883c64f331a219dc3c4f4a633c53ca9"; + sha512 = "d5e197e5727cdec1d83b05a823e4379fa229673adb3d3c2c0125b028cc229747302de8f423bc0972190e01a5658f843c1baf3e1bbc268d541dc07889e8c8ef62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "169abcdcb9e67b1a1cdb97398a688f0f432c525480e1cb47f7bb85f0bd9cb5fd2c58d8511e1e5fb44e93ffda3917abb34b5babd9ba4cb3fba76cd962eb6da9c3"; + sha512 = "6b285afe17533f9cff61eb7001b5099128bf475a999a393d21f94f6ef734b123824bd5fd6d3fc77437943145865cfbf3469b23104bcb509707594c1a5a718960"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "94ceddceb154f0fa0f70b7febf3a8741d7fbf85c2345220f9f3afc26622118ea23d4085aaaad6c1be92a01ef5e8c507d4035b70dda0363ea1e362666d3aaccbc"; + sha512 = "b14bf0b48de19048a6c8188ff064e4012055d3b6ff21eeac10a19c03b6aa85208e7dcc1f2fd28a01b6ffe87eecc968d62082e7fa5ae9b2e5391730fb794e8a97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "4c59ab3169489e9411ad97b23116232ea9dc63337bb0ab31b36d5051f39c96fcce3c5e5e23e7ad65cceb93f21d2a194f46a2884e639104fba6bd0e2b89e74592"; + sha512 = "771e77e3533c9273ccc08cd88dcda7a07cbf89cd1b5939daceebd24944b3c336c7c203ca1b0d1f7ea2236775099b0edf91d75064b07e4ca76c1bc7eb3b5bb816"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "31c31241d1b93fc5b4e8a543b248b92e457e4c454c0a9f2c4a36080560600c331ac68baf2c56b0284547bd32082af6a7bcb5e217f2b0e82a696411a8a340b308"; + sha512 = "75da529909fc77d0ad288f63d0e89103d63ce3f815eb8d713b43b712e122255ee4dcc059276dc8c53abb64693de650c8674302987999be5155c19001d8e95ed2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "3358555e67ee43160065b0b0a74ac76b0108eef9e5545a00d891c376e1f75520a982534944fe4e0991da4af076aae3f389527b272309e3bc507692b2b01eb1a4"; + sha512 = "a6ebf4ecaddbb57cca585eb0d2883336b98a0c1c7249e2db78a8f2042140d2d01c787444331f5c9d98efc7fc4b5ccf63ff50c4214263ce242b9c37c943a6079b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "5a84e72b7e84774e56f13a7edfc32ee7718171616ebdb2d1f031965631b79e08e5a5a392bbcb7a13fea22b8aa87a51a3d21d0ba8c471e507d5cc4171de9508cb"; + sha512 = "e6bddf3f932171acd6560bb3a69129f71db73805dcbf01743940d652613ac4cc40875c684cb8ca46b6fd0b2baaf05710e18f1457ec41e9fe4fec08b7dad6193d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "ff1221835cbdd6da1697a9f915ead88e8b1f0afe2dc33e001079143424ae8d12dc048985a918133b26c17ba7422dcaa9db873af1bbcf1f4add68a3e07d86497e"; + sha512 = "863142d61d13085023eed212bc8fd24ef919e22141a560e06deb78b61a822c3af0d9f38c2dfe1574e80f04942682aa1bc0c10361c08e781dcf1ad8b4ef13b108"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "34be87c79fd43f8d1e3da76a7f037f7dca411cbfacd3b7a72420abee9dd2863a85ea38c53d58bdd124d2d3510fcab0328ef1195cc332990b22400b90a6061c05"; + sha512 = "40eb771258cfffb080462e465dc0daa0b6a3bae27ef6b5cf3e8b9e1fdec47ebc7c00f8af392a421971d2e3463456839d3fd0a5fb50d7226e5e27e3346a32b828"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "78a0814b6bca4267d11be6a180836ef275c41c9b7e29e821ca3559835a5451b689c0a4a7c771d51726641d04e1fbc83a415eecf0b72b8b7ef1c41e0c92ea6dc3"; + sha512 = "08426effef46a0b26a35dd0bd37d5021a1968d2a7edfa7617e44bd561502722dc7a98c7fd63be853dc21c29241f0767a7ef31e07d3e8ba1241adc9537edc26d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "1549118be4af02a05465267fe48720dea903e1199c33980dffea6a59bc90d31009c61b4414ea57f03a59e27182b8fa6e8e6c95eeb97a88426d3b6ff67bdea590"; + sha512 = "c86de3b4b96d3520e7c4483e86aacaa1c3c56f524ac37dbfa7558a372c12130ff2b55a89bcebf3fc48d361a9e5204c059dd5ce70ca04343ae913b565eb4f193a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f8c1c8b9e97d4c09b70d047c2dc81b9f2b9342014b5e928f11d0705f83915597812d6ea71daf8e315e026f127b18f67161f116bb6139ff135181d25b0bd4ca66"; + sha512 = "2445e60d7dc548e1da0b79c4518bbf1aa16777ce1e944d8c70599c3c78ab9c4ae24a3c58c7c02734b0d0bf4f4bfe0a777671b82857a95dda69b8d584e6b77a54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "afb767b85b674d3c592fb7f6175cceb14f917edd68d2f272b3560450f91dcae5a30c84d9869a08418a727ba6e010364752b52a22f3fe2f0a881ca01cb137306d"; + sha512 = "c69f7306906fdb8f7757e2e814103467c859aa7da852e3a2e77a8b10d37d327b78ae79fd0e9170593bf82e1975126efb6296a48683e30474bc43fbe026cea046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b33fc09c365ea57136dd53cca5a5bc54a8a5675e37716519a419e0e24286863741660af72cbb73809ae2efa0cad9828d523fced2ffe7c25f7b99781bbf74c382"; + sha512 = "b550a887851e2efa5c31da29b83b4152faac726bf64c2fc334ebb72b2fdfc8e74ef6ef2471e431a0efcf2491c22b0c98dd43d1d41373425b0e70216f6a58ada5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "6a03c39d8736dde23d1d9558b7ba371840a95fd5f74948e63ed4f9b404ed478815950c196bb18788d2b883a68cc4760ce329e8b110e12c355655ca8f52c1ad22"; + sha512 = "0b84043d07e62e5a7ba38a769f9949cef05cde65852e90b21e27a09b3d40fbfcbee66c74dbb50e463b3f01e3a07b1c137496feae1856c1c3ba2f4c27ee17b3a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1b9b9907386e7efc27c28f602a4915e8b9863f5ef64748f44ea7418f7b48eec512e19e906353abbb92e4a360d8216ec93675aa890fcb9de469dc4d800b0e5a37"; + sha512 = "bedfadc5e0c075c284f33a5463b207fd5056117c8de9b5d0b89134be6a5489a43c95e2e741688026b21b09f3e95d3216361bbf767533173d23d5b394025ea82a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7d97a23fccd265da8403fa842458f4fd36c7316dd8720fb2d2a9a3a6ef1ca47eaa007a72348b8582d891ed2c27200ff40f62cd877dbd72ce213dbb10f64e533f"; + sha512 = "3a6f79a49f183e920740d306483c697ce4b315b5a25e06c2b74faff74082d632078997f78caacbfdf7b97f598d1510fe1ad4f7a0c57e7eebbf543a263f46f279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f027e228551efdbe2aebdc1244a4495b31fbe3c713adf4c8078d6cd65997e0701a1813f55208b13a9e51e6e80637c9e6d08571f38f1fa8111b42f6d463e819e6"; + sha512 = "c445fa9f12599a11aa5c13f5c88e5a510ac4ba99e852976504c5030008193e00194603971e1f4078d8e370f74bd3134b3702a5c97be3e6a0e4fb841e24b609e7"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 851c95fb1a27..3dd7d9e8e659 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0.1"; + version = "59.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ach/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "b982f2bd54312d66b7a1d6d6e775bad21eb1bce3bbe161cf980d03e55d4bfb5eaa217b05c16c72cd55165cdf7ee409c2e0a56143a82374f66c67609fed1464ae"; + sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/af/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "fbafd3dcfc473b7ebc0d6230cff487819c37b6f41135060cceca72e8704afa147edf71405c1367137bab6c8013fdd98ad487bd7039a291f64b0b37eb468d5b18"; + sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/an/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b7cf1261c2e776874ecb7c709d82f288e74d16770acd3215fbdcf44f6167544e626c1f809e4d68dac7a040e0dacba0095d24c1994fe329e5613c7a561ad652f2"; + sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ar/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "16e308336b1ea37bc7aa18184e30eee4f1a073bc1dfe009c515a338f6412de6ad19ce96653cd58aa99d4ca34476e16693c03b01b7d5b1df3154ecab58fca157b"; + sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/as/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a6de3e421126adf95a02911db3140791c5a5dc9030e63327fbafd5fa3f5d6d81f4d62fa705c84a573788840e921ea1ab71e52d08df443405a6c8b2e69773e76b"; + sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ast/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "2bd15deae2a01d09a622df87ce5329adb5d5da2e76dce678aaee202eec2a7ddd0ae79de205d3dabbcd189fbd3aa5293ee551c31bb3850b3cd7e5c02d73862548"; + sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/az/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "ba021c1531fbcc1c7f4b44f798d0046c39b2578fb4fa8f81927f7a4bb3a3e8b3d7de545bb2d818cfe1c095cb4387477d05541b5e5021c56086a700e8cf928b64"; + sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/be/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ba5ac2b182f9534825468829b62359f5c24a2cfcfc0e27ff47469b814f746240155ceb228bb7fdf1855e378048806b70106bc0a3999b0cc2d4f69b28f7565784"; + sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bg/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a1aff58b327ffa5dc62975e31e59306350bc8b4a2b38e5993aea4ca70fd4c0e295b7e25a8deafc9d354fc674d8c55ae917a110bfa832f54fd0067f4e2f35dd71"; + sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-BD/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "fe96f073482488f66f0b7a46852d763212e444c80cba0f495e275b4c73711374949d742bd8ca0c69cb9e662e71b13b28084c004b3530f702445796d7c1716f0d"; + sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "31d8f589ec72a8ff3315fec3bcf9894ff6590768f2c380313c38efa2106bbc71bd11d54b553eca568cee0a7768f0e57b3ef8038d14ae2615fa1160145b123cb0"; + sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/br/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7ed8310521f981a4ff75037198a9bcde4fa07077c298c43f5baf532e84be017d604d27d59ae38c10d0c422a1cc793652c148e7c3944171044f4e9f267b64993b"; + sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bs/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "7ce16040b19d61d39936fd220351d6dce0210aa0edc0494d1956d1f19d7e027cb2d8d100940bbc34a77f05d305a5af3708d16bc78bd9b2364407bdb71ff05052"; + sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ca/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8f8ec749c55c4dd930d3e359b9a3003edddfb6ca36f6f65f0119d0049b09a4c3cbaf558178a327583769fafa2d64272099882833e2ef7d6956b606c05f8a6b76"; + sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cak/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "41f6ae5d0aa44b90724e578d51ad7a3d6903dd74d30957a8786cddbd3ae427da0a453c1504a11ff13ab9dbb350829c1928d27ca0ec67e94995346e1414109e26"; + sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cs/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "e219ec91c7346a72b64503f89088554f8d322968fbed0ff764d90df53fac06d4febf407773192530ad98d6c51dea23fb7c5f07e2b9099c736759a3b60b8b0a48"; + sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cy/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c6650b47193449b28e1d9f6420b59c1235986ececcf724234e26fd8168f52120274d3d8acd8aba036c494393eb635c0ccd68833a1961a36a10b04b1a1050bd7a"; + sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/da/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b66299d7f65fdde01b644a21524635806c703df27cb4eff928189d65285f12140926e8d20d1f83b54263b8b17b7621034ac1da5867fd28d36b2733212c9b65ab"; + sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/de/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "463ebdafacbe1eb4d0df9d4843ceb41849fc2680404e1e5f4af563bcd4fc4410f8cb212a396ccfca874c37a4cb245bfef8de4aa9620d3e30908f1c94d262cf71"; + sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/dsb/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "947dbe47ad286c57a62557532232a5e833cc6f7b6295699415c727bc30cd1cd67074a568c1f842e3e7b95460595b16b0a9c87e94f38a37f22b5e8db82a3a4932"; + sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/el/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b0d5015676280816cde17b217e078c8b912aaa87167317393c0c20b8ebb27460ead4a4656587bda19b93fcf4362e07ce11a0f5410cee733ab44bc2b1f0a1f093"; + sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-GB/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "94864d56052d619d495c527af0941979470a3c7410e51c01e5a04be565a62a29a6055eaaa9f5b4bd6b443fb87702f52c935b3071b4ddccaf97a494fc2256728f"; + sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-US/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ef8c7518bc9abd2f730efa428ccc418410c7c571b32c06633ecf82c949aeb3e4006d888362ab511d55db98ee2d6e152f9ed7cecdd976272c89f8cc5957c9132e"; + sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-ZA/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "7e172fd957b000d77e4ff832ebbbf6b46a192668289394370ec95f12e5f319cee59da140bb3a809bcb7e161349c32f682083e7639bfb3f6fa5cab53ac4f33716"; + sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eo/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "369e76a861625bc9e757980c896fbd1563e5127ce770557aa7e81cd80040146af62c526ab148168b2a078a9c16432e97e96ca4fffa5db5945c3475353cfc894f"; + sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-AR/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a053bba1fb77617ccd9b2bb1595ebaf040760307dedc9984d3ccf5212f572835f9463611f38bce684e71728b04c4d3e484cbe6c20875b0703d39c3fdcddc6cec"; + sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-CL/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "618eb3fef5f3669bc104ba60b76cf280503bbb4f2700341e95a6024fb3113c56388fcfeca294e3fffa3af5db15d639c0e7613397505c63509d7f248e7a1825e2"; + sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-ES/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f8fa78438bf7561d422d9187b16c1284df2a79c6f8cfdbdcd838501b5f2fca1d2e05bfad6d59b9484f46e4dabd2630706a8c47f3323534e24ef4c8fbc4937a56"; + sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-MX/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "4dfc8c70cfd5eca191ed4feaaf8c4dcf2dadfd7226f1ebd939997e8bdcd7d867afe0c27a51cf5d578c380665023770b2e54110dc2af78ca63a2a38165d879665"; + sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/et/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9710192f0c87ebbbd68bf336f1560007a86f9c9d55ee3df7311725f7c81e1415f5d5346378fc86424cf1d94e51efcaf791318f040c3652132dacce59a8c2668b"; + sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eu/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "47a76627b97b2190f532ac82a6684787a6cd45f4f831b2af6315e6242367af68f84be7965cb6d91df89d8e43d04655c0e41231eff0b86cf329ffff5b26a56dc4"; + sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fa/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "3a888e43b737998938a624003c6eca6362aad95d0e13203d655d67c4b76c69484240da43d00e24a809e1fa40b18249c9549d52794f9cd92469a028ddb4b585ec"; + sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ff/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "365b907bb5d720874d206cc2fd3e6f21095ea1681a0bff5ffe51b49135bb3b3984e5cbb0a50951afc5bab3ef2bd2ea55af29912d25dba8f4680bf6bc25f24b05"; + sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fi/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9361b0554f221e13c4146f9eb0df4af64625062a368ff828d80350e932ef0bf6f9cd87e3399bdb42ca5e7ca0dfaec9357d57a345a978ff936958ddd074ac6c67"; + sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "61123f188e491c32e9b912026554afee17d83ed8bb3480bc6ed8f10f46049e81f2444f6850c5a9f7841f9e897311ac0955105401fd2661ee703243c6e204fd60"; + sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fy-NL/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4575949552f1e0951d75b2f3eae5a6ea5fbbc6b69f0ba5d82b69922209a46b8f9701112cd1dd61b6c892eb1f4e6463e28874f3f84891e3eca3de0b52036ad429"; + sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ga-IE/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4a05d48803502ee435ea3b50f38ed262aa57048b0f013c7165af37ad44494a1aae7f643e14d5aaaf7a2d5a1085a67a078e70ade9e614bfe33295351686661ccd"; + sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gd/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "df9dcc72aacd44ecf73f0ddc34a6d97dafc9deddb35075273c2b958b2c23ce3a346433b050766f8b83040c495c2a84b454cd7742cdf6b59b69894a94553c21c0"; + sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3f55336a02249aa06674adbe8f378ad2b1a7b99164608f04cefe8c642ecffd336f9f370fcc190debeb89f97f630032d41aacb46e03cfd09a9a20bdf5f207312d"; + sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gn/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "9bdb650bb25ad573a5722595d7b062b370d79ef6a9079354ee467ae8fdb8e319d3b666bef0569286a868e7d64453b2c69098945539a259184334910f70914211"; + sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gu-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5f2621253981d58aa643da76dadae44da76bad3f50d08c35c43d52da5b0a8521ee4c5df5262558edb4b2bd817985aa02d6ff908f326d99ea58dd4d96b9f04819"; + sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/he/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "ba7b0bedc2f8146dddb7f0a8a2c357dea4d23481e85f23e5d1f820da6b9c6ea84298ef609967e62741a2f9b57a6c4e94b0a90896daccb80b888313c75359879a"; + sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hi-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7804c9b6bab169fda70db8ff3f638add9fc22a6b8f9adde30482558e97d32946085258bfdf93b0e67a35709c474fb3aa028816e7f501dd554ef05a282f656815"; + sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e97cd1b68d5a1d471edfddedbc05321444880dc9ad2910010c447515ace632c25b0516ca1dbd529d44777c8f9046b5a660a768bdb35ac5e199d1685724c6a7ef"; + sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hsb/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "098842a0e8226eee716859b7e1bd1919a2bd251bc368ff6df58c95b556dc503f15186bb483503087a7e02d785453edc77d081e267b08487c0ff874361a82ee1d"; + sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hu/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cd6846f6268d96f84d405aac06c11322e188da3124ad848faaaaac7cd562c004655a8f7732294b0ce2ca42597c82d82fe8b1eb65dc5b0b659f7be342aec648ca"; + sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hy-AM/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3e4f4f536c4dbd4337e301272fd433e4e0ea26976f2a5add8a0d90f310e2c3fb14a4b558c556214409788bc2be09d36bdbf95bc5385260b70408f00ec71c30da"; + sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ia/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "35adfd5eaaeb3d40e32d501ff49979e4db878b6fab5598d64c3943cf57f846e439ef88693b39a03df65367436ce3efada9c367ee5de20a1d769620b00299bbaf"; + sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/id/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3203f599f6ed436280143aaa563780c64864488f125462a56241785f9e7d6d48b2d3fadd0366fee131d575d8dadc8ca4820716a03de4c3b23eb0f0b033cc73f3"; + sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/is/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2100f728268efc1d2c0f96e745e2574847aa844ef4366dab44f9f0d89e79372a2180d530c7fdfe627e17644871b3a71387037057058a0ebd117e187343b5d1fc"; + sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/it/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "abef6687c0e0b90f9857e29d5b82ded6dbc0b304dcabf2586e1328bbfb9948b37f582a5ac1c58cb46026ed674863c437a15872c46741fc4e8d0a4a4be80cc05e"; + sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ja/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d953aabe2368ebe9f944d91769b6e0fe18b1b5ad819040705283af6739b03fdf6fe9f3cfdbadf5231c9789ce62dbbe831035f8776f570e0be1e483b6eea578a3"; + sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ka/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "52c4b6338dbc79a670b33e97d7996daf1ef72c22982f16840ea0cde0e6ec16eda6eee1688e6eafa2ce6eaa9cacb33ceb7196f2923c81d4e1fdb3af9c200b9c7f"; + sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kab/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4832c730d37b5890a85091109ca150b882202be9028b448aa57fa8e74a2f91673d2c6be4e963235c0453cbf070a996423e64f7cd93caed973d5c5018d26d7a4d"; + sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "efb2fac05f337f22c326822efa17f7063dc71180d54621b95c000d6c86bf5180d5ecb012ab72cef23177cf07d7f46f507bda862f87dea507a4c1be026829ca1d"; + sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/km/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c7817dc8cd3e78b15708a863727627ebcdc6ad054da252f273a6e68cc914f5999fd6d7495d64586e1d218c068c9f38250db0ae54944a67f1116e5a12132c9dcd"; + sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kn/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9ed4c6d0a6a5579d1cb32e35a97df2b05d836e5eab5df59406da4d86ebae6374c38649232c2dff849865f538ce4264d8f08c7fa6c778f9ac65362cd47297ce51"; + sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ko/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f133fda3bfbc59f895ead4257a097102af10954f0fb7ddd6bc9337a520641d8f1a26bd86011c0922c2770e8191e68d96e46d56a76d498c7a44c713207a9f8585"; + sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lij/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e4d55a021271186cf3553781aab1953c9bc53b86c5d8550c6d45bfcf2363dcf32def20d411c4df10aca3e7c2a79ee527b23e248910ec1bbef8d1e15793e1b831"; + sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lt/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a08315a4134181e2f8c559e0c70ff05b1455f85a85d5b5b06c5b8cc70bb17f3761468af42c27be476ea3e342365262f18b98c523e35576425ee8e5ef8df9c362"; + sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lv/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e6e62886b8bf972668e3da6452bbaa970cd16aa5593c8a3d765e0d784ba755e17641a1d7e5410ea6474484eb14b3b6b18b69e3be38f2e2ff30890afa18c9a405"; + sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mai/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "a28537a457989974e11161ae84dee2de28d783447c0a0a6b5b03a36fcd1650d609ddbb40ed063f0c68149d314b1eb17dfe92d5396c855794d45a0bf8e3491c7a"; + sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "da601ab25113316cb9ad44d2a8bd0eba23800fc97ab18ade8324048b1d7c757c51db9fe039992d18fa7b78846b5be496d9f3439500448f21d66a9d3a335479ae"; + sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ml/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "eacba5bf549f1398f561ad574775af8c749251f9d4a57a2c91400236cb2b72b00e429d4dcd4597b6dc6fe95a629d4b56c2c1776e03cf5d158cbc85743bbdd443"; + sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "e9e9b13cc3c4f48871d5b73ea88aba384d0ae792f7c2bb49f41d5b7da36243c108dd96925c122abb0b202ba8ee7591d8edd783546402c2066f5459883a255897"; + sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ms/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "edf6153c9e18e620558e283086a96d49e484a74983b7d5823b1c17f9276f3c41d4282a46dc120a181a7e53595e1434f56658d34b2cad4c97e30753c07c899fbf"; + sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/my/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c153e6cc2bb3ea49de8dea3661b4c5ec23193cd40e68da8160108b40fcda6717e35e7ef3bd2708ac2e47014b224e53f74b9183cb2c50f36d517f1a5ade425d40"; + sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nb-NO/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "1b94a618ec8f132bbf5b246354da4b424a682fcca74259b94f1ff5cb12cb0602d327dc7b9af2814fde45e5da829159df316442db6388fc45bee8c8255418a1ee"; + sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ne-NP/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "552aa2504e1d5c15a413a0e7e47b509d37a8b424be9ec4371f0920a9ac8b6ada2cafb9adf054b695499d41fc9b606f6f0c95d99104318cee1d69998ed7bd1812"; + sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2449c6f7cb6106e7f49b5160ecf973a73882d653c68a8e5648a31595367ba41dd93e334f3a67e69958f4bf429a17069bdf5d66163f2be14e86068a30acc29045"; + sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nn-NO/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c80169f8f2cab78efa8ad06a6e3dcea41359bfa2b4af7baa034b88c934d27243eb5b20b4ca4f956707472daaf1e315ee4d34e5abdc25edbdd0b8aa3915c14d5a"; + sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/or/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "48ebeb9e4233b303bf5300c9d7413c82f9340a7f1fdb4ce23cd9868ae6c8c7b61532535dde653fec0f9a56a3b8d4595d451c3abddee75f6aeaa5b2450f26b0d7"; + sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pa-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "4d2caea086ddd56544b59793d3e2422940d64b16a623e9b9717329a639ce8a89f9e69d7c8ed9121bd08d692462c99316e1364d89eb8d1cbe978c67f99bff2469"; + sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "6d10818fe57a2b10bd5cccf068f42ef8e2d949a79c4ce6e4b2ae088944f17dee8ce14396b2e3f86d492e3ce31780bbd96ecd4bfe39cb8e15dbc70cbdad6a3927"; + sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-BR/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b2a8732a03983b00e7e606099a215a8b6545e093e243662988400e059757f6699571a29e6c24433b345de5e47484d19c08685fe1b5410d71bfafe023d3bbc669"; + sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-PT/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ffc7c4a8cb7a092ffb86ff32ff8d6e54b4c49600ea9c8ac77e337f4c71b283adced784d23cfe8e69d034b9cc22f118756af44fc5a22003c77c33135a24197b2c"; + sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/rm/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ca174bb51554e73d647207c62f4f17de52b47ca6960dc13f45becf0a0e43b73edcc7925a913fd42e3b151acaeded5bb68d6cdc6ac17f3add2bcdecb8a4b20c3e"; + sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ro/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4046be435da5d23a46ea007ed04c35cc9431d22858211fb2647df1ad4e00e84476544448ca86ce353b889a8db92fa1723c0598e7d560fc9980b1c7b82fae1552"; + sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ru/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a7b4becbe30e27c8bec3c71af691a03b916774a77e4626a89743a7a7deeb07e9489ba6e276e80b53becb78e5c2575465b6f141f694b71bf9cd68dd761c0442bb"; + sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/si/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a9d8162bd8784be11924e9cc0567ea720b87232d175dee18212dbecd8280fecc610a964df77a3499c5f25cbbd466344221f5b071c8d83c3268d936e108adae48"; + sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "999229f133193f19b49b9e4107515963fa28b524323cbf88a2d13542568997a91af911c42a3b353ab3d9dc4d05e45b8e2c9e08b4e6436da6292073365cb5db0d"; + sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "10ecfc7d338462aa350aa957b3ca6c0de5eba93fdd680aa2dc406bbc0cbad821854c9a45dd12c72403393d7f9447d5dcc86981921f0eab4ce3c06549c642e08f"; + sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/son/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c0cea7d6ca475896c0b2b281a4a0df33311eda128d573b38b89b8f1653596d8d16bba713b8cc8bba267afc2a5cf734aa578532afaa3197cc92c5cd03db030dd1"; + sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sq/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "45191b5974de941748d38ae74e87b135ffc813d5f207219b21469ca7804cb4b6ce9e7fdc1892bc6a6f4fc15d0935a7e770e82baf94f1c31dc77d1108d5f25cba"; + sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e931f1d47644d6a770f193cea61148445d8f43eaf5670d7cc76b3b115db15ccd4fc0938a59e7bce237d2d05a924660a791f4b19d44ccf06572d814a692cb9173"; + sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sv-SE/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "95a8391082341543c2044a72d7f52de39767079957c99ec75c6daf95607877fce0ff1d3c42175964516cf93ff632789647f420687d51e717d3d51a280f5c9272"; + sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ta/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "428e2269126ce169f0e83ba1274d4a11cbad2964dd6bb31e8f3c3afdfd3968fc9a06d0f92a77a0bd745f36810a526a75f8c670489cb8a28bfe086cd04819fb0e"; + sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/te/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "34c0b91b14d70670ed0d1624a5d6b93ead775151b432add41bc13544ac2fc5acdf3ad9f8f26059655effc8f5507081461f737289011b41bb3972edf7dcf933ec"; + sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/th/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "bd7bce3cf04674cd6423fcf7276bbcd3585c061b77c692cf33680f122b09d2c5c29ba0a2d8ec857425d9741ffce1ee23383d35c9b7a620aef5579d59dcbe0049"; + sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/tr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "580604b9e4336aa6eac536d4514a41603890ceb6e9630609b4a36cfb0b34952f3d273ba1d100ea1b5509a6dc8dce9f10a335bf5aee7a0c6b133abaae3c4c7352"; + sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "f6c7a9fe068ce1f760a7ca45a82dc5dd28c7e054823e3b9dacb6d00d628ba56c8b2d831a36237290d8803b3284b90cbd29c3ef685cd0d4973ee338b91ab541d8"; + sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ur/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "41c6ae7d2f80704754865982d4b64252a9a04a222c5cde279708960c8a2c167f68805ca2302a86f03ab55ba93afd069d4c289434dff8ec61b245123347e53e78"; + sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uz/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "5974e06472aa75eb2b9cdf1494d8bdf0f394d5a7493e9f77d631f47dbf0a0047dffda5fdbe23f32dbe65612b9b77caeb7c3f15887cc51fa7c2609d3960b9d32a"; + sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/vi/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5b35c3ab9593074c8f88f2ad34db0e161c075d8b04785ea658a8ba49172707e9776a5882b291645d0aea5e333870723b5fbbe6c7957f7ee02c9674eb237a63ee"; + sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/xh/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "8ae8b2f36cac9e1aac1f44a786d6992ea6b31dd83cfc22d1cfd75d057ae429a35e1d61272aac7ecd24d4dbfd8448f54682388e4e708222d1c2f6c6e54c0b0da8"; + sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-CN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "76e09c7f0835270ed7788330486e1d00d10e8237e5e6b5af9bc2de227fdabb958c697c11f74d7df5b6876339adac09b6bd5e87c9d31b3c7945ffd00ef0d7527b"; + sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-TW/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "87f298e06f0b58500231367da1e9fcf19f39c25cbf2b4d20980f45947539398f6f394833a6baa676c6ea27f87da26e5f211333c76ce91b40e7a3e2a6c6a33fea"; + sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ach/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "3d922035f62c78c21e997f0b9e1265c8f9f8bbcd53d67d7042d8d30d418d54b3bc4f5b8fa056149d8c8dcd54afcae1ba3e418fc0b89ec19b7c3af27239a0d4d9"; + sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/af/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "d85f3a911741b6dceb35ea6f2daab06a6258e66b07b79fa7fba4b1c277ae8debe5fb1c45c3d9eb07b910a172ff94baf6e4520a6fe755cdeaf19204b4dadb1f42"; + sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/an/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f1be5c00436a1b613fe46f5adfc19eafbb0639687346a3939437e10e64a7ba0c94b9656bff988a07210be68c7e57e982e9280aa03a0e69c2cce9f3501846ff20"; + sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ar/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "aa2ce3ec19633a86d998132fe54eba30e52fc29d5b1dcde1c3197aab0bcf0a9f73caac3662d58e5465923edabcfb0559e8f23bff7f13b5cf89a11bde7d4b2eb2"; + sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/as/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "993be32e81700a094358999edc280a0e0999efd1478eb03f0924c0fa6b8c6347e69e0408725b916a80f350d3fe93484bfe83137fc0ba007e7f7a0f41d1c12e60"; + sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ast/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ed49c1ea33b0057a8b6cd406820c788248016bede3983121503a8c5332fb305837add00f7a5c75ea0aeacbda16873cb519980f440d9c11b0b54b01c674832132"; + sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/az/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "f02af6b9865d4f6469f62c1168bc33ac1f2abbd0a238d38524643dc5fd84de4a48b146928ca7c6d82f9db3e55ebbe861c29850a0a3aca3b3c1cea632a6938f0d"; + sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/be/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "5b82b010b2ad960b8281e0cc016f7125bdae1b1f3b93a581998c4ef891ecf49b6b075949420d595ad644aa5c75ac6c552e7d26086b5ee6e807df5179ee6ad36d"; + sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bg/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b404b3f97a9dc8675e701ea2ef8bc0a57b40a2390d98573434fdc82097b12abf28e9179de3cdecd0e3c03f0cf78f47cade1e41795eaafc113ea2c954a197a1e1"; + sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-BD/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "a992b1cd5ae8c2237acc97bd1f7e61dfe2abb3b93c270e64d2ca190d8ebb84c84f8a45de5cfe7eb853f4e3e99d79eb19838c4d0a02c73f13795fbc42e79ec04a"; + sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "4188f40867dc0f23b2c52d59e569b7f030d4392bf7715d35678c69a29b85b0573bc3de6701bc550735881b1055bc66258f4c7090e5f4277ea494a60549ad98d0"; + sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/br/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c69b56c43aea2821d9b085c7be10d3cd8c7f609b8c053d8fe8bbce5f719001e620bc56d1e70fd85c77e01501a0df466cbca62e2e6ecff78196ad91b6c30cd8cb"; + sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bs/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "77dab75b3c10d6ec24ddfa436dc9a6e037da3d692912d0417a6781890eef992cef250e8a38d5c1d03045dec7a073d2658a3d17a1f3e9c6d85a58c93ee7b4e19b"; + sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ca/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7fdf1fa6eb06cc338d06d30e8f1ca432cf1d7930a534c6c613e0f1278ccc70f1e81f74e43cce1e1b865bdcf2b9bf10607d73fb18d51e796c731a735f1e729dcc"; + sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cak/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e4e35ea7e81190343337439a3fc95786f318c1f0dc338f2d816a9845b596473067095d0f3b446087ca8dea98dd2aff4db1c8e9a8c1f8fc5d304644b06e0042ee"; + sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cs/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "48288a7ceb3fbd579511950b9c6d5fc133c1fcea8435994e804ea423e0cbfaf4780fdd6317bfea37a958f800a79b62792e01c7aa25a908fe62b21684d6fda060"; + sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cy/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "ae9fc1b0c8d9b46b86b6ec9bcfd97798fbab2410c6ddfab531e364871be70a3a74c48936bfec085220bc5f37397cd83fd31da4a709f337c57a8bd944e635e7c7"; + sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/da/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9ea4433a5c295abba639faed9681d68fb8976b1935a131ab763f6ac12f32afab2c1ead3709ad741e04c005b19fe230e13a93334434c76a033df69d6891f960a4"; + sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/de/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6d864350a270efabd5258157c78ac6b70bb81677939bfd381b6996fb672da240b5c7ef5780819729d3ade763b9eb5a4222c361394e48d9c1c9eafc54795be93f"; + sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/dsb/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "71e5608acee3d2cac48160e71739540c6d94fe5523415d9b639a3b493910347d38f6230afc0febb444e35838e3d402fb5b3018cf437eb48632ca1d8b873ce0e9"; + sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/el/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "37ec4073075a29403e4637b48a74bed5c470ad9722c28cfc3e1d7aa5bb63034a0660fcdd2f78d8681ad21b569bc9060be05f4e1cd3eaa3d347ba0d2304075eba"; + sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-GB/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d2731ba3dad5298e07edb49b608f04784312e6d7e0d1219eb45dfd38a65ef62c1f9b94eff5f97bf35d75ba36cce8a831db6964251873572edc60656a87ea5ff8"; + sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-US/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d56c62b111bb629a30e9de4098a9bfb11b9b437bab572f3e588f4d565d86979c64ec0bd4be4a54b6c1d2718e5cd91094ea046424c9e85952a4ddac2c5de8fc24"; + sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-ZA/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "5fd28d0239dd61c54a062a0f6efd5d0f406bcb483cbcc111a631199d430839129dcdba84b4da66d35f1c5052d530da07e3bc8fdd7f177a366974bfa54cb3303b"; + sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eo/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "327b89fbc100d238f2c1211752ea1a95d2a5c33cdbf8fba35b44ff52f2b63f2d05d84c4c714090693df28c0057e29d047278fef6d4f7e5989ec207495bac3134"; + sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-AR/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "676b58cde2394983a7be06039fcd1150f6e73c95518f5889702cf71ce780c4994629c5452924354ce9826aa5e0726a5de75321295f55004afd10f727d456659d"; + sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-CL/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "274acb52107294b4a65f22114da6e79d4bcb6b06a126002a371c983a926a2ab9882896439f94ee2d2ded5e5955d42cc4a87fc0f16c8960e42d406b773e2a5fd5"; + sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-ES/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d23192f6cbbad388d8f3183876a176197bd82ea0bd596ef03935eb020d5d6dbb94692335dbfc1b98e63097b7c66521154b0b3d013cc769c83bd48883646e44d8"; + sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-MX/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "48da06b532fa91a6b482b57a8cbbdfe3ee938b353433d22af479786129bed784380134ddebbfdc58bf06f5fb81629ec982ec5e1d9b51e92d75bde44014770fa3"; + sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/et/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "71ec513f6b3dba3145c7b424c8f331c2108d0420a75a91045b4dfa4529448923e3ccc8fcb6b90cc01d8acd18e2164755ace78aae2d8da5eec056222b4dcb1b00"; + sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eu/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b978c35a4ccf0efb9023f22cb05ae9696c94c8a642e3deded9c44900c84d3c0a58cfbce95aaafe7e99ee108db07a6b07a76813f7c2c3d971757eca817dc10ba6"; + sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fa/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a67f89767cbeb3b37012c4a1ee64c53e74b30de6c5a14bce2fca15a16ce11a048ccba4e55f88ce7f2a888b7248df51fcfd03e0b0715e826f6b936db953313994"; + sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ff/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "d7b7d9b86b90d5ca609870313b2533b6feb048060902727ccf34dbbb4f180f7fdd69683e34a7483804a1ba2dae8b264ed3fbff81b065083631b234a2893d4716"; + sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fi/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7c555f5ebe3fd74eb782cf9f3508c9714844cbaaa3520bc1c3b60bc8d2840874850e5f92bbd1db4f2dcc4cfba211f4aba485307f898f0b47d4b9ec93b4346ec8"; + sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "edf4f0669c732312c27aa40f4aca66aa2a676f9b019cf1d35d0deef2ab4d27f5441ca9aafb3ed896e20538f765de4715b67a546e4364f384e05748cd495b3f0c"; + sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fy-NL/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "58238d57335a18e63230fcbc67f83059e2439528f3d0ac508750dcfad4a2c48296e43c53ecc203258f917f87be78fe50dcafaabf88b6183d5d790761bd21a7ff"; + sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ga-IE/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "fe4865df72926342c139309d34c8d42187b39e098848ff32b7a0bfa21798f2d1e6dc0879dcb17ae150d977942f355c532de7d402fca3226010de8812da0ffbe0"; + sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gd/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "68f94b2511f72a2049c07a20d120fe282a6b85a3f4284e9695ab5cbd6eadd4ee1926bcb133fc7f7394d90d2e3b47e2ee75b9860a49229012c208a144fde5e85a"; + sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "24bb4da7b5bd5a8bbb3d5bc8ccdc96ed29d9435ef00c35c70b67e0aec5baacbb910d77daec54fddaae7d68541bf1e9d051f3b1bc80e8467cc78f3c503acc0682"; + sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gn/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "24a6a40ecf5f8ca418c83c828cdc6905ed43afe137a0d59b036e68c093df3d8be679c64d06a71973a891d5765f9c366252959d6c95cfc8a5e9b5b145999526df"; + sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gu-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b36047e9e9957002d33be2c540104dc530d010a646ab8d8516ecffde0b89b9a6f82bf8b94bb3f55fafb002b5c39437b7941d5fb2a0cfdccc5159c2013db1b058"; + sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/he/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "c4d0195f72ee0afd3aa746d0a1ae5f0f7ef58646f6b4e7bffff8b1c4ac863275881c29fb7cca09ff12765e9902a6bf9404f11b45399919c9873758bbae8d017f"; + sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hi-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7bab64a89c03e37add1c6d45756acc3ba19751313f212f3069b9c1938f7533ad1d0cb99b7bca392bb5598e2c10b461f79a47b45dbb77285f7afe12f5de781e94"; + sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "aa68496e4e82fa5f491b0df056460ab3169be81869248fff0d3ce2a180c9b9963edfbfbe5b051846302ab713f436836dc63d40f65ac10ab185bc12e5942fc71b"; + sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hsb/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "89640b9df29c1fa946351fb74ca61e6f318ac190976f75b73aa56c66f2a67ef88b64c663cbdeea86c30c6644cf7870b59c2f9fa479ac6557e368dd486fbc4a34"; + sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hu/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "46a6cdddc77b1d29bf85b40e6e33ab0d6b11a72d425ff59e9156cae7548288f02e3e1a54d296e4e1df1efc1e8e3c252a955c2a5be8bcb9e22d9d0e6e6b12d08e"; + sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hy-AM/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0697f146aa1e7d0d4aa8be28b72a642c66a15d7e6a2208a4d704ee8559f4f814a8a6cf601c58a7516816c86a374bca5f755d30e11ca668d9f77c8ea4e388f204"; + sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ia/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "107bdfde5633415250fa0cd34ecf29dc39bceb8a5762445b9b5429f4c83690193fe433128799446029f458492d4bb2fea27d7654dcba5a7ce3007bcf40052ff2"; + sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/id/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "6935a4805b0498d5246f73720e02a022665fa40750937d31ba35d887ab289bcfc65fd122e6c18297443a6488a92a983e00844d384611e04e2e947d20a1aa82a5"; + sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/is/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f04f5a86e348802e38593a0c6868a1f0c534113d4511a35ad4e831a2b3d00d8d9f7522e9813230e2abe710708d61c502337de031f934813275e0d81eea8b0379"; + sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/it/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c0db0620e0df091f31ff576d5c87004f4c283a7455afb0098a5de50cfc8bb7879ece4d8525ec1c7f4d0af9d7934d254f114cbded07c8a93126cc6b35d6058f61"; + sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ja/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "8a705718db55246b74ec0d1baa30e82c18b5898151d4b0ffa7f888cd53cf704444627c47a00af70eb381f9d5e4d163119ac57b23eb316524a4f949a722809d6a"; + sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ka/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6c0c0f2b67f327e03d874ea02fd084caac2756c21838c9787a03213961bc585db5bb0f2eb068a714dcc028a7d503836f1e7f652f60e08c0e9ab45f496e53b780"; + sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kab/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "381d4835f2dfc3a3a553d228e821daaa6966efcb47ca5d7a625813d59db8081a81a46dfd2f246842c937f75121585124c0e7607a9bd0cafb59ab42d88a2c908c"; + sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "82f0e6cbbc9a686be9bf76a0c582800f75edd3f608671faceb813addc0e2fb66a631082e083016118dd3aff8775432ef566319cf9834a8aaa09ed6f774ddc34d"; + sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/km/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7b1e81cf13051609897ad632afa18709dc6d9bbc66a6b7289188abe2f04a9bd1be159aa08342ce746930fc0cb50b19f0ff8abbea695787433acd25ad1cb48c58"; + sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kn/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c17d8eba5bd0c1923f958dbde4a2fca62c423213b249fa1e2829361ade947aad32cdbe257cccf5d5160dd36033e827a78c6934db6bf96f166152b967a2c5d07d"; + sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ko/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c34c899ed8628829dcfb48b80a8b4022db9fadafc4edac4e227849ee58e06b0a9cd4fe089e080ff65e70177f7068686dab678f2e7b04dafbf1338caaea779b62"; + sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lij/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "be96ae1d90a0e5f2308af47cae8bef7e028f01ef156bbd0497e578a0440a7362b18c63b36806ab4f1f2f1c4f8d6c9e5d9d03593ce38d1271809745cd2b266584"; + sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lt/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b141b12385d040596085c328ce95b4ac741ccaebe1e950f00ebe09e96a2ea5b5ade4c5438f9b622423ef658f84659bab414eb467227cd9a664542fe76471d1f1"; + sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lv/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "ca296c7d74bfb0b4aa59da3f82dfe32b7c6564953c9850513bcb429ad68b6c867112eef7b7a2f9e1eb0bb8b7baa5f0f4caf4c9da311729e21976d70f8847bf44"; + sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mai/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "378b32c8ca6cf0319c54dc239bfcd9edc8b834a5ecbe8c990ff8d7f7f28a89a30c53384c413352219309bf537dc4b0961ec0ea7eb2c1a4977b062c280ec130df"; + sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "7925c3a6beca9e35cf301dc7b4ebb059fc87cd710e0243c71b65c55918d10ada853b4a4b8a1c7aa0e0c89bd8e9cd4414d5a162a430cf2222e3d5c0e824b96c73"; + sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ml/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "aa291245bcd21bd1e1a08f1b84346ec61311df8a9fa6f9b4af5b9cc6fcac6f332472cfe009f02faa9d842383c5e0588dd7705eaffb37c030f5e20951a4c0b2f9"; + sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3bf781cc015ff35393f2d30244bc7a8c32a0ac789b0eb9da9616b1d58bb211982db2b03873a91d500f3972d0ddc32383a8e77af4b2f453d2fb8dccb71c7532c4"; + sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ms/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "705665d30a04883d1fe5791348edc2fe0aa1554cbf2932901b99ef1f4334a1ea9658574fc02c05ee64f6b2e3e8d487b8520b1f1963f285f6475af1334160e5b9"; + sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/my/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b1272fc81d358c3386cbdebad0595c7595b1d16dcee3fdef5f49776d6607f8737bdd4807140989e16873455df4a8746e00b8d3548f60cc9b22c282a5cea5a136"; + sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nb-NO/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b44fc5f73c1dc3625ce50c9f6058f56f874a91e04178bb179667c6fde462a2436c6b35d58155ccabf340742f03d0ac1470b56fba405a13caaec4075567b3b8c7"; + sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ne-NP/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "bb063e310856adfbf3fe433d60d4fa19e8d5ace617064d334faa595cffc77d39d4e4e303b82858af8a956d43956928c7fcf70f319ce4059dae9b750d46ee3cf7"; + sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "64f3cfc10133c3fb0e566422282764679f9d1587b1aa742f24e9ba77f1f45e2c1dde4cb9b97d0eb3895b745cf2037a6dda9bcec469fce3b1ee125967f2869380"; + sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nn-NO/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "621c8767c5874fe530a0b4775df12be89c778915ba1f0d46271390c2208672d4211a9de501449458e88429483bf1ce453db652256c59308b3d42aa294d36649b"; + sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/or/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3c271c3e01611d8e046d44fc90ea3a13cc974ad3fe08aeb1c3fa5f18f104dd1481a5a5c9273bf21a29b7aa15f49791584b32bacd26063ffde1ea4846166d4225"; + sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pa-IN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b0f6248a44d247c7affc35c2c4e664620e6ad5b83c4135d66f803245180052e77fa84db9d05b96475a221d5c2c288b73ad23cd7c717cabf2557282d72731cf4e"; + sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "75726fff593b0143a192cf3947f6c83a30c77552b227ccf2e5d0869b7a48dde22b1d555fee3baae8398b5cab58e1523ba7e15db6e237ece085b920f5fbbf4094"; + sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-BR/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "701ffb3a4dd31cb6cf50a5523a384f222b6578c2d2a2870dc1e1cd985137dc9b78e81de092b1ebaee0108164bebc94aa1a8ea12981c02d49f885d8d6c9c8281c"; + sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-PT/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a978e219a044b3e507ff5d907626939f8f9d0c3c988662ccdf394e613ca1127b2714c9973d90bd7d835e2af574d115b495c277f2d668142155b54e9098a285ae"; + sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/rm/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f0f3d5e022793bc92cc84fa5f8b413fc1ae1ec9da126386283297b41e47d722b4399722f69a05aac216d46d1a1ee90a1b6fb57194284c157e68c84121d4d989c"; + sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ro/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4995938aeb22e69a6cd8a6b37b479e9d23a140b73ce2e5c4e29e6ff4f34d702db426346a596e207c2dd2e4d1bc6f1dfea00bc7ab7a2eae763ffe9fcfbf3e00b5"; + sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ru/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "32ab4f1bca6a51d204c54f4485d9642e8ccbebc008cd56e0cba55ea3a5ae5aebca050fe1e8e2b2a7fdf04480ecbab04515c0944c0d5aae0b81e350370cc2cabd"; + sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/si/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c2407c652b1907b3508f655c1bc831ecda75b8135dbfcaa1aed1a509a65fe2f21f22720bc80fdceede1e77c86fe39d0badf8d23f37ae48310df132c115bca448"; + sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f2a99e4f688a3384d23d36a87017ba0b5f28bfef2152867f8e8c8ca134a26e26052339c6edca1c24dfe5db5ce09d194675cac364a4918e46ae765d30ae3ab8d0"; + sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sl/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f454a9cf5a2e1528a546a82d6c2a1f4f2a668bd2b56633216d3955ec5c1c89d8734d8cdb0ee9306698aaa5060bc5f4797a9e0fa1c8967a00fd204eb035a8ba29"; + sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/son/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "4b020b9c0f6e9bd594afc47900025dbd2223e50668f9f43f139b00f5534487806810bc933ab0258f5fcc8c277f7c5d2411d8605dd0fbae893f5809f9cc400c22"; + sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sq/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "959f10db2a46cd8616686618d55119b01f0ac8e00e79093a949788ac903b6d3845a919a420d7517813e28b1227bd6f70fe8be9df39de8406743ddd7c65865e28"; + sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "407e9337429d644ed75d3b2ae4953c5da3c6994e2f2ef2320becbde68662f16c711c987d4dfe2f0a784833b3c721c62cdd0080cdc1ed45a099b0c7b256411b85"; + sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sv-SE/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f59c60fbeb82cb56ddd447d4c3d4125ea3a98e95a74e7802d73eac25489f2acd4566e01397b9ee6c70260779bb895fb104ace61f2ce9268b4f3f3758d686de1b"; + sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ta/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "3ddc5a37d37a7db421f46d1d66d52197473f0e73c5c633ae52f12caa473ad5a4e73612a57bfc8d5d212c2b573b8308fb1b7697f78e153094230f8da64f074b64"; + sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/te/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "c60cd73ec1eb27f9ab5e4ea63d3b4dc691c5c85d57a486ea408cda99f0c44c6c17e7d8e2a1de585dab1d4717bcdd7417b38b785c6f37722a3056a701163917b8"; + sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/th/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0ec9c7b5143268d1266e939e5ed2617edf41c99e5bddf2d4240f49b1ee2822c4c6b269a24aa607623bc82a54b501cebc1f924a9c87fac21f95108089495414f6"; + sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/tr/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ecf26013bc9cc189c89780c4b8b01c4f25dbc8f3f6c7bf924f528fe06ebf8c4952133e8446b3e0c8a09e3fa9d84b09883b3d4665d27ca7c028d90d3fe3d7fc1b"; + sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uk/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c8595f21e86c4d1124b882ae4f1be026756b7cecb3ed5a02b4c723c37a999e2829881fab5d6349485078965881a91cfaf28bc926b5e96245e1771a9160adec76"; + sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ur/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "8d7be769c17135ad58a120cba472565597ddf05893f061e1efe2d2cf57c79bd8ec6f6a55e3271773fbc6a452e1794979cc619cc1a41d1bb13670b4f1badf4bb6"; + sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uz/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "cd75b674a8ff62be2abc78cfa25873950914a7ef0fb6b652c483486c8dec888bed9276c2c7b323e5787ce802583e1d140d9414e7af9ce3ffc736e38fb1521177"; + sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/vi/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c5f9cb57563ff819236358c0ad18992f2c3f8b80decf690ec3945b029e2dbd6bc6f564af2a5bb6394eddb8a52ed0a0cab446cbd9c49284de821a814b766b60b0"; + sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/xh/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9f96977530f745eeb1cdb14b40bf657e9a3d9e322b250fab799b37d801665fa47a47aa88c1f28998a29ed69523e42f300b69e008f5d2ff7f166e12b3c1fb4497"; + sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-CN/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5f3cbcfad55017b30e72ec4fb266d5b9f822804cee329c67c5998ad44a9fb6852b32764179586862cff1dc311c9a9a84259894282d57b5d2146c1d4de86442e4"; + sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-TW/firefox-59.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3f48bc028239f8cc8bf2f818129b1509f0e8d895087e8e7b16375df447e0d0ba7b543679a808aa579fc92bf2fc4af6c3797eacf03c905ce3714eed897a8b8f86"; + sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 19a16dfe3a22..07495e7d4707 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -18,10 +18,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "59.0.1"; + version = "59.0.2"; src = fetchurl { - url = "https://hg.mozilla.org/releases/mozilla-release/archive/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2"; - sha512 = "3da3gmfv2aalsbsx15csas4mwnvlliy1q081sd2riz3nvxr7qyrdx1qvxj4gdr97wlmvz7mig9djhh5gwx7ddah5hfhj23cvccmw6jw"; + url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2"; + sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv"; }; patches = nixpkgsPatches ++ [ @@ -41,10 +41,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.7.2esr"; + version = "52.7.3esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395"; + sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw"; }; patches = nixpkgsPatches; @@ -136,9 +136,9 @@ in rec { src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.7.0esr-7.5-1-slnos"; - rev = "211b2be3fea45a450915b0addcd7783aa939e24a"; - sha256 = "18gv4r8cjf89mamjh93a856a5yfp7dm3jrk8g05w89vxb3lrl74v"; + # branch "tor-browser-52.7.3esr-7.5-1-slnos"; + rev = "62e77aa47d90c10cfc9c6f3b7358a6bdc3167182"; + sha256 = "09pyqicv6z0h4lmjdybx56gj3l28gkl0bbpk0pnmlzcyr9vng7zj"; }; patches = nixpkgsPatches; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index cf5405a4a071..8f07415db5f2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -30,7 +30,7 @@ let }: let - cfg = stdenv.lib.attrByPath [ browserName ] {} config; + cfg = config.${browserName} or {}; enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; @@ -132,7 +132,7 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \ + ln -s "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" done fi diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index f097d748d48c..7c007e228f81 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.14"; + version = "2.15"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp"; + sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix new file mode 100644 index 000000000000..7142ba6140b4 --- /dev/null +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper +,help2man, lua5, luafilesystem, luajit, sqlite +,webkitgtk, gtk3, gst_all_1}: + +let + lualibs = [luafilesystem]; + 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 lualibs); + luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs); + +in stdenv.mkDerivation rec { + + name = "luakit-${version}"; + version = "2017.08.10"; + src = fetchFromGitHub { + owner = "luakit"; + repo = "luakit"; + rev = "${version}"; + sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r"; + }; + + nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper]; + + buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + ]; + + postPatch = + #Kind of ugly seds here. There must be a better solution. + '' + patchShebangs ./build-utils + sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua; + ''; + + buildPhase = '' + make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1 + ''; + + installPhase = let + luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; + in '' + make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install + wrapProgram $out/bin/luakit \ + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ + --set LUA_PATH '${luaKitPath};${luaPath};' \ + --set LUA_CPATH '${luaCPath};' + ''; + + meta = with stdenv.lib; { + description = "Fast, small, webkit based browser framework extensible in Lua"; + homepage = "http://luakit.org"; + license = licenses.gpl3; + platforms = platforms.linux; # Only tested linux + }; +} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 7d69c03ea366..162dd88054c7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "29.0.0.113"; + version = "29.0.0.140"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0" + "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p" else - "0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7" + "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh" else if arch == "x86_64" then - "18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4" + "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7" else - "06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy"; + "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index fead4cb9fad6..42d7aa2f56f0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "29.0.0.113"; + version = "29.0.0.140"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc" + "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5" else - "17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348"; + "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 93cf220e4996..0a8efb3aace9 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, openssl, gst_all_1, fetchFromGitHub , qtbase, qtmultimedia, qtwebengine -, version ? "0.9.94" -, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" +, version ? "0.9.96" +, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" }: stdenv.mkDerivation { name = "otter-browser-${version}"; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index f3eb38422c69..0c0ef501e996 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.8.0"; + version = "27.8.3"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "0b08rzn50jg59rnjzx6dvsmj5dikfjipnmvhpkimvr38v8q7wdar"; + sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 426d91d34556..2e31f625f2e7 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.2.0"; + version = "1.2.1"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0za0iiljs86y2n4znwk8cgn948xcv8iv80a9qfm87zl18y3ashly"; + sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 1e1ea74b680f..8a8abb42f55e 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.5.1"; + version = "7.5.3"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1c5mrc10gm5nklirzwflg7lrdr1v36354g9lgxnjk432izhwb1s0"; + sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0d274f3qhbf1cid3fmpk9s482bjvgcig3q7gdklv9va89bpxzsa6"; + sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr"; }; }; in diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 33a1e8a5c08e..242abc2ece79 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,17 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "c14-cli-unstable-${version}"; - version = "2017-05-15"; - rev = "97f437ef5133f73edd551c883db3076c76cb1f6b"; + name = "c14-cli-${version}"; + version = "0.3"; goPackagePath = "github.com/online-net/c14-cli"; src = fetchFromGitHub { owner = "online-net"; repo = "c14-cli"; - inherit rev; - sha256 = "1b44bh0zhh6rhw4d3nprnnxhjgaskl9kzp2cvwwyli5svhjxrfdj"; + rev = "${version}"; + sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix new file mode 100644 index 000000000000..7fd4cd9fa824 --- /dev/null +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -0,0 +1,28 @@ +{ darwin, fetchFromGitHub, rustPlatform, stdenv }: + +with rustPlatform; + +buildRustPackage rec { + name = "click-${version}"; + version = "0.3.1"; + rev = "b5dfb4a8f8344330a098cb61523695dfe0fd296a"; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "click"; + sha256 = "0a2hq4hcxkkx7gs5dv7sr3j5jy2dby4r6y090z7zl2xy5wydr7bi"; + inherit rev; + }; + + cargoSha256 = "03vgbkv9xsnx44vivbbhjgxv9drp0yjnimgy6hwm32x74r00k3hj"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with stdenv.lib; { + description = ''The "Command Line Interactive Controller for Kubernetes"''; + homepage = https://github.com/databricks/click; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.mbode ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 3ce056c1e11e..0f232772f076 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -13,17 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ go ]; - outputs = ["out" "plugins"]; - buildPhase = '' patchShebangs build.sh ./build.sh ''; installPhase = '' - mkdir -p $out/bin $plugins + mkdir -p $out/bin mv bin/cnitool $out/bin - mv bin/* $plugins/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix new file mode 100644 index 000000000000..9f6b6fcb7e11 --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + name = "cni-plugins-${version}"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "containernetworking"; + repo = "plugins"; + rev = "v${version}"; + sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + patchShebangs build.sh + ./build.sh + ''; + + installPhase = '' + mkdir -p $out/bin + mv bin/* $out/bin + ''; + + meta = with lib; { + description = "Some standard networking plugins, maintained by the CNI team"; + homepage = https://github.com/containernetworking/plugins; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix new file mode 100644 index 000000000000..d24c307fcce5 --- /dev/null +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "heptio-ark-${version}"; + version = "0.7.1"; + + goPackagePath = "github.com/heptio/ark"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "heptio"; + repo = "ark"; + sha256 = "0j3x9zxcffxhlw0fxq2cw9ph37bqw90cbmf9xshmnj8yl9rbxp7y"; + }; + + postInstall = "rm $bin/bin/generate"; + + meta = with stdenv.lib; { + description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = https://heptio.github.io/ark/; + license = licenses.asl20; + maintainers = [maintainers.mbode]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7f03831ff1d4..2b5554353270 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin" + mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" "$man/share/man" "$pause/bin" cp _output/local/go/bin/* "$out/bin/" cp build/pause/pause "$pause/bin/pause" @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl + $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl ''; preFixup = '' diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 68c66d78de1c..961c0afc5c50 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -4,6 +4,7 @@ , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook +, withJava ? !stdenv.isDarwin }: let @@ -46,11 +47,13 @@ in stdenv.mkDerivation rec { autoreconfHook ]; buildInputs = [ - makeWrapper curl sasl jdk + makeWrapper curl sasl python wrapPython boto setuptools leveldb - subversion apr glog openssl libevent maven + subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ libnl + ] ++ lib.optionals withJava [ + jdk maven ]; propagatedBuildInputs = [ @@ -181,6 +184,7 @@ in stdenv.mkDerivation rec { "--with-libevent=${libevent.dev}" "--with-protobuf=${pythonProtobuf.protobuf}" "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar" + (if withJava then "--enable-java" else "--disable-java") ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" "--with-nl=${libnl.dev}" @@ -190,16 +194,6 @@ in stdenv.mkDerivation rec { rm -rf $out/var rm $out/bin/*.sh - mkdir -p $out/share/java - cp src/java/target/mesos-*.jar $out/share/java - - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} - - mkdir -p $out/nix-support - touch $out/nix-support/setup-hook - echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - # Inspired by: pkgs/development/python-modules/generic/default.nix pushd src/python mkdir -p $out/lib/${python.libPrefix}/site-packages @@ -218,6 +212,16 @@ in stdenv.mkDerivation rec { --old-and-unmanageable \ --prefix="$out" popd + '' + stdenv.lib.optionalString withJava '' + mkdir -p $out/share/java + cp src/java/target/mesos-*.jar $out/share/java + + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} + + mkdir -p $out/nix-support + touch $out/nix-support/setup-hook + echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook + echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook ''; postFixup = '' @@ -248,6 +252,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d27693823a61..53b24552d373 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,15 +15,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.9.0"; + localkube-version = "1.10.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh"; + sha256 = "02lkl2g274689h07pkcwnxn04swy6aa3f2z77n421mx38bbq2kpd"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.25.0"; + version = "0.26.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby"; + sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6"; }; patches = [ diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index fdc97733c773..07c9e9ba6784 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,12 +1,24 @@ -{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux +, iptables, coreutils, kerberos, clang +, components ? [ + "cmd/oc" + "cmd/openshift" + ] +}: + +with lib; let - version = "3.6.0"; + version = "3.9.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; -in buildGoPackage rec { + gitCommit = "191fece"; + # version is in vendor/k8s.io/kubernetes/pkg/version/base.go + k8sversion = "v1.9.1"; + k8sgitcommit = "a0ce1bc657"; +in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -14,40 +26,53 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r"; - }; + sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; +}; + + # go > 1.10 + # [FATAL] [14:44:02+0000] Please install Go version go1.9 or use PERMISSIVE_GO=y to bypass this check. + buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata kerberos clang ]; - buildInputs = [ which ]; + outputs = [ "out" ]; - goPackagePath = null; patchPhase = '' patchShebangs ./hack - substituteInPlace pkg/bootstrap/docker/host/host.go \ + + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - substituteInPlace pkg/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - substituteInPlace pkg/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' ''; buildPhase = '' - cd go/src/origin-v${version}-src # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub - export OS_GIT_VERSION=v${version} - export OS_GIT_MAJOR=${versionMajor} - export OS_GIT_MINOR=${versionMinor} - make build + echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs + echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs + echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs + echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs + echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs + echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs + export OS_VERSION_FILE="os-version-defs" + export CC=clang + make all WHAT='${concatStringsSep " " components}' ''; installPhase = '' - mkdir -p "$bin/bin" - cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" + mkdir -p "$out/bin" + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + ''; + + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 99b7566fc713..2b36d7c5647a 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, jre, pythonPackages +{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils , RSupport? true, R , mesosSupport ? true, mesos , version @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)" + substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname done ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java ''; diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix new file mode 100644 index 000000000000..34a3be55f305 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix @@ -0,0 +1,47 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: + +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins (old: [terraform-provider-libvirt])) +# +# configuration.nix: +# +# virtualisation.libvirtd.enable = true; +# +# terraform-provider-libvirt does not manage pools at the moment: +# +# $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images +# $ virsh --connect "qemu:///system" pool-start default +# +# pick an example from (i.e ubuntu): +# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples + +buildGoPackage rec { + name = "terraform-provider-libvirt-${version}"; + version = "0.3"; + + goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; + + src = fetchFromGitHub { + owner = "dmacvicar"; + repo = "terraform-provider-libvirt"; + rev = "v${version}"; + sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna"; + }; + + buildInputs = [ libvirt pkgconfig makeWrapper ]; + + goDeps = ./deps.nix; + + propagatedBuildInputs = [ cdrtools ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dmacvicar/terraform-provider-libvirt; + description = "Terraform provider for libvirt"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ mic92 ]; + }; +} + diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix new file mode 100644 index 000000000000..fdf394073ab8 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; + sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix new file mode 100644 index 000000000000..135e5402929a --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + name = "terraform-provider-nixos-${version}"; + version = "0.0.1"; + goPackagePath = "github.com/tweag/terraform-provider-nixos"; + src = fetchFromGitHub { + owner = "tweag"; + repo = "terraform-provider-nixos"; + sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-nixos{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform plugin for outputting NixOS configuration files from Terraform resources."; + homepage = "https://github.com/tweag/terraform-provider-nixos"; + license = licenses.mpl20; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8b3e83ea86fe..5879c0e83974 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -44,6 +44,9 @@ let let actualPlugins = plugins terraform.plugins; + # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries + wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins))); + passthru = { withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins); @@ -64,7 +67,8 @@ let buildCommand = '' mkdir -p $out/bin/ makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ - --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" + --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \ + --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; inherit passthru; @@ -100,8 +104,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.4"; - sha256 = "1r3x7qv0bfsnmj7l3hmsww26rb9hkg361515gpvjjzafz5b7bz0c"; + version = "0.11.6"; + sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index ab00cc7772bf..0a0b20bfd15d 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.8.1"; - sha256 = "127070zsy536pdvjpcj0028iwwrcm4s5gbhvhzxb70fhjvi9sj6v"; + version = "1.9.0"; + sha256 = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv"; }; archive = { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "1.0.2"; - sha256 = "0n8939qai01lrk4kq3w344a73z6bfqbfq9yl28yh93fvmpkv6jz2"; + version = "1.0.3"; + sha256 = "1il8v9zi838naprr8dqzipk6ns71l8vdqidarxklnn8wdwxmacg4"; }; arukas = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.11.0"; - sha256 = "14r54772qi6c73l50f6gp4j08rd03c2h4v1fwcydfc6kyf23f8k6"; + version = "1.13.0"; + sha256 = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny"; }; azure-classic = { @@ -46,8 +46,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.3.0"; - sha256 = "0szw7fmdwy8r99w40z2h7fp5znj8s0ddbcwrgm1g3vdcp757vcg5"; + version = "1.3.1"; + sha256 = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4"; }; bitbucket = { @@ -193,8 +193,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.7.0"; - sha256 = "1q38z3gihsbxlra1vzgsg1ss8q24f5vkj6k8pvvqjb2rzqpkk5cm"; + version = "1.8.0"; + sha256 = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh"; }; grafana = { @@ -242,8 +242,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.0.1"; - sha256 = "0s8h8nxsl07bhvynmgps07giqr2xmxizk1rcx4xivfc3q5mkvnhb"; + version = "1.1.0"; + sha256 = "1lhdmglc6nd24ss7z41qqbpsiy71ajvixhq4pfiq0b19hwj6awgn"; }; librato = { @@ -270,8 +270,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-logicmonitor"; - version = "1.0.0"; - sha256 = "106y74w9nhqs65h26ipyjg636zcrnpn5s8r49sg4kh4ynvnrkv8v"; + version = "1.1.0"; + sha256 = "16blwfbvx80j5s6809wrlfnkq0qvjasz0zi4ykwzvkqxh00igj7r"; }; mailgun = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-mysql"; - version = "1.0.1"; - sha256 = "07lm1la9llp52gfs5wf6kq5rjys9lmd3hl7x5821vz54rakzic6n"; + version = "1.1.0"; + sha256 = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw"; }; newrelic = { @@ -298,8 +298,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "1.1.0"; - sha256 = "0n3bd9fiablhb2zxmlqnidahdqlpj3i7701vi62zds04kcgdkxw8"; + version = "1.2.0"; + sha256 = "1z3knyjn5ymbk4vaja4ka9zn57cgl7vr7hqv6ybqw0q9i2ykaici"; }; ns1 = { @@ -350,6 +350,13 @@ version = "0.1.0"; sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm"; }; + oraclepaas = + { + owner = "terraform-providers"; + repo = "terraform-provider-oraclepaas"; + version = "1.0.0"; + sha256 = "1h66ijnq172zk0bkv68iq0sy5l6jlasa2pi9q8fq54ib9sxnfkk2"; + }; ovh = { owner = "terraform-providers"; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 899c73b9f7b1..996c994cf4cf 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.14.2"; + version = "0.14.6"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "0bnscp0sjnzhnqbm7m5ip6g2608yfvsnr60f03y2qqld8m9wmj32"; + sha256 = "14zg1h76wfg6aa78llcnza7kapnl5ks6m2vg73b90azfi49fmkwz"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 68d2cb48048a..8432a8366b7a 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "628f99e2cda77dd323992ede8b05961b41f4352f"; - sha256 = "0dbr4czbjpnkira9bhackq01s9b13yvw5dscnxi3mr9adb89y9pm"; + rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a"; + sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-version"; - rev = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee"; - sha256 = "0gq4207s1yf2nq4c2ir3bsai29svzz4830g1vbvzdrpis58r1x4m"; + rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"; + sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; - sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda"; + sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "b89eecf5ca5db6d3ba60b237ffe3df7bafb7662f"; - sha256 = "0g946ii8qjaynvidj648z8izl91i6yhy0ir6g3qsrn136im3r8wk"; + rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; + sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; }; } { diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix new file mode 100644 index 000000000000..749b94f7b7ec --- /dev/null +++ b/pkgs/applications/networking/compactor/default.nix @@ -0,0 +1,52 @@ +{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: + +stdenv.mkDerivation rec { + name = "compactor-${version}"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "dns-stats"; + repo = "compactor"; + rev = "${version}"; + sha256 = "1zn6w99xqq5igaz0n89429i78a5pj4nnfn1mm5yv1yfbn1lm0y3l"; + }; + + # cbor-diag, cddl and wireshark-cli are only used for tests. + nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ]; + buildInputs = [ + boost + libpcap + openssl + libtins + lzma + ]; + + patchPhase = '' + patchShebangs test-scripts/ + ''; + + preConfigure = '' + sh autogen.sh + substituteInPlace configure \ + --replace "/usr/bin/file" "${file}/bin/file" + ''; + CXXFLAGS = "-std=c++11"; + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--with-boost=${boost.dev}" + ]; + + doCheck = true; + preCheck = '' + substituteInPlace test-scripts/check-live-pcap.sh \ + --replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump" + ''; + + meta = with stdenv.lib; { + description = "Tools to capture DNS traffic and record it in C-DNS files"; + homepage = http://dns-stats.org/; + license = [ licenses.boost licenses.mpl20 licenses.openssl ]; + maintainers = with maintainers; [ fdns ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 216569cc8210..56947d6650e4 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]); + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); postPatch = '' chmod +x data/meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox/cli.nix index d3141675b418..d3141675b418 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox/cli.nix diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 8546c5b0a3e8..24fed4ca8521 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "newsboat-${version}"; - version = "2.10.2"; + version = "2.11.1"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1x4nxx1kvmrcm8jy73dvg56h4z15y3sach2vr13cw8rsbi7v99px"; + sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma"; }; prePatch = '' diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index cf41ca1b0b3b..9efe20b3ee95 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -2,8 +2,8 @@ , autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, utillinux, whois -# Just install FireQOS without FireHOL -, onlyQOS ? true +# If true, just install FireQOS without FireHOL +, onlyQOS ? false }: stdenv.mkDerivation rec { @@ -52,6 +52,35 @@ stdenv.mkDerivation rec { AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ '') + + # put firehol config files in /etc/firehol (not $out/etc/firehol) + # to avoid error on startup, see #35114 + (pkgs.writeText "firehol-sysconfdir.patch" + '' + --- a/sbin/install.config.in.in + +++ b/sbin/install.config.in.in + @@ -4 +4 @@ + -SYSCONFDIR="@sysconfdir_POST@" + +SYSCONFDIR="/etc" + '') + + # we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname + # will be interpreted as IFS -> error. this might be considered an upstream bug + # but only appears when there are dashes in the command path + (pkgs.writeText "firehol-uname-command.patch" + '' + --- a/sbin/firehol + +++ b/sbin/firehol + @@ -10295,7 +10295,7 @@ + kmaj=$1 + kmin=$2 + + - set -- $($UNAME_CMD -r) + + set -- $("$UNAME_CMD" -r) + eval $kmaj=\$1 $kmin=\$2 + } + kernel_maj_min KERNELMAJ KERNELMIN + '') ]; nativeBuildInputs = [ autoconf automake ]; @@ -71,7 +100,7 @@ stdenv.mkDerivation rec { FireHOL, an iptables stateful packet filtering firewall for humans! FireQOS, a TC based bandwidth shaper for humans! ''; - homepage = http://firehol.org/; + homepage = https://firehol.org/; license = licenses.gpl2; maintainers = with maintainers; [ geistesk ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 66bf843865e6..74287dc6af4e 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.4"; + stableVersion = "2.1.5"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93"; - serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f"; + guiSrcHash = "1d7pwm36bqjm0d021z5qnx49v8zf4yi9jn5hn6zlbiqbz53l1x7l"; + serverSrcHash = "002pqm4jcm5qbbw1vnhjdrgysh7d6xmdl66605wz1vbp7xn5s961"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index f0b74370c3c7..63dec91dad90 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, pythonPackages, libvncserver, zlib +{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "blink-${version}"; - version = "2.0.0"; + version = "3.0.3"; - src = fetchurl { - url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; - sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05"; + src = fetchdarcs { + url = http://devel.ag-projects.com/repositories/blink-qt; + rev = "release-${version}"; + sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi"; }; patches = [ ./pythonpath.patch ]; @@ -15,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ pyqt4 cjson sipsimple twisted ]; + propagatedBuildInputs = with pythonPackages; [ pyqt5 cjson sipsimple twisted google_api_python_client ]; buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index a60df1ead534..3fd8b932283e 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,6 +1,7 @@ { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook , python, gtk3, gobjectIntrospection -, nbxmpp, pyasn1, pygobject3, dbus-python, pillow +, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow +, xvfb_run, dbus , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly , enableE2E ? true, pycrypto, python-gnupg , enableSecrets ? true, libsecret @@ -16,15 +17,20 @@ with lib; buildPythonApplication rec { name = "gajim-${version}"; majorVersion = "1.0"; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20"; + sha256 = "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c"; }; + postPatch = '' + # This test requires network access + echo "" > test/integration/test_resolver.py + ''; + buildInputs = [ - gobjectIntrospection gtk3 + gobjectIntrospection gtk3 gnome3.defaultIconTheme ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ++ optional enableSecrets libsecret ++ optional enableSpelling gspell @@ -41,13 +47,14 @@ buildPythonApplication rec { ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages pythonPackages; + checkInputs = [ xvfb_run dbus.daemon ]; + checkPhase = '' - ${python.interpreter} test/runtests.py + xvfb-run dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + ${python.interpreter} test/runtests.py ''; - # Tests try to use GTK+ which fails. - doCheck = false; - meta = { homepage = http://gajim.org/; description = "Jabber client written in PyGTK"; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e24ea5e6fb37..dd1ce2264d5f 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.30.3.1670"; + version = "4.30.4.1672"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay"; + sha256 = "1xrwndhbyhcmjcg8h1ib8lp1g51f7jxdhc6p7776zmhlfw94n3rx"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix new file mode 100644 index 000000000000..8405769582f7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchFromGitHub, fetchurl, cmake, doxygen, lmdb, qt5 }: + +let + json_hpp = fetchurl { + url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp; + sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733"; + }; + + variant_hpp = fetchurl { + url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp; + sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq"; + }; + + matrix-structs = stdenv.mkDerivation rec { + name = "matrix-structs-git"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "matrix-structs"; + rev = "91bb2b85a75d664007ef81aeb500d35268425922"; + sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx"; + }; + + postUnpack = '' + cp ${json_hpp} "$sourceRoot/include/json.hpp" + cp ${variant_hpp} "$sourceRoot/include/variant.hpp" + ''; + + patches = [ ./fetchurls.patch ]; + + nativeBuildInputs = [ cmake doxygen ]; + }; + + tweeny = fetchFromGitHub { + owner = "mobius3"; + repo = "tweeny"; + rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf"; + sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi"; + }; + + lmdbxx = fetchFromGitHub { + owner = "bendiken"; + repo = "lmdbxx"; + rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02"; + sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; + }; +in +stdenv.mkDerivation rec { + name = "nheko-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "nheko"; + rev = "v${version}"; + sha256 = "1dqd698p6wicz0x1lb6mzlwcp68sjkivanb9lwz3yy1mlmy8i3jn"; + }; + + # This patch is likely not strictly speaking needed, but will help detect when + # a dependency is updated, so that the fetches up there can be updated too + patches = [ ./external-deps.patch ]; + + cmakeFlags = [ + "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a" + "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs" + "-DTWEENY_INCLUDE_DIR=${tweeny}/include" + "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Desktop client for the Matrix protocol"; + maintainers = with maintainers; [ ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch new file mode 100644 index 000000000000..661ae756a4dd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake +index 3b9817d..e69de29 100644 +--- a/cmake/LMDBXX.cmake ++++ b/cmake/LMDBXX.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build lmdbxx. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx) +- +-set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT}) +- +-ExternalProject_Add( +- lmdbxx +- +- GIT_REPOSITORY https://github.com/bendiken/lmdbxx +- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02 +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${LMDBXX_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) +diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake +index cef00f6..e69de29 100644 +--- a/cmake/MatrixStructs.cmake ++++ b/cmake/MatrixStructs.cmake +@@ -1,33 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build matrix-structs. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs) +-set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include) +-set(MATRIX_STRUCTS_LIBRARY matrix_structs) +- +-link_directories(${MATRIX_STRUCTS_ROOT}) +- +-set(WINDOWS_FLAGS "") +- +-if(MSVC) +- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") +-endif() +- +-ExternalProject_Add( +- MatrixStructs +- +- GIT_REPOSITORY https://github.com/mujx/matrix-structs +- GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922 +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${MATRIX_STRUCTS_ROOT} +- CONFIGURE_COMMAND ${CMAKE_COMMAND} +- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} +- ${WINDOWS_FLAGS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release +- INSTALL_COMMAND "" +-) +diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake +index 537ac92..e69de29 100644 +--- a/cmake/Tweeny.cmake ++++ b/cmake/Tweeny.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build tweeny +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny) +- +-set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include) +- +-ExternalProject_Add( +- Tweeny +- +- GIT_REPOSITORY https://github.com/mobius3/tweeny +- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${TWEENY_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch new file mode 100644 index 000000000000..e2f72f600ed8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 077ac37..c639d71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,16 +18,6 @@ include(Doxygen) + # + include(CompilerFlags) + +-file(DOWNLOAD +- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp" +- ${PROJECT_SOURCE_DIR}/include/json.hpp +- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733) +- +-file(DOWNLOAD +- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp" +- ${PROJECT_SOURCE_DIR}/include/variant.hpp +- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a") +- + include_directories(include) + + set(SRC diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix new file mode 100644 index 000000000000..e41aea497a85 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: + +stdenv.mkDerivation rec { + name = "purple-discord-${version}"; + version = "unstable-2018-04-10"; + + src = fetchFromGitHub { + owner = "EionRobb"; + repo = "purple-discord"; + rev = "9a97886d15a1f028de54b5e6fc54e784531063b0"; + sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin json_glib ]; + + makeFlags = [ + "DESTDIR=$(out)" + ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "/share"; + + meta = with stdenv.lib; { + homepage = https://github.com/EionRobb/purple-discord; + description = "Discord plugin for Pidgin"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ sna ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 460143e35494..e304c139eea5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; - version = "2017-10-08"; + version = "2018-03-28"; src = fetchhg { url = "https://bitbucket.org/EionRobb/purple-hangouts/"; - rev = "5e769791d282a6e5ae4d94dc66a1ff9d6904ec9c"; - sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; + rev = "0e137e6bf9e95c5a0bd282f3ad4a5bd00a6968ab"; + sha256 = "04vjgz6qyd9ilv1c6n08r45vc683vxs1rgfwhh65pag6q4rbzlb9"; }; buildInputs = [ pidgin glib json-glib protobuf protobufc ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 68083a7b9d25..8527593c1a20 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin libwebp libgcrypt gettext ]; preConfigure = '' - sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/pidgin/server.tglpub|g" telegram-purple.c + sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/purple-2/server.tglpub|g" telegram-purple.c echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h ''; installPhase = '' - mkdir -p $out/lib/pidgin/ - cp bin/*.so $out/lib/pidgin/ #*/ - cp tg-server.tglpub $out/lib/pidgin/server.tglpub + mkdir -p $out/lib/purple-2/ + cp bin/*.so $out/lib/purple-2/ #*/ + cp tg-server.tglpub $out/lib/purple-2/server.tglpub mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16 cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22 diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index b47280d3b156..0d3342e66687 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.13.5"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6"; + sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix index f627479a3c04..7d6854460d63 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix @@ -83,5 +83,10 @@ in platforms = [ "x86_64-linux" ]; + # Marked as broken on 2018-04-17. Reason: The most recent version is + # 1.8.0-beta.1, while this is still 1.1.0-beta.5 (2017-12-09). The stable + # package (signal-desktop) should be used instead (currently at version + # 1.7.1, i.e. up-to-date). + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 74f784a1ba1a..d524be287cd2 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.6.1"; + version = "1.7.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0q2qzl84ifnhcn1qbq38fdpj8ry748h6dlzp2mdpkslsh8mc46as"; + sha256 = "02zx8ynbvvs260mrvqbsg0fi561da4ni3i9f4bjh53vqn92vhvvq"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 8cd9eb84b835..fc8a601f1bea 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.17.0.2"; + version = "8.18.0.6"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -57,7 +57,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "0lv8sb49ws8yjh4kkppzqy7sap2b1fw0y13lsc9s45w8mw3l16rp"; + sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index b6f731ee6513..b1339f6a6948 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "3.0.5"; + version = "3.1.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -46,7 +46,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "13im5m119cp5v0gvr1vpxjqskr8rvl6pii91b5x522wm7plfhj8s"; + sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index afba9ab022ad..c47ce04f1f7d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.2.14"; - sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l"; + version = "1.2.17"; + sha256Hash = "1lswjn3rnrbps1pd2xhnhggcn1z0i7y71dpr0v9wb1yc8qhh4pi0"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "310557"; archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 7027e70f0c88..2588340de1de 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -1,7 +1,7 @@ { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }: { mkDerivation, lib, fetchgit, fetchsvn -, pkgconfig, pythonPackages, cmake, makeWrapper +, pkgconfig, pythonPackages, cmake, wrapGAppsHook , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -37,7 +37,10 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ]; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ]; + + # We want to run wrapProgram manually (with additional parameters) + dontWrapGApps = true; buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 @@ -113,11 +116,14 @@ mkDerivation rec { for icon_size in 16 32 48 64 128 256 512; do install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" done + ''; + postFixup = '' # This is necessary to run Telegram in a pure environment. + # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/telegram-desktop \ + "''${gappsWrapperArgs[@]}" \ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \ - --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 40de405e0d2e..2d880bef753e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -2,11 +2,11 @@ , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.18.3"; + name = "telepathy-gabble-0.18.4"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf"; + sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 74c19b07aaa9..4153d527b9ff 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.13"; + version = "0.4.14"; rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "150lhf5999jz0nck5s0fs0fp3pgaj85s7dndh68h9caw1fwpwb4f"; + sha256 = "0gad5y5clkrk5jsjj9gmrlnx8kbn2vg50vka1b8jg7b55hdvvlcg"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "103mlsnqfnnqxh4phr192haaiv98d1bwpvca1sqrxz1216r5x0ik"; + sha256 = "0wvjw8jziwhvfwhksg26qlj2irznl5bs2yll9jkv335pnwb5qi3v"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index b4532c5470b8..4807f3419d15 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ii-1.8"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 97838312fd0b..b03673a00b66 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses glib openssl perl libintlOrEmpty ]; + buildInputs = [ ncurses glib openssl perl libintl ]; configureFlags = [ "--with-proxy" diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 975715ed7fcd..cf72bef62b17 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; src = fetchurl { - url = "http://dl.suckless.org/tools/sic-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index cfed44c997ae..b2ea28f0cf85 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -72,6 +72,11 @@ let meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; + longDescription = '' + You can find more documentation as to how to customize this package + (eg. adding python modules for scripts that would require them, etc.) + on https://nixos.org/nixpkgs/manual/#sec-weechat . + ''; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ]; platforms = stdenv.lib.platforms.unix; @@ -117,4 +122,7 @@ in if configure == null then weechat else export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/weechat "$@" - '') // { unwrapped = weechat; } + '') // { + unwrapped = weechat; + meta = weechat.meta; + } diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix new file mode 100644 index 000000000000..762c6222b58e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, + webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme, + libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection, + hicolor-icon-theme, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "balsa-${version}"; + version = "2.5.5"; + + src = fetchurl { + url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; + sha256 = "0p4w81wvdxqhynkninzglsgqk6920x1zif2zmw8bml410lav2azz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + gobjectIntrospection + hicolor-icon-theme + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + gmime + gnutls + webkitgtk + openssl + libnotify + enchant + gpgme + libcanberra-gtk3 + gtksourceview + libsecret + libesmtp + ]; + + configureFlags = [ + "--with-canberra" + "--with-gpgme" + "--with-gtksourceview" + "--with-libsecret" + "--with-ssl" + "--with-unique" + "--without-gnome" + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://pawsa.fedorapeople.org/balsa/; + description = "An e-mail client for GNOME"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index cd4de0ecd560..95bdb6cb5813 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.0.3"; + version = "1.0.4"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "1k2wgvs17lfxqmk0v7g8cf34h5ahr41vaibgb4a6ixay41hfx06d"; + sha256 = "0i6qmrnga80q8s6dabfgh0fcdnc2wpj948za04zi1ajv4fjwjh0n"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 03bfc711c430..bbd56b188dfd 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1pxmw5yyizb9bqbai6lihv6zxmw0znjfb60zaldwh6hc6lkbzlgl"; + sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index ea7e7ee282d1..7bd0ea70dc63 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180223"; + version = "20180323"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb"; + sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) so we disable them for now. + # that has tests (20180223) as well as 20180323 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { postInstall = '' cp ${muttWrapper} $out/bin/mutt - wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" + wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" ''; doCheck = true; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a3de728ce415..d89219cce5f3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26"; + version = "0.26.1"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k"; + sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; }; nativeBuildInputs = [ pkgconfig ]; @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies postPatch = '' + patchShebangs configure + find test/ -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index d58680d15d5a..22bfddc5b570 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sylpheed-${version}"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "http://sylpheed.sraoss.jp/sylpheed/v3.6/${name}.tar.bz2"; - sha256 = "0idk9nz3d200l2bxc38vnxlx0wcslrvncy9lk50vz7dl8c5sg97b"; + url = "http://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index d527279ab775..7bd50a47f813 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.9"; + version = "0.18.10"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "0n2rgzyxw6m29i8m8agri3cp5dbpjblhhyklvxsyzmkksnsxpw58"; + sha256 = "1bv5aw6fscrwlycirvzm6fvbwmg8lbd1ycldkwbvybhjyfjaxkpm"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index af6a4dfddc1b..d499916c7b6c 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = "Offline RSS/Atom reader"; license="AGPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index b3a1c1a23b37..c03202517747 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; ostinatoIcon = fetchurl { - url = "http://ostinato.org/images/site-logo.png"; + url = "https://ostinato.org/images/site-logo.png"; sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; }; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 4f885116bd82..84ed1ff92591 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.6.3"; + version = "6.6.5"; name = "frostwire-${version}"; src = fetchurl { url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "0n1g0am3d2fxw4a4zzzyif1fal1x3xch9q7743jhkkm3mldl2grw"; + sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 688f908c798c..9f47f8464a13 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tixati-${version}"; - version = "2.55"; + version = "2.57"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w"; + sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7"; }; installPhase = '' diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 59ae225210ca..872d9b018ff7 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib +, alsaLib, ffmpeg, glib, openssl, pcre, zlib , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv , libxkbcommon, libxkbfile , wayland -, gstreamer, gst-plugins-base, gst-plugins-good +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc , libpulseaudio ? null , cups ? null , pcsclite ? null @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { name = "freerdp-${version}"; - version = "2.0.0-rc1"; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn"; + sha256 = "01cm9g4xqihnnc5d2w1zs8gabkv59p7fyjwi1cwpzv6s198xwbfs"; }; # outputs = [ "bin" "out" "dev" ]; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; buildInputs = with lib; [ - alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib - gstreamer gst-plugins-base gst-plugins-good + alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib + gstreamer gst-plugins-base gst-plugins-good libunwind orc libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libxkbcommon libxkbfile wayland diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 0d7bdf970f5b..35926836e30d 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.1.6"; + version = "6.1.7"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "0r02frlspjq8k0zz1z4wh2sx3jm6b1qby5mxg394sb3rjdxb8jhk"; + sha256 = "1wf258sxn4pqdn1xypqwlxbnls771k2c6whpbinpns3knv5zvgaq"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 424c1926f35a..d8ff5f3100ac 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.5"; + version = "2.4.6"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1mvgy67rvnwj2kbc43s4il81jvz5ai0bx2j3j2js7x50zclyrcmk"; + sha256 = "1znmjg40pf81ks9lnm6ilx0cy32xan5g19gbqkkhj35whb95z5lf"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 4f91a2b24e95..c1f3d62af737 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -12,8 +12,8 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Spideroak client for: ${stdenv.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "993e01986e3657d6fa979b8d0f45ac25b8223c18f75555016a9f92e651e91b1f" - else if stdenv.system == "i686-linux" then "d12c09c3a01bfa48bdecc8763bbf2c7f10b71cea5bcecc177dad031ba79bc83d" + sha256 = if stdenv.system == "x86_64-linux" then "a88e5a8fe4a565ac500668bd53cf5784752d7c9253304ddce39ee7b01d078533" + else if stdenv.system == "i686-linux" then "668f3b83a974a3877d16c8743c233a427ea0a44ab84b7f9aec19a2995db66c16" else throw "Spideroak client for: ${stdenv.system} not supported!"; ldpath = stdenv.lib.makeLibraryPath [ @@ -21,7 +21,7 @@ let libX11 libXext libXrender zlib ]; - version = "7.0.1"; + version = "7.1.0"; in stdenv.mkDerivation { name = "spideroak-${version}"; diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index ef8f02827498..b8f388c63eb5 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }: stdenv.mkDerivation rec { - inherit (backintime-common) version src installFlags meta; + inherit (backintime-common) version src installFlags; name = "backintime-qt4-${version}"; @@ -22,4 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${backintime-common}/bin:$PATH" ''; + meta = with stdenv.lib; { + broken = true; + }; } diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index e41671f23604..4eecf7f4a1f8 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.5.2"; + version = "1.5.3"; format = "other"; src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.5.2.tar.gz; - sha256 = "0a7lqq3y53ag5hzkkjpz61gfmglf3w1kpvyynhq2514fn9rnwsla"; + url = https://github.com/Syncplay/syncplay/archive/v1.5.3.tar.gz; + sha256 = "1yk0aajskhk6czpjshf9a9pzp3rafh5cgdcyyz8pwpk4ca9zyzfv"; }; propagatedBuildInputs = with python2Packages; [ pyside twisted ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index d79396f3b1d7..531a1d5d0a17 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, patches ? [], postInstall ? "" }: stdenv.mkDerivation rec { - version = "0.14.45"; + version = "0.14.46"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0hhldmvsbvkaj0x6af7c41zq5mbzcymv5xxmwvb4h5zbz49z9vzl"; + sha256 = "0lv8n5id40iy2gfccy8g45fjzlnbnvi7nlvj25pri22dq2bd5svm"; }; inherit patches; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 8ac2f7b0a3b6..5a548d5ff65f 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgs }: +{ stdenv, fetchFromGitHub, makeWrapper, lib +, dnsutils, coreutils, openssl, nettools, utillinux, procps }: let - version = "2.9.5-2"; - pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; - opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; + version = "2.9.5-5"; in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; @@ -12,26 +11,32 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w"; + sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r"; }; - nativeBuildInputs = with pkgs; [ - makeWrapper + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + coreutils # for pwd and printf + dnsutils # for dig + nettools # for hostname + openssl # for openssl + procps # for ps + utillinux # for hexdump ]; - patches = [ ./testssl.patch ]; - postPatch = '' - sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ - -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ - -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \ - testssl.sh + substituteInPlace testssl.sh \ + --replace /bin/pwd pwd \ + --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" ''; installPhase = '' - mkdir -p $out/bin $out/etc - cp -r etc/ $out/ - cp testssl.sh $out/bin/testssl.sh + install -Dt $out/bin testssl.sh + + wrapProgram $out/bin/testssl.sh \ + --prefix PATH ':' ${lib.makeBinPath buildInputs} + + cp -r etc $out ''; meta = with stdenv.lib; { @@ -42,6 +47,6 @@ in stdenv.mkDerivation rec { ''; homepage = https://testssl.sh/; license = licenses.gpl2; - maintainers = [ maintainers.etu ]; + maintainers = with maintainers; [ etu ]; }; } diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch deleted file mode 100644 index d5269c737084..000000000000 --- a/pkgs/applications/networking/testssl/testssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- testssl/testssl.sh 2017-09-24 16:53:29.395263437 +0200 -+++ testssl-new/testssl.sh 2017-09-24 16:53:41.221154492 +0200 -@@ -165,6 +165,7 @@ - # following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host> - # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help - declare -x OPENSSL OPENSSL_TIMEOUT -+OPENSSL=${OPENSSL:-""} - FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production - COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all - COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index ea503b8df9bd..8dd127715aeb 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi +{ stdenv, fetchurl, pkgconfig, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, makeWrapper, iconTheme +, boost, libxslt, goffice, wrapGAppsHook, iconTheme }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.0.2"; src = fetchurl { - url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; + url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; }; @@ -22,19 +22,16 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = - [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme - ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - postFixup = '' - wrapProgram "$out/bin/abiword" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ + gtk3 librsvg bzip2 fribidi libpng popt + libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme + ]; meta = with stdenv.lib; { description = "Word processing program, similar to Microsoft Word"; - homepage = http://www.abisource.com/; + homepage = https://www.abisource.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ylwghst ]; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 9eec315217cb..cfd7a4eda202 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 1004733a18b5..813608a386a4 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.2"; + version = "1.9.7"; src = fetchurl { url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; + sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fdbf9183d751..9c8f39d52f1d 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,12 +5,12 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.6"; + version = "1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0iif4imx76ra0lsisksrq5vf54wbivnrb3xqz6mkx9lik3pp5sbx"; + sha256 = "c4eba4203bddaa7bc9d54971d2afeeebab0bc80ce89be1375a41a07c4e82b62f"; }; doCheck = false; @@ -23,7 +23,7 @@ buildPythonApplication rec { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 60c8b0280a14..badc02a36463 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -9,11 +9,11 @@ let isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; }; isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; }; in stdenv.mkDerivation rec { - name = "gnumeric-1.12.38"; + name = "gnumeric-1.12.39"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65"; + sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f"; }; configureFlags = "--disable-component"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7da7a6bf7342..89af45814bff 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -269,7 +269,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; passthru = { - inherit srcs; + inherit srcs jdk; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 866b8e923378..b4139d54af50 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -2,7 +2,7 @@ , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis +, icu, boost, jdk, ant, cups, xorg, libcmis, carlito , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr @@ -106,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i<include>${carlito}/etc/fonts/conf.d</include>' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name @@ -261,7 +266,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; passthru = { - inherit srcs; + inherit srcs jdk; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix new file mode 100644 index 000000000000..8566bd76e1e2 --- /dev/null +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -0,0 +1,16 @@ +{ libreoffice, runCommand, dbus, bash }: +let + jdk = libreoffice.jdk; +in +(runCommand "${libreoffice.name}" { + inherit dbus libreoffice jdk bash; +} '' + mkdir -p "$out/bin" + ln -s "${libreoffice}/share" "$out/share" + substituteAll "${./wrapper.sh}" "$out/bin/soffice" + chmod a+x "$out/bin/soffice" + + for i in $(ls "${libreoffice}/bin/"); do + test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" + done +'') // { inherit libreoffice dbus; } diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh new file mode 100644 index 000000000000..52cd91e8030e --- /dev/null +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -0,0 +1,18 @@ +#!@bash@/bin/bash +export JAVA_HOME="${JAVA_HOME:-@jdk@}" +export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" + +if uname | grep Linux > /dev/null && + ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then + dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" + mkdir "$dbus_tmp_dir" + dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" +fi + +"@libreoffice@/bin/$(basename "$0")" "$@" +code="$?" + +test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir" +exit "$code" diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index c5dc9198740f..7f6d93a11ae2 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "06kka6kxrj35w23n34in6ks3vax9arl756jg720jhfy14vavyk0f"; + sha256 = "0pljjkis9vb819d0akqmqnyakwgnvc3qqyg20yr13xms9a5iqv32"; }; sourceRoot = "."; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index ba136f415f29..cd83205172bf 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, - cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee, + cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info @@ -19,11 +19,19 @@ mkDerivation rec { ]; buildInputs = [ - qtwebkit qtscript grantlee kxmlgui kwallet kparts + qtwebengine qtscript grantlee kxmlgui kwallet kparts kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx ]; + # SKG_DESIGNER must be used to generate the needed library for QtDesigner. + # This is needed ONLY for developers. So NOT NEEDED for end user. + # Source: https://forum.kde.org/viewtopic.php?f=210&t=143375#p393675 + cmakeFlags = [ + "-DSKG_DESIGNER=OFF" + "-DSKG_WEBENGINE=ON" + ]; + meta = with lib; { description = "A personal finances manager, powered by KDE"; license = with licenses; [ gpl3 ]; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index be5ac7a2f2be..8efe9b368a07 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Text-based word processor"; homepage = https://cowlark.com/wordgrinder; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 328253c53437..589625cc18f9 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -56,12 +56,10 @@ stdenv.mkDerivation { patch -Np1 -i "${gcc47Patch}" ''; - configureFlags = "--with-gtk --with-lua=${lua}"; - CPPFLAGS = "-DNDEBUG"; - CFLAGS = "-O2 -fsigned-char"; - CXXFLAGS = "-O2 -fsigned-char"; - GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; - GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"; + configureFlags = [ + "--with-gtk" + "--with-lua=${lua}" + ]; installPhase = ''make MKDIR_P="mkdir -p" install''; @@ -69,7 +67,7 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; - homepage = http://www.shatters.net/celestia/; + homepage = https://celestia.space/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 5e899568a7df..1ad1647c70e5 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, bash }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1l82sgw86l1626b7kxv3h0696lbj7317bb48rvqb1zqd3gcn6kyx"; + sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa"; }; - nativeBuildInputs = [ perl ]; - - buildInputs = [ htslib zlib bzip2 lzma curl ]; + buildInputs = [ htslib zlib bzip2 lzma curl perl python ]; makeFlags = [ "HSTDIR=${htslib}" diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 853203e7dbb1..bf963958406d 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.9"; + version = "2.4.10"; src = fetchurl { url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "0acyq7602g2pz6mc9ip1297c68kgl9pq9yzk3k2lli9l5qvxi3g1"; + sha256 = "1wyv3ny06m6ipb83hi3pzcc50v49zms69c5714iixh0nqpd826f2"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index ddcfbf00bf9e..3fc84228efe9 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.17.11"; + version = "2.18.1"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1p50bzkwq5hrwal6i679yrkdqkh5hk4bb9l9gdff2x2i761v9y9b"; + sha256 = "0wcihlgaif79r0fa47kq77igxzq0lpyn74414v9n6k9rl5nj8x1a"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 365057414e99..87e708526ef7 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "e7b09673176aa32937abd80f95f432809e722f141b5342186dfef6a53df64ca1"; + sha256 = "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 4da7f0f608f7..671c53365aba 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.87"; + version = "3.3.89"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0yjvxvqdl276wv0y55bqxwna6lwc99hy6dkfiy6bij3nd1qm5rf6"; + sha256 = "1j7byy0kmapa66dp17gjvs4pa4gckjccljydixswdknpxs5ma45g"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index 21eddde82672..7209ee3edf60 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -3,10 +3,12 @@ , doxygen, pcre, libpthreadstubs, libXdmcp , oceSupport ? true, opencascade_oce -, ngspiceSupport ? true, ngspice +, ngspiceSupport ? true, libngspice , scriptingSupport ? true, swig, python, wxPython }: +assert ngspiceSupport -> libngspice != null; + with lib; stdenv.mkDerivation rec { name = "kicad-unstable-${version}"; @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost ] ++ optional (oceSupport) opencascade_oce - ++ optional (ngspiceSupport) ngspice + ++ optional (ngspiceSupport) libngspice ++ optionals (scriptingSupport) [ swig python wxPython ]; meta = { diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 114a2eea85f5..96025e8faa62 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}: +{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}: stdenv.mkDerivation { name = "ngspice-27"; @@ -8,15 +8,16 @@ stdenv.mkDerivation { sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c"; }; - buildInputs = [ readline libX11 flex bison libICE libXaw libXext ]; + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline libX11 libICE libXaw libXext fftw ]; - configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ]; + configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = http://ngspice.sourceforge.net; license = with licenses; [ "BSD" gpl2 ]; - maintainers = with maintainers; [ viric rongcuid ]; + maintainers = with maintainers; [ bgamari viric rongcuid ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index a3f3b6b8933f..4e86d1d917f8 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "pulseview-0.4.0"; src = fetchurl { - url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz"; + url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz"; sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 968404362fcd..7d71a56fa23e 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abella-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://abella-prover.org/distributions/${name}.tar.gz"; - sha256 = "1hnccjlyzwgz7kqsr4xmx9y4wmalbxsj0g6fxdk6xrgpc84ihw2c"; + sha256 = "0bry4pj6p9y7sg79ygdksynml4rdsjhqi959vnnwwsbaysa3bci0"; }; buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix new file mode 100644 index 000000000000..da0e9bf1c1dd --- /dev/null +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, ocamlPackages, omake }: + +stdenv.mkDerivation { + name = "beluga-20180403"; + + src = fetchFromGitHub { + owner = "Beluga-lang"; + repo = "Beluga"; + rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; + sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; + }; + + nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; + buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ]; + + installPhase = '' + mkdir -p $out + cp -r bin $out/ + + mkdir -p $out/share/beluga + cp -r tools/ examples/ $out/share/beluga + + mkdir -p $out/share/emacs/site-lisp/beluga/ + cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga + ''; + + meta = { + description = "A functional language for reasoning about formal systems"; + homepage = http://complogic.cs.mcgill.ca/beluga/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.bcdarwin ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2c785472114a..b989b1eb9748 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -22,7 +22,7 @@ let "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; - "8.8+beta1" = "19ipmx6bf8wjpk8y29hcginxk7hps4jh1bbihn5icx4qysm81165"; + "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix new file mode 100644 index 000000000000..a59528b86b0a --- /dev/null +++ b/pkgs/applications/science/logic/elan/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "elan-${version}"; + version = "0.3.2"; + + cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2"; + + src = fetchFromGitHub { + owner = "kha"; + repo = "elan"; + rev = "v${version}"; + sha256 = "13r110382dh7848lpn3mrhc5bgmj373sbpx1326ryx3wl5kfp8rs"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ curl zlib openssl ]; + + cargoBuildFlags = [ "--features no-self-update" ]; + + postInstall = '' + pushd $out/bin + mv elan-init elan + for link in lean leanpkg leanchecker; do + ln -s elan $link + done + popd + + # tries to create .elan + export HOME=$(mktemp -d) + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + $out/bin/elan completions bash > "$out/share/bash-completion/completions/elan" + $out/bin/elan completions fish > "$out/share/fish/vendor_completions.d/elan.fish" + $out/bin/elan completions zsh > "$out/share/zsh/site-functions/_elan" + ''; + + meta = with stdenv.lib; { + description = "Small tool to manage your installations of the Lean theorem prover"; + homepage = "https://github.com/Kha/elan"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index b6312bfe4668..98acebcf2cc5 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = https://symbiyosys.readthedocs.io/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 796b36c91735..7a9dcc231929 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -70,6 +70,9 @@ mkDerivation (common "tamarin-prover" src // { postInstall = '' wrapProgram $out/bin/tamarin-prover \ --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} + # so that the package can be used as a vim plugin to install syntax coloration + install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim + install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim ''; checkPhase = "./dist/build/tamarin-prover/tamarin-prover test"; diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix new file mode 100644 index 000000000000..9a78c1df8b17 --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -0,0 +1,56 @@ +{ lib +, fetchurl +, makeWrapper +, stdenv +, ocaml, gawk, isabelle, cvc3, perl, wget, which +}: + +stdenv.mkDerivation rec { + name = "tlaps-${version}"; + version = "1.4.3"; + src = fetchurl { + url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; + sha256 = "1w5z3ns5xxmhmp8r4x2kjmy3clqam935gmvx82imyxrr1bamx6gf"; + }; + + buildInputs = [ ocaml isabelle cvc3 perl wget which ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -pv "$out" + export HOME="$out" + export PATH=$out/bin:$PATH + + pushd zenon + ./configure --prefix $out + make + make install + popd + + pushd isabelle + isabelle build -b Pure + popd + + pushd tlapm + ./configure --prefix $out + make all + make install + ''; + + meta = { + description = "Mechanically check TLA+ proofs"; + longDescription = '' + TLA+ is a general-purpose formal specification language that is + particularly useful for describing concurrent and distributed + systems. The TLA+ proof language is declarative, hierarchical, + and scalable to large system specifications. It provides a + consistent abstraction over the various “backend” verifiers. + ''; + homepage = https://tla.msr-inria.inria.fr/tlaps/content/Home.html; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.badi ]; + }; + +} diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix new file mode 100644 index 000000000000..5ce359dea0ec --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -0,0 +1,77 @@ +{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv +, jre, swt, gtk, libXtst, glib +}: + +let + version = "1.5.6"; + arch = "x86_64"; + + desktopItem = makeDesktopItem rec { + name = "TLA+Toolbox"; + exec = "tla-toolbox"; + icon = "tla-toolbox"; + comment = "IDE for TLA+"; + desktopName = name; + genericName = comment; + categories = "Application;Development"; + extraEntries = '' + StartupWMClass=TLA+ Toolbox + ''; + }; + + +in stdenv.mkDerivation { + name = "tla-toolbox-${version}"; + src = fetchzip { + url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; + sha256 = "1h63mcbrkf4jcg6qncpqffdi0x665z0wlfdq43d67p411xcqmbw9"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p "$out/bin" + cp -r "$src" "$out/toolbox" + chmod +w "$out/toolbox" "$out/toolbox/toolbox" + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/toolbox/toolbox" + + makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ + --run "set -x; cd $out/toolbox" \ + --add-flags "-data ~/.tla-toolbox" \ + --prefix PATH : "${jre}/bin" \ + --prefix LD_LIBRARY_PATH : "${swt}/lib:${gtk}/lib:${libXtst}/lib:${glib}/lib" + + echo -e "\nCreating TLA Toolbox icons..." + pushd "$src" + for icon_in in $(find . -path "./plugins/*/icons/full/etool16/tla_launch_check_wiz_*.png") + do + icon_size=$(echo $icon_in | grep -Po "wiz_\K[0-9]+") + icon_out="$out/share/icons/hicolor/$icon_size""x$icon_size/apps/tla-toolbox.png" + mkdir -p "$(dirname $icon_out)" + cp "$icon_in" "$icon_out" + done + popd + + echo -e "\nCreating TLA Toolbox desktop entry..." + cp -r "${desktopItem}/share/applications"* "$out/share/applications" + ''; + + meta = { + homepage = http://research.microsoft.com/en-us/um/people/lamport/tla/toolbox.html; + description = "IDE for the TLA+ tools"; + longDescription = '' + Integrated development environment for the TLA+ tools, based on Eclipse. You can use it + to create and edit your specs, run the PlusCal translator, view the pretty-printed + versions of your modules, run the TLC model checker, and run TLAPS, the TLA+ proof system. + ''; + # http://lamport.azurewebsites.net/tla/license.html + license = with lib.licenses; [ mit ]; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.badi ]; + }; +} diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix new file mode 100644 index 000000000000..9ae5d75c4577 --- /dev/null +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgs, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + name = "workcraft-${version}"; + version = "3.1.9"; + + src = fetchurl { + url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; + sha256 = "0d1mi8jffwr7irp215j9rfpa3nmwxrx6mv13bh7vn0qf6i0aw0xi"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/share + cp -r * $out/share + mkdir $out/bin + makeWrapper $out/share/workcraft $out/bin/workcraft \ + --set JAVA_HOME "${jre}" \ + --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=gasp'; + ''; + + meta = { + homepage = http://workcraft.org/; + description = "Framework for interpreted graph modeling, verification and synthesis"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ timor ]; + inherit version; + }; +} diff --git a/pkgs/applications/science/logic/z3/4.5.0.nix b/pkgs/applications/science/logic/z3/4.5.0.nix deleted file mode 100644 index 827cb2cbe3de..000000000000 --- a/pkgs/applications/science/logic/z3/4.5.0.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }: - -let - python = python2; -in stdenv.mkDerivation rec { - name = "z3-${version}"; - version = "4.5.0"; - - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "z3-4.5.0"; - sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp"; - }; - - buildInputs = [ python fixDarwinDylibNames ]; - enableParallelBuilding = true; - - configurePhase = '' - ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages} - cd build - ''; - - meta = { - description = "A high-performance theorem prover and SMT solver"; - homepage = "https://github.com/Z3Prover/z3"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index e33b55503bd6..0ac40b1e7d42 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { ++ (optional (opencvSupport) "-DOpenCV=ON") ; + # Previous attempts to fix parallel builds (see patch above) were not entirely successful. + # Sporadic build failures still exist. Dislable parallel builds for now. + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 91adb5283fdc..a4247eac627b 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -131,6 +131,7 @@ let name = "sundown"; src = "${distro_src}/pkg/sundown"; rockspec = "rocks/${name}-scm-1.rockspec"; + meta.broken = true; # 2018-04-11 }; cwrap = buildLuaRocks rec { @@ -289,6 +290,7 @@ let rev = "1e9e4f1e0bf589a0ed39f58acc185ec5e213d207"; sha256 = "1i1fpy9v6r4w3lrmz7bmf5ppq65925rv90gx39b3pykfmn0hcb9c"; }; + meta.broken = true; # 2018-04-11 }; luuid = stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 3d9e06527c9d..2927701dbd71 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,29 +1,80 @@ -{ stdenv, fetchurl, m4, gmp }: - -let - baseName = "gap"; - version = "4r8p3"; - - pkgVer = "2016_03_19-22_17"; -in +{ stdenv +, fetchurl +, fetchpatch +, m4 +, gmp +# don't remove any packages -- results in a ~1.3G size increase +# see https://github.com/NixOS/nixpkgs/pull/38754 for a discussion +, keepAllPackages ? true +}: stdenv.mkDerivation rec { - name = "${baseName}-${version}"; + pname = "gap"; + # https://www.gap-system.org/Releases/ + # newer versions (4.9.0) are available, but still considered beta (https://github.com/gap-system/gap/wiki/GAP-4.9-release-notes) + version = "4r8p10"; + pkgVer = "2018_01_15-13_02"; + name = "${pname}-${version}"; - src = fetchurl { - url = "ftp://ftp.gap-system.org/pub/gap/gap48/tar.gz/${baseName}${version}_${pkgVer}.tar.gz"; - sha256 = "1rmb0lj43avv456sjwb7ia3y0wwk5shlqylpkdwnnqpjnvjbnzv6"; + src = let + # 4r8p10 -> 48 + majorminor = stdenv.lib.replaceStrings ["r"] [""] ( + builtins.head (stdenv.lib.splitString "p" version) # 4r8p10 -> 4r8 + ); + in + fetchurl { + url = "https://www.gap-system.org/pub/gap/gap${majorminor}/tar.bz2/gap${version}_${pkgVer}.tar.bz2"; + sha256 = "0wzfdjnn6sfiaizbk5c7x44rhbfayis4lf57qbqqg84c7dqlwr6f"; }; + # remove all non-essential packages (which take up a lot of space) + preConfigure = stdenv.lib.optionalString (!keepAllPackages) '' + find pkg -type d -maxdepth 1 -mindepth 1 \ + -not -name 'GAPDoc-*' \ + -not -name 'autpgrp*' \ + -exec echo "Removing package {}" \; \ + -exec rm -r {} \; + ''; + configureFlags = [ "--with-gmp=system" ]; buildInputs = [ m4 gmp ]; - + + patches = [ + # fix infinite loop in writeandcheck() when writing an error message fails. + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/writeandcheck.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1r1511x4kc2i2mbdq1b61rb6p3misvkf1v5qy3z6fmn6vqwziaz1"; + }) + ]; + + doCheck = true; + checkTarget = "testinstall"; + # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. + # tests are run twice, once with all packages loaded and once without + # checkTarget = "teststandard"; + + preCheck = '' + # gap tests check that the home directory exists + export HOME="$TMP/gap-home" + mkdir -p "$HOME" + ''; + + postCheck = '' + # The testsuite doesn't exit with a non-zero exit code on failure. + # It leaves its logs in dev/log however. + + # grep for error messages + if grep ^##### dev/log/*; then + exit 1 + fi + ''; + postBuild = '' pushd pkg bash ../bin/BuildPackages.sh popd ''; - + installPhase = '' mkdir -p "$out/bin" "$out/share/gap/" @@ -31,7 +82,7 @@ stdenv.mkDerivation rec { sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" - ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" + ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" ''; meta = with stdenv.lib; { @@ -42,6 +93,10 @@ stdenv.mkDerivation rec { chrisjefferson ]; platforms = platforms.all; + # keeping all packages increases the package size considerably, wchich + # is why a local build is preferable in that situation. The timeframe + # is reasonable and that way the binary cache doesn't get overloaded. + hydraPlatforms = stdenv.lib.optionals (!keepAllPackages) meta.platforms; license = licenses.gpl2; homepage = http://gap-system.org/; }; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index ef6b266eaaf2..9e2c55d567cb 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-382-0"; + version = "5-0-444-0"; preferLocalBuild = true; src = fetchurl { urls = [ - "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - - # Fallback for 5-0-382-0 - # To avoid breaks when latest geogebra version is - # removed from `download.geogebra.org` - "http://web.archive.org/web/20170818191250/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-382-0.tar.bz2" + "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv"; + sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index e29ff24e250f..dd92e264889f 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texlive, bison, flex +{ stdenv, fetchurl, fetchpatch, texlive, bison, flex , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas , readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null @@ -9,13 +9,22 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; attr = if enableGUI then "giac-with-xcas" else "giac"; - version = "1.4.9"; + version = "1.4.9-59"; src = fetchurl { - url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2"; - sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; + url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; + sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk"; }; + patches = stdenv.lib.optionals (!enableGUI) [ + # when enableGui is false, giac is compiled without fltk. That means some + # outputs differ in the make check. Patch around this: + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; + sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw"; + }) + ]; + postPatch = '' for i in doc/*/Makefile*; do substituteInPlace "$i" --replace "/bin/cp" "cp"; @@ -37,10 +46,11 @@ stdenv.mkDerivation rec { libGLU_combined fltk xorg.libX11 ]; - outputs = [ "out" ]; + outputs = [ "out" "doc" ]; + + doCheck = true; enableParallelBuilding = true; - hardeningDisable = [ "format" "bindnow" "relro" ]; configureFlags = [ "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" @@ -57,6 +67,13 @@ stdenv.mkDerivation rec { for file in $(find $out -name Makefile) ; do sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ; done; + + # reference cycle + rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile + + mkdir -p "$doc/share/giac" + mv "$out/share/giac/doc" "$doc/share/giac" + mv "$out/share/giac/examples" "$doc/share/giac" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix new file mode 100644 index 000000000000..9e02b08c8ad0 --- /dev/null +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromBitbucket +, fetchpatch +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.2"; + pname = "lrcalc"; + name = "${pname}-${version}"; + + src = fetchFromBitbucket { + owner = "asbuch"; + repo = "lrcalc"; + rev = "lrcalc-${version}"; + sha256 = "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss"; + }; + + doCheck = true; + + nativeBuildInputs = [ + autoreconfHook + ]; + + patches = [ + # Fix include syntax: + # For private includes, use `#include "..."` instead of `#include <...>` + (fetchpatch { + url = "https://bitbucket.org/asbuch/lrcalc/commits/226981a0/raw/"; + sha256 = "02kaqx5s3l642rhh28kn2wg9wr098vzpknxyl4pv627lqa3lv9vm"; + }) + ]; + + meta = with stdenv.lib; { + description = "Littlewood-Richardson calculator"; + homepage = http://math.rutgers.edu/~asbuch/lrcalc/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index d6d3b505e35b..c3eeddef6694 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null, -tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null +, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: let @@ -11,6 +11,7 @@ let (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); in stdenv.mkDerivation ({ + inherit version; name = "${name}-${version}"; src = fetchurl { @@ -18,8 +19,9 @@ stdenv.mkDerivation ({ sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s"; }; - buildInputs = stdenv.lib.filter (x: x != null) - [sbcl ecl texinfo perl python makeWrapper]; + buildInputs = stdenv.lib.filter (x: x != null) [ + sbcl ecl texinfo perl python makeWrapper + ]; postInstall = '' # Make sure that maxima can find its runtime dependencies. @@ -36,6 +38,39 @@ stdenv.mkDerivation ({ '') ; + patches = [ + # fix path to info dir (see https://trac.sagemath.org/ticket/11348) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; + }) + + # fix https://sourceforge.net/p/maxima/bugs/2596/ + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; + }) + + # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; + }) + + # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed) + # introduced in https://trac.sagemath.org/ticket/13364 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d"; + }) + ] ++ stdenv.lib.optionals ecl-fasl [ + # build fasl, needed for ECL support + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; + }) + ]; + # Failures in the regression test suite won't abort the build process. We run # the suite only so that potential errors show up in the build log. See also: # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. @@ -57,10 +92,5 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; - broken = ecl != null; }; -} // (stdenv.lib.optionalAttrs ecl-fasl { - preConfigure = '' - sed -e '/c::build-program "binary-ecl\/maxima"/i(c::build-fasl "binary-ecl\/maxima.fasl" :lisp-files obj :ld-flags (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" (find-package "MAXIMA"))))) (if (and x (not (string= x ""))) (list x))))' -i src/maxima.system - ''; -})) +}) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index b02a65532577..ce3f975b85b8 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "0sf4ywz8hsszaf0yr0ncdlp7mwjk6b276bwl0j9vf1j925c89pbn"; + sha256 = "0j5wp6bmnwkyxlvqci6ddg478a0ms93gicvycw0c6bkvs2gd77az"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8cd9355a0f63..882d481a7f98 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,23 +1,52 @@ { stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig -, asLibsingular ? false +, autoreconfHook +, flint +, ntl +, cddlib +, enableFactory ? true +, enableGfanlib ? true }: stdenv.mkDerivation rec { - name = "singular-${version}"; - version="3-1-7"; + name = "singular-${version}${patchVersion}"; + version = "4.1.1"; + patchVersion = "p1"; + urlVersion = builtins.replaceStrings [ "." ] [ "-" ] version; src = fetchurl { - url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/Singular-${version}.tar.gz"; - sha256 = "1j4mcpnwzdp3h4qspk6ww0m67rmx4s11cy17pvzbpf70lm0jzzh2"; + url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}${patchVersion}.tar.gz"; + sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1"; }; - buildInputs = [ gmp perl ncurses readline ]; - nativeBuildInputs = [ autoconf bison pkgconfig ]; + configureFlags = stdenv.lib.optionals enableFactory [ + "--enable-factory" + ] ++ stdenv.lib.optionals enableGfanlib [ + "--enable-gfanlib" + ]; + + postUnpack = '' + patchShebangs . + ''; + + # For reference (last checked on commit 75f460d): + # https://github.com/Singular/Sources/blob/spielwiese/doc/Building-Singular-from-source.md + # https://github.com/Singular/Sources/blob/spielwiese/doc/external-packages-dynamic-modules.md + buildInputs = [ + # necessary + gmp + # by upstream recommended but optional + ncurses + readline + ntl + flint + ] ++ stdenv.lib.optionals enableGfanlib [ + cddlib + ]; + nativeBuildInputs = [ autoconf bison perl pkgconfig autoreconfHook ]; preConfigure = '' find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' - ${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''} ''; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; @@ -27,17 +56,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out" - cp -r Singular/LIB "$out/LIB" - make install${stdenv.lib.optionalString asLibsingular "-libsingular"} - - binaries="$(find "$out"/* \( -type f -o -type l \) -perm -111 \! -name '*.so' -maxdepth 1)" - ln -s "$out"/*/{include,lib} "$out" - mkdir -p "$out/bin" - for b in $binaries; do - bbn="$(basename "$b")" - echo -e '#! ${stdenv.shell}\n"'"$b"'" "$@"' > "$out/bin/$bbn" - chmod a+x "$out/bin/$bbn" - done + cp -r Singular/LIB "$out/lib" + make install + + # Make sure patchelf picks up the right libraries + rm -rf libpolys factory resources omalloc Singular + ''; + + # simple test to make sure singular starts and finds its libraries + doInstallCheck = true; + installCheckPhase = '' + $out/bin/Singular -c 'LIB "freegb.lib"; exit;' + if [ $? -ne 0 ]; then + echo >&2 "Error loading the freegb library in Singular." + exit 1 + fi ''; enableParallelBuilding = true; @@ -47,7 +80,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = subtractLists platforms.i686 platforms.linux; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 - homepage = http://www.singular.uni-kl.de/index.php; + homepage = http://www.singular.uni-kl.de; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; }; } diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 6a692e07c433..3bfb22dad936 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,28 +1,24 @@ -{ stdenv, fetchurl, jre, unzip }: +{ stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { name = "weka-${version}"; - version = "3.8.2"; + version = "3.9.2"; src = fetchurl { url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip"; - sha256 = "0p353lhhcv3swwn1bl64vkyjk480vv9ghhlyqjxiar4p3xifjayb"; + sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip makeWrapper ]; # The -Xmx1000M comes suggested from their download page: # http://www.cs.waikato.ac.nz/ml/weka/downloading.html installPhase = '' - mkdir -pv $out/share/weka $out/bin + mkdir -pv $out/share/weka cp -Rv * $out/share/weka - cat > $out/bin/weka << EOF - #!${stdenv.shell} - ${jre}/bin/java -Xmx1000M -jar $out/share/weka/weka.jar - EOF - - chmod +x $out/bin/weka + makeWrapper ${jre}/bin/java $out/bin/weka \ + --add-flags "-Xmx1000M -jar $out/share/weka/weka.jar" ''; meta = { diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 0194ee0b83c0..36c7884d108b 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cytoscape-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz"; - sha256 = "13q8caksbzi6j7xy8v5f0pi6766yfawys6jcm50ng78mnhrv2v97"; + sha256 = "1pkdilv1nw6vvdxk71bwjngr8yafrsqwaqvlakhp8yb342r1jd4s"; }; buildInputs = [jre makeWrapper]; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index fb3b0a29724b..b139f30b3d18 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ mdaiter ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 177f8ca25649..ef539ac9c8df 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -3,14 +3,13 @@ , gmp, mpfr, glog, google-gflags, libjpeg_turbo }: stdenv.mkDerivation rec { - name = "openmvs-unstable-2017-05-01"; + name = "openmvs-unstable-2018-05-26"; src = fetchFromGitHub { owner = "cdcseacave"; repo = "openmvs"; - - rev = "a3b360016660a1397f6eb6c070c2c19bbb4c7590"; - sha256 = "170ff4ipix2kqq5rhb1yrrcvc79im9qgp5hiwsdr23xxzdl21221"; + rev = "939033c55b50478339084431aac2c2318041afad"; + sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni"; }; buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix new file mode 100644 index 000000000000..d0a4f74924c5 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -0,0 +1,60 @@ +{lib, fetchgit, gcc, python}: + +let + xhtml2pdf = import ./xhtml2pdf.nix { inherit lib; + fetchPypi = python.pkgs.fetchPypi; + buildPythonPackage = python.pkgs.buildPythonPackage; + html5lib = python.pkgs.html5lib; + httplib2 = python.pkgs.httplib2; + nose = python.pkgs.nose; + pillow = python.pkgs.pillow; + pypdf2 = python.pkgs.pypdf2; + reportlab = python.pkgs.reportlab; +}; + +in + +python.pkgs.buildPythonApplication rec { + pname = "sasview"; + version = "4.1.2"; + + buildInputs = with python.pkgs; [ + pytest + unittest-xml-reporting]; + + propagatedBuildInputs = with python.pkgs; [ + bumps + gcc + h5py + libxslt + lxml + matplotlib + numpy + pyparsing + periodictable + pillow + pylint + pyopencl + reportlab + sasmodels + scipy + six + sphinx + wxPython + xhtml2pdf]; + + src = fetchgit { + url = "https://github.com/SasView/sasview.git"; + rev = "v${version}"; + sha256 ="05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx"; + }; + + patches = [./pyparsing-fix.patch ./local_config.patch]; + + meta = { + homepage = https://www.sasview.org; + description = "Fitting and data analysis for small angle scattering data"; + maintainers = with lib.maintainers; [ rprospero ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/pkgs/applications/science/misc/sasview/local_config.patch new file mode 100644 index 000000000000..91972a913bc4 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/local_config.patch @@ -0,0 +1,10 @@ +--- a/src/sas/_config.py ++++ b/src/sas/_config.py +@@ -70,2 +70,2 @@ +- logger.critical("Error loading %s: %s", path, exc) +- sys.exit() ++ import sas.sasview.local_config ++ return sas.sasview.local_config +-- +2.15.0 + diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch new file mode 100644 index 000000000000..7729292cb344 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch @@ -0,0 +1,8 @@ +--- a/setup.py ++++ b/setup.py +@@ -5,1 +5,1 @@ +- 'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0', ++ 'bumps>=0.7.5.9', 'periodictable>=1.5.0', +-- +2.15.0 + diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix new file mode 100644 index 000000000000..0b3d438843da --- /dev/null +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -0,0 +1,32 @@ +{lib, fetchPypi, buildPythonPackage, html5lib, httplib2, nose, pillow, pypdf2, reportlab}: + +let + #xhtml2pdf specifically requires version "1.0b10" of html5lib + html5 = html5lib.overrideAttrs( oldAttrs: rec{ + version = "1.0b10"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"; + }; + }); +in + +buildPythonPackage rec { + pname = "xhtml2pdf"; + version = "0.2.1"; + + buildInputs = [html5]; + propagatedBuildInputs = [httplib2 nose pillow pypdf2 reportlab html5]; + + src = fetchPypi { + inherit pname version; + sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1"; + }; + + meta = { + description = "A pdf converter for the ReportLab Toolkit"; + homepage = https://github.com/xhtml2pdf/xhtml2pdf; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 351bcccd45d8..ae21af65584c 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-4.6.7"; + name = "gromacs-2018"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.7.tar.gz"; - sha256 = "6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.tar.gz"; + sha256 = "1sfh3wdrw07797xm86fq10r0024ym585yyrnhdh0qam596vx1dfy"; }; buildInputs = [cmake fftw] diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index ed6e6334a5d7..4b3ef167d532 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "spyder"; - version = "3.2.7"; + version = "3.2.8"; src = fetchPypi { inherit pname version; - sha256 = "b5bb8fe0a556930dc09b68fa2741a0de3da6488843ec960e0c62f1f3b2e08e2f"; + sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; }; # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index 79af80ea75f5..adf0f51fc4cc 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -61,7 +61,7 @@ pythonPackages.buildPythonApplication rec { options. ''; license = licenses.gpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 47d667a0c067..72e010fd283c 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, python2Packages +, fetchpatch , withSFTP ? true }: @@ -17,8 +18,15 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [] ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; - # Bazaar can't find the certificates alone - patches = [ ./add_certificates.patch ]; + patches = [ + # Bazaar can't find the certificates alone + ./add_certificates.patch + (fetchpatch { + url = "https://bazaar.launchpad.net/~brz/brz/trunk/revision/6754"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + name = "CVE-2017-14176.patch"; + }) + ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index 6301acdf1342..7c41a60a7253 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { homepage = http://www.bugseverywhere.org/; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index a330db6a8d67..8a729c28da9a 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nano }: +{ stdenv, fetchurl, fetchpatch, nano }: stdenv.mkDerivation { name = "cvs-1.12.13"; @@ -12,6 +12,10 @@ stdenv.mkDerivation { ./getcwd-chroot.patch ./CVE-2012-0804.patch ./CVE-2017-12836.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24118ec737c7/cvs/vasnprintf-high-sierra-fix.diff"; + sha256 = "1ql6aaia7xkfq3vqhlw5bd2z2ywka82zk01njs1b2szn699liymg"; + }) ]; hardeningDisable = [ "fortify" "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e5e36e998ace..cd969ff81d0b 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -15,7 +15,7 @@ let perlPackages.MIMEBase64 perlPackages.AuthenSASL perlPackages.DigestHMAC ]; - gitwebPerlLibs = with perlPackages; [ CGI HTMLParser ]; + gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; }; in @@ -106,6 +106,10 @@ rec { inherit (darwin) Security; }; + hubUnstable = callPackage ./hub/unstable.nix { + inherit (darwin) Security; + }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { @@ -117,11 +121,14 @@ rec { git = gitSVN; }; - svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { }; + svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; tig = callPackage ./tig { }; topGit = callPackage ./topgit { }; transcrypt = callPackage ./transcrypt { }; + + # aliases + svn_all_fast_export = svn-all-fast-export; } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index d81049951522..41096441b8e7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -41,6 +41,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index abd9013b6b03..e4db75c8ad7a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "git-extras-${version}"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn"; + sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index 5272e2be07cf..dc3fbbed1995 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "git-open-${version}"; - version = "1.3.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-open"; rev = "v${version}"; - sha256 = "1klj41vqgyyigqzi6s1ykz9vd8wvaq3skin63pi989dlsjf7igyr"; + sha256 = "0lprzrjsqrg83gixfaiw26achgd8l7s56jknsjss4p7y0w1fxm05"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index ae1139e99937..0272d4414607 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -11,13 +11,13 @@ let ++ stdenv.lib.optional (utillinux != null) utillinux); in stdenv.mkDerivation rec { name = "git-recent-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-recent"; rev = "v${version}"; - sha256 = "0rckjjrw2xmvmbqaf66i36x59vs1v4pfnmvbinx5iggp7vjly1a4"; + sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 1208afa19630..5e41db0e03f8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-remote-gcrypt-${version}"; - version = "1.0.0"; + version = "1.0.3"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379"; + sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1"; }; outputs = [ "out" "man" ]; 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 e545cb33befe..b336f72c7ac1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.2"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; hardeningDisable = [ "format" ]; @@ -58,8 +58,6 @@ stdenv.mkDerivation { + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") - # XXX: USE_PCRE2 might be useful in general, look into it - # XXX other alpine options? + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); # build git-credential-osxkeychain if darwin diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f..216c0e56b44c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh diff --git a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix new file mode 100644 index 000000000000..7e83c2cfb674 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }: + +stdenv.mkDerivation rec { + name = "hub-${version}"; + version = "2.3.0-pre10"; + + src = fetchgit { + url = https://github.com/github/hub.git; + rev = "refs/tags/v${version}"; + sha256 = "07sz1i6zxx2g36ayhjp1vjw523ckk5b0cr8b80s1qhar2d2hkibd"; + }; + + buildInputs = [ go ronn groff utillinux ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + buildPhase = '' + mkdir bin + ln -s ${ronn}/bin/ronn bin/ronn + + patchShebangs . + make all man-pages + ''; + + installPhase = '' + prefix=$out sh -x < script/install.sh + ''; + + meta = with stdenv.lib; { + description = "Command-line wrapper for git that makes you better at GitHub"; + + license = licenses.mit; + homepage = https://hub.github.com/; + maintainers = with maintainers; [ the-kenny ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 7130e057d971..64e700273d12 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, python2, git }: let - name = "stgit-0.17.1"; + name = "stgit-${version}"; + version = "0.18"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download.gna.org/stgit/${name}.tar.gz"; - sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl"; + url = "https://github.com/ctmarinas/stgit/archive/v${version}.tar.gz"; + sha256 = "19fk6vw3pgp2a98wpd4j3kyiyll5dy9bi4921wq1mrky0l53mj00"; }; buildInputs = [ python2 git ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index fbafc5257d7b..2dfa61952a57 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { patches = [ (fetchpatch { name = "pr40.patch"; - sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk"; - url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff; + sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3"; + url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch; }) ]; @@ -31,8 +31,6 @@ stdenv.mkDerivation { "SVN_INCLUDE=${subversion.dev}/include/subversion-1" ]; - installPhase = "make install INSTALL_ROOT=$out"; - meta = with stdenv.lib; { homepage = https://github.com/svn-all-fast-export/svn2git; description = "A fast-import based converter for an svn repo to git repos"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 8fcc3e7e9270..da9ee9b40811 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0ikkpvarp6mzsqk56ihw72fbv7r98g5v5i83rxq8dk709fdqplm6"; + sha256 = "07fbcd134n7giwxpqli5hfywmi0vb8awgdh3gyiwyzhjwwzfrxkq"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 1c3d1928a8b0..7cfaeff33827 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv -, ruby, tzdata, git, procps, dpkg, nettools +, ruby, tzdata, git, ps, dpkg, nettools }: /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - rubyEnv ruby bundler tzdata git procps dpkg nettools + rubyEnv ruby bundler tzdata git ps dpkg nettools ]; patches = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${procps}/bin/ps -U" + --replace "ps -U" "${ps}/bin/ps -U" sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index a86a7f96e097..508c8b3fb6de 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.29"; + version = "0.11.34"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0"; + sha256 = "15xwcw3k7wbahdgp796gly79qkka21p7kvm84zfjgcsjjri0kdnz"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 68750bb9e6e7..a00393abf270 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.5"; + version = "4.5.2"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "0rgjy42zdlbzgp4qq49amzplfcvycyijf4kdhc5wk3fqz7cki4sd"; + sha256 = "14732hhw2ibvy5khqxjc8a983z3rib5vp9lqfbws80lm3kyryjm4"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 324bbf690d56..18fb672226f2 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,4 +1,4 @@ -{lib, python2Packages, git, mercurial, coreutils}: +{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}: with python2Packages; buildPythonApplication rec { @@ -12,11 +12,30 @@ buildPythonApplication rec { buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; - src = fetchPypi { - inherit pname version; - sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95"; + # PyPI source is currently missing tests. Thus, use GitHub instead. + # See: https://github.com/kynan/nbstripout/issues/73 + # Use PyPI again after it has been fixed in a release. + src = fetchFromGitHub { + owner = "kynan"; + repo = pname; + rev = version; + sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws"; }; + patches = [ + ( + # Fix git diff tests by using --no-index. + # See: https://github.com/kynan/nbstripout/issues/74 + # + # Remove this patch once the pull request has been merged and a new + # release made. + fetchurl { + url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch"; + sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0"; + } + ) + ]; + # for some reason, darwin uses /bin/sh echo native instead of echo binary, so # force using the echo binary postPatch = '' diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix new file mode 100644 index 000000000000..27e029d39d1e --- /dev/null +++ b/pkgs/applications/version-management/p4v/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, makeWrapper }: + +stdenv.mkDerivation rec { + name = "p4v-${version}"; + version = "2017.3.1601999"; + + src = fetchurl { + url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; + sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21"; + }; + + dontBuild = true; + nativeBuildInputs = [makeWrapper]; + + ldLibraryPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + qtbase + qtmultimedia + qtscript + qtsensors + qtwebkit + openssl + ]; + + installPhase = '' + mkdir $out + cp -r bin $out + mkdir -p $out/lib/p4v + cp -r lib/p4v/P4VResources $out/lib/p4v + + for f in $out/bin/*.bin ; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f + + wrapProgram $f \ + --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \ + --suffix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} + done + ''; + + meta = { + description = "Perforce Visual Client"; + homepage = https://www.perforce.com; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.nioncode ]; + }; +} diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 5c6e65915da5..84211543c3b3 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.1.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "1ysy1lhb7fxy02a3c9xk2awa49svnfa8bqcz2aj4x56r2f8vhj0h"; + sha256 = "1si4fg02wxi35hpkr58na06h19yjw6qd9c5mbb9xfkkzgz5mnssj"; }; - cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw"; + cargoSha256 = "083p7z7blj064840ddgnxvqjmih4bmy92clds3qgv5v7lh63wfmn"; meta = with stdenv.lib; { - description = "SCM-agnostic, file-based, offline-first, immutable issue tracker"; + description = "Serverless Information Tracker"; homepage = http://sit-it.org/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir ]; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 437062f7f5e1..3f33410f1b1b 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.5"; + version = "4.5.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk"; + sha256 = "0q12zjpgafdch4ns31k4afy25g837xm7v2qwj62806l2dz4rm4h9"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 77663e858ef2..0f0eec7ef9cd 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,29 +1,22 @@ -{ stdenv, fetchpatch, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: +{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand +, TestMost, TestDifferences, TestDeep, TestException, TestWarn +}: stdenv.mkDerivation rec { - version = "1.20170226"; # date of commit we're pulling + version = "1.20170915"; # date of commit we're pulling name = "vcsh-${version}"; src = fetchFromGitHub { owner = "RichiH"; repo = "vcsh"; - rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab"; - sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln"; + rev = "eadb8df6aa71a76e5be36492edcadb118bd862ac"; + sha256 = "1wfzp8167lcq6akdpbi8fikjv0z3h1i5minh3423dljc04q0klm1"; }; - patches = - [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch"; - sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k"; - }) - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/228.patch"; - sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam"; - }) - ]; - - buildInputs = [ which git ronn perl ShellCommand TestMost ]; + buildInputs = [ + which git ronn perl ShellCommand TestMost TestDifferences TestDeep + TestException TestWarn + ]; installPhase = "make install PREFIX=$out"; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 99ed7378745c..991842ba0dc1 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir +{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase @@ -32,7 +32,15 @@ stdenv.mkDerivation rec { sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; }; - patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch ]; + patches = [ + ./dynamic_install_dir.patch + ./bootstrap_logging.patch + # glibc 2.27 compat + (fetchpatch { + url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch; + sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6"; + }) + ]; nativeBuildInputs = [ yasm cmake pkgconfig ]; buildInputs = [ diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 06dcaf31b443..3a595da96d07 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel viric ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index e9f172aad76e..031202ad646c 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.6.2"; + version = "3.6.8"; src = fetchurl { - sha256 = "0n7bhwkzknjpp54h54hxv1s8nsmmb7cwwf1aqpbcsnd7y6cv28nm"; + sha256 = "0agp97g79mlqcwfz2xk5rdxw4kx0hm92xikdspbpxlfji1mkh10p"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 8ceb7875be4d..1e671b4ea7bf 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = https://linuxtv.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 3e796275907c..904401c5e913 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -13,13 +13,15 @@ python2, pkgconfig, yasm, harfbuzz, zlib, autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, - libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, - lame, ffmpeg, libdvdread, libdvdnav, libbluray, + libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, + lame, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, fontconfig, freetype, hicolor-icon-theme, glib, gtk3, intltool, libnotify, gst_all_1, dbus-glib, udev, libgudev, libvpx, - useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, + useFfmpeg ? false, libav_12 ? null, ffmpeg ? null, + useFdk ? false, fdk_aac ? null }: stdenv.mkDerivation rec { @@ -35,20 +37,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 - ] ++ (lib.optionals useGtk [ + ] ++ lib.optionals useGtk [ intltool wrapGAppsHook - ]); + ]; buildInputs = [ fribidi fontconfig freetype jansson zlib libass libiconv libsamplerate libxml2 bzip2 - libogg libopus libtheora libvorbis libdvdcss a52dec libmkv fdk_aac + libogg libopus libtheora libvorbis libdvdcss a52dec libmkv lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx - ] ++ (lib.optionals useGtk [ + ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev - ]); + ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ]) + ++ lib.optional useFdk fdk_aac; dontUseCmakeConfigure = true; @@ -75,8 +78,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - "--enable-fdk-aac" (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") + (if useFdk then "--enable-fdk-aac" else "") ]; NIX_LDFLAGS = [ diff --git a/pkgs/applications/video/kazam/bug_1190693.patch b/pkgs/applications/video/kazam/bug_1190693.patch deleted file mode 100644 index 9f00c6b60791..000000000000 --- a/pkgs/applications/video/kazam/bug_1190693.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== modified file 'kazam/frontend/indicator.py' ---- a/kazam/frontend/indicator.py 2013-01-26 01:53:53 +0000 -+++ b/kazam/frontend/indicator.py 2013-06-13 18:18:37 +0000 -@@ -291,3 +291,9 @@ - def start_recording(self): - logger.debug("Recording started.") - self.indicator.set_from_icon_name("kazam-recording") -+ -+ def hide_it(self): -+ self.indicator.set_visible(False) -+ -+ def show_it(self): -+ self.indicator.set_visible(True) - diff --git a/pkgs/applications/video/kazam/datadir.patch b/pkgs/applications/video/kazam/datadir.patch deleted file mode 100644 index 114d4228be2d..000000000000 --- a/pkgs/applications/video/kazam/datadir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bin/kazam 2014-02-03 23:11:38.465614061 +0100 -+++ b/bin/kazam-1 2014-02-03 23:12:28.447058700 +0100 -@@ -68,7 +68,7 @@ - # when base install path is not /usr - curpath = os.path.abspath(__file__) - curpath = os.path.realpath(curpath) -- datadir = curpath.split('bin/')[0] + "share/kazam/" -+ datadir = os.path.realpath(os.path.join(curpath, "./../../", "share/kazam/")) - - try: - import platform diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index b67c4a43cf56..9ffd62d068ae 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,46 +1,41 @@ -{ stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra-gtk2 }: +{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobjectIntrospection +, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio }: - -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { name = "kazam-${version}"; - version = "1.4.3"; + version = "1.4.5"; namePrefix = ""; src = fetchurl { url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; - sha256 = "00bcn0yj9xrv87sf6xd3wpilsjgjpsj15zzpjh351ffpjnr0ica8"; + sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f"; }; - # TODO: keybinder, appindicator3 - buildInputs = with python3Packages; - [ pygobject3 pyxdg pycairo gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gobjectIntrospection gtk3 libwnck3 distutils_extra - intltool dbus-python ]; - - # TODO: figure out why PYTHONPATH is not passed automatically for those programs - pythonPath = with python3Packages; - [ pygobject3 pyxdg pycairo dbus-python ]; - - patches = [ ./datadir.patch ./bug_1190693.patch ]; - prePatch = '' - rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra-gtk2}/bin/canberra-gtk-play" - ''; + nativeBuildInputs = [ gobjectIntrospection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; + buildInputs = [ + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3 + keybinder3 libappindicator-gtk3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; + + patches = [ + # Fix paths + (substituteAll { + src = ./fix-paths.patch; + libcanberra = libcanberra-gtk3; + inherit libpulseaudio; + }) + # Fix compability with Python 3.4 + (fetchurl { + url = https://sources.debian.org/data/main/k/kazam/1.4.5-2/debian/patches/configparser_api_changes.patch; + sha256 = "0yvmipnh98s7y07cp1f113l0qqfw65k13an96byq707z3ymv1c2h"; + }) + ]; # no tests doCheck = false; - preFixup = '' - wrapProgram $out/bin/kazam \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk3 gst_all_1.gstreamer keybinder ]}" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share" \ - --set GST_REGISTRY "/tmp/kazam.gstreamer.registry"; - ''; - - meta = with stdenv.lib; { description = "A screencasting program created with design in mind"; homepage = https://code.launchpad.net/kazam; diff --git a/pkgs/applications/video/kazam/fix-paths.patch b/pkgs/applications/video/kazam/fix-paths.patch new file mode 100644 index 000000000000..43e360830ab5 --- /dev/null +++ b/pkgs/applications/video/kazam/fix-paths.patch @@ -0,0 +1,22 @@ +--- a/kazam/backend/grabber.py ++++ b/kazam/backend/grabber.py +@@ -72,7 +72,7 @@ + # + if prefs.shutter_sound and (not self.god): + soundfile = os.path.join(prefs.datadir, 'sounds', prefs.sound_files[prefs.shutter_type]) +- subprocess.call(['/usr/bin/canberra-gtk-play', '-f', soundfile]) ++ subprocess.call(['@libcanberra@/bin/canberra-gtk-play', '-f', soundfile]) + + if self.xid: + if prefs.capture_borders_pic: +--- a/kazam/pulseaudio/ctypes_pulseaudio.py ++++ b/kazam/pulseaudio/ctypes_pulseaudio.py +@@ -20,7 +20,7 @@ + # MA 02110-1301, USA. + + from ctypes import * +-PA = CDLL('libpulse.so.0') ++PA = CDLL('@libpulseaudio@/lib/libpulse.so.0') + + # + # Pulse Audio constants and defines diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 8a40912a1d68..64119d2dfc55 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -13,7 +13,7 @@ , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva, wayland +, sqlite, mysql, nasm, gnutls, libva, libdrm, wayland , curl, bzip2, zip, unzip, glxinfo, xdpyinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd @@ -121,7 +121,7 @@ in stdenv.mkDerivation rec { gnutls libidn libtasn1 nasm p11-kit libxml2 yasm python2 boost libmicrohttpd - gettext pcre-cpp yajl fribidi libva + gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto libXt libXmu libXext xextproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6bcba1e927f9..01e134afee6f 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip -, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun }: +, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: with (callPackage ./commons.nix {}); @@ -314,4 +314,28 @@ rec { extraBuildInputs = [ jsoncpp libhdhomerun ]; }; + + pvr-iptvsimple = mkKodiABIPlugin rec { + + plugin = "pvr-iptvsimple"; + namespace = "pvr.iptvsimple"; + version = "2.4.14"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.iptvsimple"; + rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8"; + sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kodi-pvr/pvr.iptvsimple; + description = "Kodi's IPTV Simple client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; + + extraBuildInputs = [ zlib ]; + }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7afc3b502ad5..3a3a009d18f1 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "21.0.0"; + version = "22.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "06nixp0qqa6g2fv40f7l0i0sqbc7qswpgq4534l98nan08wjbk2r"; + sha256 = "07nggqkpl6dkfcqli8y9dn0jbznldz03nqj2l3fgj3vhqa0phlab"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 6723c9dfe1ff..421e0dbb8a39 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -32,6 +32,7 @@ , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null , drmSupport ? true, libdrm ? null +, openalSupport ? true, openalSoft ? null , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -59,6 +60,7 @@ assert dvdnavSupport -> available libdvdnav; assert bluraySupport -> available libbluray; assert speexSupport -> available speex; assert theoraSupport -> available libtheora; +assert openalSupport -> available openalSoft; assert pulseSupport -> available libpulseaudio; assert bs2bSupport -> available libbs2b; assert cacaSupport -> available libcaca; @@ -113,6 +115,7 @@ in stdenv.mkDerivation rec { (enableFeature archiveSupport "libarchive") (enableFeature dvdreadSupport "dvdread") (enableFeature dvdnavSupport "dvdnav") + (enableFeature openalSupport "openal") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") @@ -143,6 +146,8 @@ in stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional speexSupport speex ++ optional bs2bSupport libbs2b + ++ optional openalSupport openalSoft + ++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL ++ optional libpngSupport libpng ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a3ed28c3fd0a..f3e2072d6dac 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,13 +29,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "21.0.3"; + version = "21.1.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1mrihhzlsc66w5lr1lcm8c8jg6z0iwmmckr3pk3gk92z4s55969q"; + sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv"; }; patches = [ ./find-xcb.patch ]; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 6591af9d0d87..a0118bea92f4 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "07615vacbvi08pzm4lxfckfwib2xcfdjaggpda58hy8nr0677fzq"; + sha256 = "0rn87jxyfq1yip1lb2255l5ilkakkqg9rn0lr0h6dn2xrmlbmg8l"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 9858edf82389..6a84154818b0 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "peek-${version}"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "phw"; repo = "peek"; rev = version; - sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh"; + sha256 = "0yizf55rzkm88bfjzwr8yyhm33yqp1mbih2ifwhvnjd1911db0x9"; }; nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 406d49c99391..32610d08f339 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "18.1.0"; + version = "18.3.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "1sw2b89ricxfbmgbzsp9f89n0gwh9dbnii6lr9gcccs8djpp1ad1"; + sha256 = "05r7xmzc7i95nwzgcn7p0kwlhybryf7f0dpadgdnbz6xinz9a0mb"; }; makeFlags = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index fffbd5c0ffb4..44c4d317d36a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -7,7 +7,6 @@ , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth -, onlyLibVLC ? false , qt4 ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false @@ -68,8 +67,7 @@ stdenv.mkDerivation rec { "--enable-vdpau" "--enable-dvdnav" "--enable-samplerate" - ] - ++ optional onlyLibVLC "--disable-vlc"; + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 5e44116415ea..b75145a3e4a3 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -2,11 +2,11 @@ , lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.9"; + name = "xine-ui-0.99.10"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; + sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a"; }; nativeBuildInputs = [ pkgconfig shared-mime-info ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 8f456a2a49a8..533721034575 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; + sha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index af15240dc12e..61899d12974f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -195,28 +195,28 @@ rec { }); # Get revisions from - # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits - - docker_17_12 = dockerGen rec { - version = "17.12.1-ce"; - rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit - sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i"; - runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; - runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; - containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; - containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; + # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* + + docker_18_03 = dockerGen rec { + version = "18.03.0-ce"; + rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit + sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g"; + runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; + runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; + containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"; + containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_18_02 = dockerGen rec { - version = "18.02.0-ce"; - rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit - sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m"; - runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; - runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; - containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; - containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; + docker_18_04 = dockerGen rec { + version = "18.04.0-ce"; + rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit + sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl"; + runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; + runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; + containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; + containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker/distribution.nix index 0af9abc852ef..0af9abc852ef 100644 --- a/pkgs/applications/virtualization/docker-distribution/default.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 811e5cf47c3b..8b590cff9640 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "12c45jcp9isz57dbshxrvvhqbvmf9cnrr7ddac5m6p34in4hk01n"; + sha256 = "1jrwvrpl61rqbjjphv8v7ryhdwfjrpps76dbvkpl43hpn5hqqis2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 00303be12da2..7b246df01a93 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,11 +7,14 @@ , numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio -, sdlSupport ? !stdenv.isDarwin, SDL +, sdlSupport ? !stdenv.isDarwin, SDL2 +, gtkSupport ? !xenSupport, gtk3, gettext, gnome3 , vncSupport ? true, libjpeg, libpng , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen +, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm +, virglSupport ? openGLSupport, virglrenderer , hostCpuOnly ? false , nixosTestRunner ? false }: @@ -52,18 +55,43 @@ stdenv.mkDerivation rec { ++ optionals seccompSupport [ libseccomp ] ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] - ++ optionals sdlSupport [ SDL ] + ++ optionals sdlSupport [ SDL2 ] + ++ optionals gtkSupport [ gtk3 gettext gnome3.vte ] ++ optionals vncSupport [ libjpeg libpng ] ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] - ++ optionals xenSupport [ xen ]; + ++ optionals xenSupport [ xen ] + ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] + ++ optionals virglSupport [ virglrenderer ]; enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ./statfs-flags.patch ] + patches = [ ./no-etc-install.patch ./statfs-flags.patch (fetchpatch { + name = "glibc-2.27-memfd.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0"; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optional pulseSupport ./fix-hda-recording.patch; + ++ optional pulseSupport ./fix-hda-recording.patch + ++ optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch; + sha256 = "1xfdjs1jlvs99hpf670yianb8c3qz2ars8syzyz8f2c2cp5y4bxb"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; + sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch; + sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; + sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; + }) + ]; hardeningDisable = [ "stackprotector" ]; @@ -84,7 +112,10 @@ stdenv.mkDerivation rec { ++ optional hostCpuOnly "--target-list=${hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio" - ++ optional xenSupport "--enable-xen"; + ++ optional gtkSupport "--enable-gtk" + ++ optional xenSupport "--enable-xen" + ++ optional openGLSupport "--enable-opengl" + ++ optional virglSupport "--enable-virglrenderer"; postFixup = '' diff --git a/pkgs/applications/virtualization/qemu/riscv-initrd.patch b/pkgs/applications/virtualization/qemu/riscv-initrd.patch deleted file mode 100644 index a7e5b28cfd5e..000000000000 --- a/pkgs/applications/virtualization/qemu/riscv-initrd.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 44b0f612499764dad425d467aadacb01fbd4a920 Mon Sep 17 00:00:00 2001 -From: Shea Levy <shea@shealevy.com> -Date: Tue, 20 Feb 2018 07:59:43 -0500 -Subject: [PATCH] riscv: Respect the -initrd flag. - -Logic for initrd start address borrowed from arm/boot.c ---- - hw/riscv/virt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 46 insertions(+), 3 deletions(-) - -diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c -index 46d95b2b79..5c7d191a3f 100644 ---- a/hw/riscv/virt.c -+++ b/hw/riscv/virt.c -@@ -77,7 +77,35 @@ static uint64_t load_kernel(const char *kernel_filename) - return kernel_entry; - } - --static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, -+static hwaddr load_initrd(const char *filename, uint64_t mem_size, -+ uint64_t kernel_entry, hwaddr *start) -+{ -+ int size; -+ -+ /* We want to put the initrd far enough into RAM that when the -+ * kernel is uncompressed it will not clobber the initrd. However -+ * on boards without much RAM we must ensure that we still leave -+ * enough room for a decent sized initrd, and on boards with large -+ * amounts of RAM we must avoid the initrd being so far up in RAM -+ * that it is outside lowmem and inaccessible to the kernel. -+ * So for boards with less than 256MB of RAM we put the initrd -+ * halfway into RAM, and for boards with 256MB of RAM or more we put -+ * the initrd at 128MB. -+ */ -+ *start = kernel_entry + MIN(mem_size / 2, 128 * 1024 * 1024); -+ -+ size = load_ramdisk(filename, *start, mem_size - *start); -+ if (size == -1) { -+ size = load_image_targphys(filename, *start, mem_size - *start); -+ if (size == -1) { -+ error_report("qemu: could not load ramdisk '%s'", filename); -+ exit(1); -+ } -+ } -+ return *start + size; -+} -+ -+static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, - uint64_t mem_size, const char *cmdline) - { - void *fdt; -@@ -233,6 +261,8 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, - qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename); - qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); - g_free(nodename); -+ -+ return fdt; - } - - static void riscv_virt_board_init(MachineState *machine) -@@ -246,6 +276,7 @@ static void riscv_virt_board_init(MachineState *machine) - char *plic_hart_config; - size_t plic_hart_config_len; - int i; -+ void *fdt; - - /* Initialize SOC */ - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); -@@ -265,7 +296,8 @@ static void riscv_virt_board_init(MachineState *machine) - main_mem); - - /* create device tree */ -- create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); -+ fdt = create_fdt(s, memmap, machine->ram_size, -+ machine->kernel_cmdline); - - /* boot rom */ - memory_region_init_ram(boot_rom, NULL, "riscv_virt_board.bootrom", -@@ -273,7 +305,18 @@ static void riscv_virt_board_init(MachineState *machine) - memory_region_add_subregion(system_memory, 0x0, boot_rom); - - if (machine->kernel_filename) { -- load_kernel(machine->kernel_filename); -+ uint64_t kernel_entry = load_kernel(machine->kernel_filename); -+ -+ if (machine->initrd_filename) { -+ hwaddr start; -+ hwaddr end = load_initrd(machine->initrd_filename, -+ machine->ram_size, kernel_entry, -+ &start); -+ qemu_fdt_setprop_cell(fdt, "/chosen", -+ "linux,initrd-start", start); -+ qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", -+ end); -+ } - } - - /* reset vector */ diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix index 5e234dcb8935..2159ad4b4dc9 100644 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ b/pkgs/applications/virtualization/qemu/riscv.nix @@ -1,22 +1,30 @@ { qemu, fetchFromGitHub, lib }: let src = fetchFromGitHub { - owner = "riscv"; - repo = "riscv-qemu"; - rev = "af435b709d4a5de3ec2e59ff4dcd05b0b295a730"; - sha256 = "1kqcsn8yfdg3zyd991i4v5dxznd1l4a4hjry9304lvsm3sz2wllw"; + owner = "riscv"; + repo = "riscv-qemu"; + rev = "f733c7b5f86147216e14aff90c03ccdd76056bef"; + sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq"; fetchSubmodules = true; }; - version = "2.11.50"; - revCount = "58771"; - shortRev = "af435b709d"; + version = "2.11.92"; + revCount = "60378"; + shortRev = builtins.substring 0 9 src.rev; targets = [ "riscv32-linux-user" "riscv32-softmmu" "riscv64-linux-user" "riscv64-softmmu" ]; in lib.overrideDerivation qemu (orig: { name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; inherit src; - # https://github.com/riscv/riscv-qemu/pull/109 - patches = orig.patches ++ [ ./riscv-initrd.patch ]; +# <<<<<<< HEAD +# # https://github.com/riscv/riscv-qemu/pull/109 +# patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ]; +# ======= + # The pulseaudio and statfs patches are in 2.12.0+, which this is based on + patches = [ + ./force-uid0-on-9p.patch + ./no-etc-install.patch + ]; + configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; postInstall = null; }) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 947f4454362b..777dc6fe9304 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.29.0"; + version = "1.30.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda"; + sha256 = "0dqf83b7iin1np8k8k1m8i99ybga8vx932q7n2q64yghkw7p6i00"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 662805438958..0a45b4d5d90d 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.4.2"; + version = "2.4.5"; enableParallelBuilding = true; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "0cpa2yp82g9j64mgr90p75ddk85kbj1qi1r6hy0sz17grqdlaxl4"; + sha256 = "0wz2in07197n5c2csww864nn2qmr925lqcjsd1kmlwwnrhq6lzl3"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 9316496a547e..c8af6a1ccf55 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,17 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtmultimedia, qtsvg, qttools +, qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.52.80"; + version = "0.60.88"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "131rs6c90vdf1j40qj7k6s939y8la9ma0q3labxb7ac3r8hvhn6a"; + sha256 = "0hd5d8zdghc5clv8pa4h9zigshdrarfpmzyvrq56rjkm13lrdz52"; }; cmakeFlags = [ @@ -20,14 +20,12 @@ mkDerivation rec { ]; buildInputs = [ - qtbase qtmultimedia qtsvg + qtbase qtmultimedia qtsvg krdc libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - meta = with lib; { homepage = https://f1ash.github.io/qt-virt-manager; description = "Desktop user interface for managing virtual machines (QT)"; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index cce91dcd5deb..79be1be11908 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -41,6 +41,12 @@ let sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq"; }); + qemuMemfdBuildFix = fetchpatch { + name = "xen-4.8-memfd-build-fix.patch"; + url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib @@ -63,6 +69,9 @@ callPackage (import ./generic.nix (rec { rev = "refs/tags/qemu-xen-${version}"; sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4"; }; + patches = [ + qemuMemfdBuildFix + ]; buildInputs = qemuDeps; meta.description = "Xen's fork of upstream Qemu"; }; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 16c624b09ccf..c494ee266be3 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "144g0vg0jsy0lja2jv1qbdps8k05nk70pc7vslj3im61a21vnbis"; + sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 76352753db1d..f18afb935278 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://dl.suckless.org/dwm/${name}.tar.gz"; + url = "https://dl.suckless.org/dwm/${name}.tar.gz"; sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2"; }; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 9c24df004f39..46c87b0b189e 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "4.15"; src = fetchurl { - url = "http://i3wm.org/downloads/${name}.tar.bz2"; + url = "https://i3wm.org/downloads/${name}.tar.bz2"; sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91"; }; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index b322c7da193a..d6668cde2bdc 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideDerivation (super : rec { name = "i3-gaps-${version}"; - version = "4.14.1"; - releaseDate = "2017-09-24"; + version = "4.15.0.1"; + releaseDate = "2018-03-13"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7"; + sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal"; }; nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 68e77a54b5ad..1fed92764c10 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }: +{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; - version = "3.35"; + # i3pystatus moved to rolling release: + # https://github.com/enkore/i3pystatus/issues/584 + version = "unstable-2018-04-11"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; - src = fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0g5m05rbqvq1qrspm6fyzky9xfhaz5pvc4hfzgdxrzijn8nfc860"; + src = fetchFromGitHub + { + owner = "enkore"; + repo = "i3pystatus"; + rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; + sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ @@ -16,7 +20,8 @@ python3Packages.buildPythonApplication rec { libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\""; - makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually + # LC_TIME != C results in locale.Error: unsupported locale setting + makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 0b86c0283e0c..014434011af0 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2018-01-15"; + version = "0.9.0.2018-03-31"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "aa7bc98d945ba63358cd48c66e0261c201b999e4"; - sha256 = "1q2p53nl499yxsw0i81ryyc2ln80p8i3iii5hx7aiwfi4ybm55b1"; + rev = "18f99299bcd5b63da4e315c8d78622c4bbf59c45"; + sha256 = "1pfcq3f724ri6jzchkgf96zd7lb5mc882r64ffx634gqf3n8ch41"; }; cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 19c9f8c98351..b54f6e8def33 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "i3status-2.11"; src = fetchurl { - url = "http://i3wm.org/i3status/${name}.tar.bz2"; + url = "https://i3wm.org/i3status/${name}.tar.bz2"; sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq"; }; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix new file mode 100644 index 000000000000..39bd62cd5aa9 --- /dev/null +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +python2Packages.buildPythonApplication rec { + pname = "i3-wk-switch"; + version = "2017-08-21"; + + # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb + src = fetchFromGitHub { + owner = "tmfink"; + repo = pname; + rev = "484f840"; + sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb"; + }; + + propagatedBuildInputs = with python2Packages; [ i3-py ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p "$out/bin" + cp i3-wk-switch.py "$out/bin/i3-wk-switch" + ''; + + meta = with stdenv.lib; { + description = "XMonad-like workspace switching for i3"; + maintainers = with maintainers; [ synthetica ]; + platforms = platforms.linux; + license = licenses.mit; + homepage = https://travisf.net/i3-wk-switcher; + }; +} diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ffd1d995e87b..8406736541c0 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm" ''; + patches = [ ./fix-strlcat_strlcpy.patch ] ++ + stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch; + + patchFlags = [ "-p0" ]; + meta = { description = "A simple, lightweight X window manager"; longDescription = '' @@ -34,6 +39,6 @@ stdenv.mkDerivation rec { homepage = http://www.icewm.org/; license = licenses.lgpl2; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch b/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch new file mode 100644 index 000000000000..9721e125b051 --- /dev/null +++ b/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch @@ -0,0 +1,236 @@ +--- src/apppstatus.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/apppstatus.cc 2017-08-09 09:12:54.332052762 +0200 +@@ -366,7 +366,7 @@ + sscanf(p, "%s %s %s %s %s", val[0], val[1], val[2], val[3], val[4]); + for (i = 0; i < 4; i++) { + if (strncmp(val[i+1], "?", 1) != 0) +- strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); ++ my_strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); + } + } + +--- src/base.h 2017-07-30 10:59:06.000000000 +0200 ++++ src/base.h 2017-08-09 09:11:13.082025484 +0200 +@@ -44,9 +44,9 @@ + /*** String Functions *********************************************************/ + + /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ +-size_t strlcpy(char *dest, const char *from, size_t dest_size); ++size_t my_strlcpy(char *dest, const char *from, size_t dest_size); + /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ +-size_t strlcat(char *dest, const char *from, size_t dest_size); ++size_t my_strlcat(char *dest, const char *from, size_t dest_size); + + char *newstr(char const *str); + char *newstr(char const *str, int len); +--- src/gnome2.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/gnome2.cc 2017-08-09 09:11:21.819027846 +0200 +@@ -158,8 +158,8 @@ + const int plen = strlen(fPath); + + char tmp[256]; +- strlcpy(tmp, fPath, sizeof tmp); +- strlcat(tmp, "/.directory", sizeof tmp); ++ my_strlcpy(tmp, fPath, sizeof tmp); ++ my_strlcat(tmp, "/.directory", sizeof tmp); + + if (isDir && !stat(tmp, &sb)) { // looks like kde/gnome1 style + +@@ -279,8 +279,8 @@ + + while ((file = readdir(dir)) != NULL) { + char fullpath[256]; +- strlcpy(fullpath, dirname, sizeof fullpath); +- strlcat(fullpath, file->d_name, sizeof fullpath); ++ my_strlcpy(fullpath, dirname, sizeof fullpath); ++ my_strlcat(fullpath, file->d_name, sizeof fullpath); + GnomeDesktopItem *ditem = + gnome_desktop_item_new_from_file(fullpath, + (GnomeDesktopItemLoadFlags)0, +--- src/icehelp.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icehelp.cc 2017-08-09 09:11:31.490030459 +0200 +@@ -1790,8 +1790,8 @@ + const size_t size = 9 + strlen(cfmt) + strlen(cstr) + strlen(crea); + char *cbuf = (char *)malloc(size); + snprintf(cbuf, size, cfmt, cstr); +- strlcat(cbuf, ":\n ", size); +- strlcat(cbuf, crea, size); ++ my_strlcat(cbuf, ":\n ", size); ++ my_strlcat(cbuf, crea, size); + + node *root = new node(node::div); + flist<node> nodes(root); +--- src/icesm.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icesm.cc 2017-08-09 09:13:12.946057758 +0200 +@@ -28,10 +28,10 @@ + wordexp_t w; + if (wordexp(trim(buf), &w, 0) != 0 || w.we_wordc == 0) + return false; +- size_t len = strlcpy(buf, trim(w.we_wordv[0]), bufsiz); ++ size_t len = my_strlcpy(buf, trim(w.we_wordv[0]), bufsiz); + for (size_t k = 1; k < w.we_wordc && len < bufsiz; ++k) { +- strlcat(buf, " ", bufsiz); +- len = strlcat(buf, trim(w.we_wordv[k]), bufsiz); ++ my_strlcat(buf, " ", bufsiz); ++ len = my_strlcat(buf, trim(w.we_wordv[k]), bufsiz); + } + wordfree(&w); + if (len >= bufsiz) +@@ -39,7 +39,7 @@ + #else + char *str = trim(buf); + if (str > buf) +- strlcpy(buf, str, bufsiz); ++ my_strlcpy(buf, str, bufsiz); + #endif + if (buf[0] == '#' || buf[0] == '=') + buf[0] = 0; +--- src/icesound.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icesound.cc 2017-08-09 09:11:26.686029161 +0200 +@@ -145,8 +145,8 @@ + char * findSample(int sid) { + char basefname[1024]; + +- strlcpy(basefname, gui_events[sid].name, sizeof basefname); +- strlcat(basefname, ".wav", sizeof basefname); ++ my_strlcpy(basefname, gui_events[sid].name, sizeof basefname); ++ my_strlcat(basefname, ".wav", sizeof basefname); + + return findSample(basefname); + } +--- src/misc.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/misc.cc 2017-08-09 09:13:39.372064834 +0200 +@@ -448,7 +448,7 @@ + #endif + + /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ +-size_t strlcpy(char *dest, const char *from, size_t dest_size) ++size_t my_strlcpy(char *dest, const char *from, size_t dest_size) + { + const char *in = from; + if (dest_size > 0) { +@@ -463,12 +463,12 @@ + } + + /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ +-size_t strlcat(char *dest, const char *from, size_t dest_size) ++size_t my_strlcat(char *dest, const char *from, size_t dest_size) + { + char *to = dest; + char *const stop = to + dest_size - 1; + while (to < stop && *to) ++to; +- return to - dest + strlcpy(to, from, dest_size - (to - dest)); ++ return to - dest + my_strlcpy(to, from, dest_size - (to - dest)); + } + + char *newstr(char const *str) { +--- src/strtest.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/strtest.cc 2017-08-09 09:13:24.395060823 +0200 +@@ -286,63 +286,63 @@ + strtest tester("strlc"); + char d[10] = "@"; + size_t n; +- n = strlcpy(d, "", 0); ++ n = my_strlcpy(d, "", 0); + sequal(d, "@"); + assert(d, n == 0); + +- n = strlcpy(d, "a", 0); ++ n = my_strlcpy(d, "a", 0); + sequal(d, "@"); + assert(d, n == 1); + +- n = strlcpy(d, "", 1); ++ n = my_strlcpy(d, "", 1); + sequal(d, ""); + assert(d, n == 0); + +- n = strlcpy(d, "a", 1); ++ n = my_strlcpy(d, "a", 1); + sequal(d, ""); + assert(d, n == 1); + +- n = strlcpy(d, "a", 2); ++ n = my_strlcpy(d, "a", 2); + sequal(d, "a"); + assert(d, n == 1); + +- n = strlcpy(d, "ab", 2); ++ n = my_strlcpy(d, "ab", 2); + sequal(d, "a"); + assert(d, n == 2); + +- n = strlcpy(d, "ab", 3); ++ n = my_strlcpy(d, "ab", 3); + sequal(d, "ab"); + assert(d, n == 2); + +- n = strlcpy(d, "abc", sizeof d); ++ n = my_strlcpy(d, "abc", sizeof d); + sequal(d, "abc"); + assert(d, n == 3); + +- n = strlcat(d, "def", 4); ++ n = my_strlcat(d, "def", 4); + sequal(d, "abc"); + assert(d, n == 6); + +- n = strlcat(d, "def", sizeof d); ++ n = my_strlcat(d, "def", sizeof d); + sequal(d, "abcdef"); + assert(d, n == 6); + +- n = strlcat(d, "ghijkl", sizeof d); ++ n = my_strlcat(d, "ghijkl", sizeof d); + sequal(d, "abcdefghi"); + assert(d, n == 12); + +- n = strlcpy(d, "123", sizeof d); ++ n = my_strlcpy(d, "123", sizeof d); + sequal(d, "123"); + assert(d, n == 3); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, "23"); + assert(d, n == 2); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, "3"); + assert(d, n == 1); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, ""); + assert(d, n == 0); + } +@@ -418,7 +418,7 @@ + while (a.next()) { + const char *e = a.entry(); + assert(e, strcoll(buf, e) < 0); +- strlcpy(buf, e, sizeof buf); ++ my_strlcpy(buf, e, sizeof buf); + } + assert(buf, strcoll(buf, "~~~~~~~~~") < 0); + } +@@ -437,7 +437,7 @@ + cstring c(s.entry()); + const char *e = c.c_str(); + assert(e, strcoll(buf, e) < 0); +- strlcpy(buf, e, sizeof buf); ++ my_strlcpy(buf, e, sizeof buf); + } + assert(buf, strcoll(buf, "~~~~~~~~~") < 0); + } +--- src/udir.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/udir.cc 2017-08-09 09:13:28.346061883 +0200 +@@ -66,7 +66,7 @@ + if (impl) { + DirPtr dirp(impl); + if (dirp.next()) { +- strlcpy(fEntry, dirp.name(), sizeof fEntry); ++ my_strlcpy(fEntry, dirp.name(), sizeof fEntry); + return true; + } + } diff --git a/pkgs/applications/window-managers/icewm/musl.patch b/pkgs/applications/window-managers/icewm/musl.patch new file mode 100644 index 000000000000..e7d18e312874 --- /dev/null +++ b/pkgs/applications/window-managers/icewm/musl.patch @@ -0,0 +1,23 @@ +--- src/ylocale.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/ylocale.cc 2017-08-09 08:15:50.938841549 +0200 +@@ -55,6 +55,8 @@ + int const codesetItems[] = { + #ifdef CONFIG_NL_CODESETS + CONFIG_NL_CODESETS ++#elif !defined(__GLIBC__) ++ CODESET, 0 + #else + CODESET, _NL_CTYPE_CODESET_NAME, 0 + #endif +--- src/globit.c 2017-07-30 10:59:06.000000000 +0200 ++++ src/globit.c 2017-08-09 08:17:18.691824584 +0200 +@@ -143,7 +143,9 @@ + } else if (*pattern == '~') { + /* yes, tilde */ + is_absolute = 2; ++#if defined(__GLIBC__) + glob_flags |= GLOB_TILDE; ++#endif + /* any slash in the pattern? */ + while (*cp && *cp != '/') + ++cp; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index d18ffb507956..c219c81c2a50 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sawfish-${version}"; - version = "1.12.0"; + version = "1.12.90"; sourceName = "sawfish_${version}"; src = fetchurl { url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; - sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4"; + sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index e7427fa7763a..117d4fe1d6a8 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index d643e2dd2186..89e7b9dd0880 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "sway-${version}"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi"; + sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index cca9f1c6ac58..86c91347f253 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06"; + sha256 = "0cw547x7vky55k3ksrmzmrra4zhslqcwq9xw0y4cmbvy4s1qf64v"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 279ba68eae8b..5e1098e97064 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "tabbed-20160425"; src = fetchgit { - url = http://git.suckless.org/tabbed; + url = https://git.suckless.org/tabbed; rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164"; sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://tools.suckless.org/tabbed; + homepage = https://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; maintainers = with maintainers; [ viric vrthra ]; diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix index 182a290e0eee..01360e5af0b3 100644 --- a/pkgs/applications/window-managers/velox/dmenu.nix +++ b/pkgs/applications/window-managers/velox/dmenu.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; + homepage = https://tools.suckless.org/dmenu; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/applications/window-managers/velox/st.nix b/pkgs/applications/window-managers/velox/st.nix index 49ce57469bd6..2d73df650463 100644 --- a/pkgs/applications/window-managers/velox/st.nix +++ b/pkgs/applications/window-managers/velox/st.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://st.suckless.org/; + homepage = https://st.suckless.org/; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 2ea0480cc5ec..4a15e3236168 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wayland, libGLU_combined, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols @@ -7,16 +7,16 @@ stdenv.mkDerivation rec { name = "weston-${version}"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd"; + sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - wayland libGLU_combined libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva libwebp wayland-protocols ]; diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index f2acf03958b6..f2acf03958b6 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix diff --git a/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch index 031843afb172..031843afb172 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch +++ b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index ae910b76c708..5c0436b73ddf 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -53,6 +53,7 @@ let dynamicLinker = /**/ if libc == null then null else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" + else if targetPlatform.libc == "bionic" then "/system/bin/linker" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". diff --git a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash index a0c4e9edfcdb..71b9471cbc83 100644 --- a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash +++ b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash @@ -2,107 +2,245 @@ set -eu -o pipefail +# For cmd | while read; do ...; done +shopt -s lastpipe + path_backup="$PATH" if [ -n "@coreutils_bin@" ]; then PATH="@coreutils_bin@/bin" fi -declare -r recurThreshold=300 - -declare overflowCount=0 -for ((n=0; n < $#; ++n)); do - case "${!n}" in - -l*) let overflowCount+=1 ;; - -reexport-l*) let overflowCount+=1 ;; - *) ;; +declare -ri recurThreshold=200 +declare -i overflowCount=0 + +declare -ar origArgs=("$@") + +# Throw away what we won't need +declare -a parentArgs=() + +while (( $# )); do + case "$1" in + -l) + echo "cctools LD does not support '-l foo'" >&2 + exit 1 + ;; + -lazy_library | -reexport_library | -upward_library | -weak_library) + overflowCount+=1 + shift 2 + ;; + -l* | *.so.* | *.dylib | -lazy-l* | -reexport-l* | -upward-l* | -weak-l*) + overflowCount+=1 + shift 1 + ;; + *.a | *.o) + shift 1 + ;; + -L | -F) + # Evidentally ld doesn't like using the child's RPATH, so it still + # needs these. + parentArgs+=("$1" "$2") + shift 2 + ;; + -L?* | -F?*) + parentArgs+=("$1") + shift 1 + ;; + -o) + outputName="$2" + parentArgs+=("$1" "$2") + shift 2 + ;; + -install_name | -dylib_install_name | -dynamic-linker | -plugin) + parentArgs+=("$1" "$2") + shift 2 + ;; + -rpath) + # Only an rpath to the child is needed, which we will add + shift 2 + ;; + *) + if [[ -f "$1" ]]; then + # Propabably a non-standard object file like Haskell's + # `.dyn_o`. Skip it like other inputs + : + else + parentArgs+=("$1") + fi + shift 1 + ;; esac done -declare -a allArgs=() + if (( "$overflowCount" <= "$recurThreshold" )); then - allArgs=("$@") -else - declare -a childrenLookup=() childrenLink=() - - while (( $# )); do - case "$1" in - -L/*) - childrenLookup+=("$1") - allArgs+=("$1") - ;; - -L) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -l) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -lazy_library | -lazy_framework | -lto_library) - # We aren't linking any "azy_library", "to_library", etc. - allArgs+=("$1") - ;; - -lazy-l | -weak-l) allArgs+=("$1") ;; - # We can't so easily prevent header issues from these. - -lSystem) allArgs+=("$1") ;; - # Special case as indirection seems like a bad idea for something - # so fundamental. Can be removed for simplicity. - -l?* | -reexport-l?*) childrenLink+=("$1") ;; - *) allArgs+=("$1") ;; - esac - - shift - done + if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: Only ${overflowCount} inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 + fi + PATH="$path_backup" + exec @prog@ "${origArgs[@]}" +fi + + + +if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: ${overflowCount} inputs counted when ${recurThreshold} is the ceiling, inspecting further. " >&2 +fi + +# Collect the normalized linker input +declare -a norm=() - declare n=0 - while (( $n < "${#childrenLink[@]}" )); do - if [[ "${childrenLink[n]}" = -l* ]]; then - childrenLink[n]="-reexport${childrenLink[n]}" - fi - let ++n +# Arguments are null-separated +@prog@ --dump-normalized-lib-args "${origArgs[@]}" | + while IFS= read -r -d '' input; do + norm+=("$input") done - unset n - - declare -r outputNameLibless=$(basename $( \ - if [[ -z "${outputName:+isUndefined}" ]]; then - echo unnamed - elif [[ "${outputName:0:3}" = lib ]]; then - echo "${outputName:3}" - else - echo "${outputName}" - fi)) - declare -ra children=("$outputNameLibless-reexport-delegate-0" \ - "$outputNameLibless-reexport-delegate-1") - - mkdir -p "$out/lib" - - PATH="$PATH:@out@/bin" - - symbolBloatObject=$outputNameLibless-symbol-hack.o - if [[ ! -e $symbolBloatObject ]]; then - # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward - # dependency cycle. - printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @targetPrefix@as -Q -- -o $symbolBloatObject + +declare -i leafCount=0 +declare lastLeaf='' +declare -a childrenInputs=() trailingInputs=() +while (( "${#norm[@]}" )); do + case "${norm[0]}" in + -lazy_library | -upward_library) + # TODO(@Ericson2314): Don't do that, but intersperse children + # between such args. + echo "ld-wrapper: Warning: Potentially changing link order" >&2 + trailingInputs+=("${norm[0]}" "${norm[1]}") + norm=("${norm[@]:2}") + ;; + -reexport_library | -weak_library) + childrenInputs+=("${norm[0]}" "${norm[1]}") + if [[ "${norm[1]}" != "$lastLeaf" ]]; then + leafCount+=1 + lastLeaf="${norm[1]}" + fi + norm=("${norm[@]:2}") + ;; + *.so | *.dylib) + childrenInputs+=(-reexport_library "${norm[0]}") + if [[ "${norm[0]}" != "$lastLeaf" ]]; then + leafCount+=1 + lastLeaf="${norm[0]}" + fi + norm=("${norm[@]:1}") + ;; + *.o | *.a) + # Don't delegate object files or static libs + parentArgs+=("${norm[0]}") + norm=("${norm[@]:1}") + ;; + *) + if [[ -f "${norm[0]}" ]]; then + # Propabably a non-standard object file. We'll let it by. + parentArgs+=("${norm[0]}") + norm=("${norm[@]:1}") + else + echo "ld-wrapper: Internal Error: Invalid normalized argument" >&2 + exit -1 + fi + ;; + esac +done + + + +if (( "$leafCount" <= "$recurThreshold" )); then + if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: Only ${leafCount} *dynamic* inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 + fi + PATH="$path_backup" + exec @prog@ "${origArgs[@]}" +fi + + + +if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: ${leafCount} *dynamic* inputs counted when ${recurThreshold} is the ceiling, delegating to children. " >&2 +fi + +declare -r outputNameLibless=$( \ + if [[ -z "${outputName:+isUndefined}" ]]; then + echo unnamed + return 0; fi + baseName=$(basename ${outputName}) + if [[ "$baseName" = lib* ]]; then + baseName="${baseName:3}" + fi + echo "$baseName") + +declare -ra children=( + "$outputNameLibless-reexport-delegate-0" + "$outputNameLibless-reexport-delegate-1" +) + +mkdir -p "$out/lib" + +symbolBloatObject=$outputNameLibless-symbol-hack.o +if [[ ! -f $symbolBloatObject ]]; then + # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward + # dependency cycle. + printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' | + PATH="$PATH:@out@/bin" @targetPrefix@as -Q -- -o $symbolBloatObject +fi + +# Split inputs between children +declare -a child0Inputs=() child1Inputs=("${childrenInputs[@]}") +let "countFirstChild = $leafCount / 2" || true +lastLeaf='' +while (( "$countFirstChild" )); do + case "${child1Inputs[0]}" in + -reexport_library | -weak_library) + child0Inputs+=("${child1Inputs[0]}" "${child1Inputs[1]}") + if [[ "${child1Inputs[1]}" != "$lastLeaf" ]]; then + let countFirstChild-=1 || true + lastLeaf="${child1Inputs[1]}" + fi + child1Inputs=("${child1Inputs[@]:2}") + ;; + *.so | *.dylib) + child0Inputs+=(-reexport_library "${child1Inputs[0]}") + if [[ "${child1Inputs[0]}" != "$lastLeaf" ]]; then + let countFirstChild-=1 || true + lastLeaf="${child1Inputs[1]}" + fi + child1Inputs=("${child1Inputs[@]:2}") + ;; + *) + echo "ld-wrapper: Internal Error: Invalid delegated input" >&2 + exit -1 + ;; + esac +done + + +# First half of libs +@out@/bin/@targetPrefix@ld \ + -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[0]}.dylib" \ + -install_name "$out/lib/lib${children[0]}.dylib" \ + "$symbolBloatObject" "${child0Inputs[@]}" "${trailingInputs[@]}" + +# Second half of libs +@out@/bin/@targetPrefix@ld \ + -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[1]}.dylib" \ + -install_name "$out/lib/lib${children[1]}.dylib" \ + "$symbolBloatObject" "${child1Inputs[@]}" "${trailingInputs[@]}" + +parentArgs+=("-L$out/lib" -rpath "$out/lib") +if [[ $outputName != *reexport-delegate* ]]; then + parentArgs+=("-l${children[0]}" "-l${children[1]}") +else + parentArgs+=("-reexport-l${children[0]}" "-reexport-l${children[1]}") +fi + +parentArgs+=("${trailingInputs[@]}") - # first half of libs - @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[0]}.dylib" \ - -install_name "$out/lib/lib${children[0]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" - - # second half of libs - @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[1]}.dylib" \ - -install_name "$out/lib/lib${children[1]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" - - allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") +if [ -n "${NIX_DEBUG:-}" ]; then + echo "flags using delegated children to @prog@:" >&2 + printf " %q\n" "${parentArgs[@]}" >&2 fi PATH="$path_backup" -exec @prog@ "${allArgs[@]}" +exec @prog@ "${parentArgs[@]}" diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix new file mode 100644 index 000000000000..bc6482f0a88e --- /dev/null +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -0,0 +1,25 @@ +# Build a python package from info made available by setupcfg2nix. +# +# * src: The source of the package. +# * info: The package information generated by setupcfg2nix. +# * meta: Standard nixpkgs metadata. +# * application: Whether this package is a python library or an +# application which happens to be written in python. +# * doCheck: Whether to run the test suites. +pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true }: let + build = if application + then pythonPackages.buildPythonApplication + else pythonPackages.buildPythonPackage; +in build { + inherit (info) pname version; + + inherit src meta doCheck; + + nativeBuildInputs = map (p: pythonPackages.${p}) ( + (info.setup_requires or []) ++ + (if doCheck then (info.tests_require or []) else [])); + + propagatedBuildInputs = map (p: pythonPackages.${p}) + (info.install_requires or []); +} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 653a651df7bd..75e279afdc37 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -44,8 +44,8 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) - mkdir src - ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum + mkdir -p src/github.com/docker/docker/pkg + ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build cp tarsum $out @@ -249,6 +249,10 @@ rec { baseJson, # Files to add to the layer. contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # Additional commands to run on the layer before it is tar'd up. extraCommands ? "", uid ? 0, gid ? 0 }: @@ -262,7 +266,7 @@ rec { echo "Adding contents..." for item in $contents; do echo "Adding $item" - rsync -ak --chown=0:0 $item/ layer/ + rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done else echo "No contents to add to layer." @@ -303,6 +307,10 @@ rec { runAsRoot, # Files to add to the layer. If null, an empty layer will be created. contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # JSON containing configuration and metadata for this layer. baseJson, # Existing image onto which to append the new layer. @@ -327,7 +335,7 @@ rec { echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." - rsync -ak --chown=0:0 $item/ layer/ + rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done chmod ug+w layer @@ -391,6 +399,10 @@ rec { fromImageTag ? null, # Files to put on the image (a nix store path or list of paths). contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # Docker config; e.g. what command to run on the container. config ? null, # Optional bash script to run on the files prior to fixturizing the layer. @@ -417,11 +429,12 @@ rec { if runAsRoot == null then mkPureLayer { name = baseName; - inherit baseJson contents extraCommands uid gid; + inherit baseJson contents keepContentsDirlinks extraCommands uid gid; } else mkRootLayer { name = baseName; inherit baseJson fromImage fromImageName fromImageTag - contents runAsRoot diskSize extraCommands; + contents keepContentsDirlinks runAsRoot diskSize + extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { buildInputs = [ jshon pigz coreutils findutils jq ]; @@ -484,6 +497,16 @@ rec { # Record the contents of the tarball with ls_tar. ls_tar temp/layer.tar >> baseFiles + # Append nix/store directory to the layer so that when the layer is loaded in the + # image /nix/store has read permissions for non-root users. + # nix/store is added only if the layer has /nix/store paths in it. + if [ $(wc -l < $layerClosure) -gt 1 ] && [ $(grep -c -e "^/nix/store$" baseFiles) -eq 0 ]; then + mkdir -p nix/store + chmod -R 555 nix + echo "./nix" >> layerFiles + echo "./nix/store" >> layerFiles + fi + # Get the files in the new layer which were *not* present in # the old layer, and record them as newFiles. comm <(sort -n baseFiles|uniq) \ diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go index ad33bbac75b4..f91a90bdbdab 100644 --- a/pkgs/build-support/docker/tarsum.go +++ b/pkgs/build-support/docker/tarsum.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" "os" - "tarsum" + "github.com/docker/docker/pkg/tarsum" ) func main() { diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 8287c1672d06..5658094872c8 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -1,5 +1,19 @@ source $stdenv/setup +# When no modules are built, the $out/lib/modules directory will not +# exist. Because the rest of the script assumes it does exist, we +# handle this special case first. +if ! test -d "$kernel/lib/modules"; then + if test -z "$rootModules" || test -n "$allowMissing"; then + mkdir -p "$out" + exit 0 + else + echo "Required modules: $rootModules" + echo "Can not derive a closure of kernel modules because no modules were provided." + exit 1 + fi +fi + version=$(cd $kernel/lib/modules && ls -d *) echo "kernel version is $version" diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 8a9a07fd7a8f..e0aec6e0e18b 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -19,7 +19,7 @@ let makeDeps = dependencies: echo_build_heading() { start="" end="" - if [[ x"${colors}" -eq x"always" ]]; then + if [[ "${colors}" == "always" ]]; then start="$(printf '\033[0;1;32m')" #set bold, and set green. end="$(printf '\033[0m')" #returns to "normal" fi @@ -34,7 +34,7 @@ let makeDeps = dependencies: noisily() { start="" end="" - if [[ x"${colors}" -eq x"always" ]]; then + if [[ "${colors}" == "always" ]]; then start="$(printf '\033[0;1;32m')" #set bold, and set green. end="$(printf '\033[0m')" #returns to "normal" fi @@ -47,7 +47,7 @@ let makeDeps = dependencies: ''; configureCrate = - { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies }: + { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); @@ -58,6 +58,7 @@ let makeDeps = dependencies: completeDepsDir = lib.concatStringsSep " " completeDeps; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; in '' + cd ${workspace_member} runHook preConfigure ${echo_build_heading colors} ${noisily colors verbose} @@ -146,10 +147,15 @@ let makeDeps = dependencies: mkdir -p $OUT_DIR target/build/${crateName}/build_script_build > target/build/${crateName}.opt set +e - EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') - EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') - EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + + for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do + export $env + done + CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env @@ -171,8 +177,7 @@ let makeDeps = dependencies: dependencies, completeDeps, completeBuildDeps, crateFeatures, libName, build, release, libPath, crateType, metadata, crateBin, finalBins, - extraRustcOpts, - verbose, colors }: + extraRustcOpts, verbose, colors }: let depsDir = lib.concatStringsSep " " dependencies; completeDepsDir = lib.concatStringsSep " " completeDeps; @@ -182,7 +187,7 @@ let makeDeps = dependencies: rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - extraRustcOpts; + (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; @@ -194,7 +199,7 @@ let makeDeps = dependencies: bold="" green="" boldgreen="" - if [[ "${colors}" -eq "always" ]]; then + if [[ "${colors}" == "always" ]]; then norm="$(printf '\033[0m')" #returns to "normal" bold="$(printf '\033[0;1m')" #set bold green="$(printf '\033[0;32m')" #set green @@ -221,16 +226,16 @@ let makeDeps = dependencies: build_bin() { crate_name=$1 crate_name_=$(echo $crate_name | sed -e "s/-/_/g") - main_file="" - if [[ ! -z $2 ]]; then + main_file="" + if [[ ! -z $2 ]]; then main_file=$2 - fi - echo_build_heading $@ - noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ + fi + echo_build_heading $@ + noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} - if [ "$crate_name_" -ne "$crate_name" ]; then + if [ "$crate_name_" != "$crate_name" ]; then mv target/bin/$crate_name_ target/bin/$crate_name fi } @@ -374,7 +379,7 @@ stdenv.mkDerivation (rec { ); crateFeatures = if crate ? features then - lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) + lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #" else ""; libName = if crate ? libName then crate.libName else crate.crateName; @@ -407,24 +412,26 @@ stdenv.mkDerivation (rec { ) "" crate.crateBin else ""; - build = if crate ? build then crate.build else ""; + build = crate.build or ""; + workspace_member = crate.workspace_member or "."; crateVersion = crate.version; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = if lib.attrByPath ["procMacro"] false crate then "proc-macro" else if lib.attrByPath ["plugin"] false crate then "dylib" else - if crate ? type then crate.type else "lib"; + (crate.type or "lib"); colors = lib.attrByPath [ "colors" ] "always" crate; configurePhase = configureCrate { inherit crateName dependencies buildDependencies completeDeps completeBuildDeps - crateFeatures libName build release libPath crateVersion + crateFeatures libName build workspace_member release libPath crateVersion crateAuthors verbose colors; }; extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; buildPhase = buildCrate { inherit crateName dependencies completeDeps completeBuildDeps - crateFeatures libName build release libPath crateType crateVersion - crateAuthors metadata crateBin finalBins verbose colors extraRustcOpts; + crateFeatures libName build release libPath crateType + crateVersion crateAuthors metadata crateBin finalBins verbose colors + extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index ebb46b0f5921..5b79d607f9d5 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,4 +1,4 @@ -# Generated by carnix 0.6.5: carnix -o carnix.nix Cargo.lock +# Generated by carnix 0.7.2: carnix nix { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; @@ -18,35 +18,36 @@ let kernel = buildPlatform.parsed.kernel.name; ) [] (builtins.attrNames feat); in rec { - carnix = f: carnix_0_6_6 { features = carnix_0_6_6_features { carnix_0_6_6 = f; }; }; - aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; }; + __all = [ (carnix {}) ]; + aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "aho-corasick"; - version = "0.6.3"; + version = "0.6.4"; authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; + sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; libName = "aho_corasick"; crateBin = [ { name = "aho-corasick-dot"; } ]; inherit dependencies buildDependencies features; }; - ansi_term_0_10_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "ansi_term"; - version = "0.10.2"; + version = "0.11.0"; authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; - sha256 = "07k0hfmlhv43lihyxb9d81l5mq5zlpqvv30dkfd3knmv2ginasn9"; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; inherit dependencies buildDependencies features; }; - atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "atty"; - version = "0.2.3"; + version = "0.2.8"; authors = [ "softprops <d.tangren@gmail.com>" ]; - sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d"; inherit dependencies buildDependencies features; }; - backtrace_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "backtrace"; - version = "0.3.4"; + version = "0.3.6"; authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ]; - sha256 = "1caba8w3rqd5ghr88ghyz5wgkf81dgx18bj1llkax6qmianc6gk7"; + sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx"; inherit dependencies buildDependencies features; }; backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -57,13 +58,6 @@ rec { build = "build.rs"; inherit dependencies buildDependencies features; }; - bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.7.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; - inherit dependencies buildDependencies features; - }; bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "bitflags"; version = "1.0.1"; @@ -71,18 +65,19 @@ rec { sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; inherit dependencies buildDependencies features; }; - carnix_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "carnix"; - version = "0.6.6"; + version = "0.7.2"; authors = [ "pe@pijul.org <pe@pijul.org>" ]; - sha256 = "1ai2r52j6vlrclhb7cvifx3lsg9naiy3jpsrbi3mmfmr6zbi7rdw"; + sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5"; + crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ]; inherit dependencies buildDependencies features; }; - cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "cc"; - version = "1.0.3"; + version = "1.0.10"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; + sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn"; inherit dependencies buildDependencies features; }; cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -92,27 +87,11 @@ rec { sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; inherit dependencies buildDependencies features; }; - chrono_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "chrono"; - version = "0.4.0"; - authors = [ "Kang Seonghoon <public+rust@mearie.org>" ]; - sha256 = "0hm53hi6v7b6b1va6vn96lx26wvj8gzi2g51s1j02nlz0jcprw6a"; - inherit dependencies buildDependencies features; - }; - clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "clap"; - version = "2.28.0"; + version = "2.31.2"; authors = [ "Kevin K. <kbknapp@gmail.com>" ]; - sha256 = "0m0rj9xw6mja4gdhqmaldv0q5y5jfsfzbyzfd70mm3857aynq03k"; - inherit dependencies buildDependencies features; - }; - dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dbghelp-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; - libName = "dbghelp"; - build = "build.rs"; + sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; inherit dependencies buildDependencies features; }; dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -122,18 +101,18 @@ rec { sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; inherit dependencies buildDependencies features; }; - either_1_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "either"; - version = "1.4.0"; + version = "1.5.0"; authors = [ "bluss" ]; - sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; inherit dependencies buildDependencies features; }; - env_logger_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "env_logger"; - version = "0.5.3"; + version = "0.5.7"; authors = [ "The Rust Project Developers" ]; - sha256 = "1i7jyxrwwv3w2h200ynq3fjg1iyyvi76ny215hi6d334vkkw2s2y"; + sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l"; inherit dependencies buildDependencies features; }; error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -143,62 +122,61 @@ rec { sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; inherit dependencies buildDependencies features; }; - fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "fuchsia-zircon"; - version = "0.2.1"; + version = "0.3.3"; authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; inherit dependencies buildDependencies features; }; - fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "fuchsia-zircon-sys"; - version = "0.2.0"; + version = "0.3.3"; authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; inherit dependencies buildDependencies features; }; - itertools_0_7_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "humantime"; + version = "1.1.1"; + authors = [ "Paul Colomiets <paul@colomiets.name>" ]; + sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "itertools"; - version = "0.7.3"; + version = "0.7.8"; authors = [ "bluss" ]; - sha256 = "128a69cnmgpj38rs6lcwzya773d2vx7f9y7012iycjf9yi2pyckj"; + sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; inherit dependencies buildDependencies features; }; - itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "itoa"; - version = "0.3.4"; + version = "0.4.1"; authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij"; inherit dependencies buildDependencies features; }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "lazy_static"; - version = "0.2.11"; + version = "1.0.0"; authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; inherit dependencies buildDependencies features; }; - libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "libc"; - version = "0.2.33"; + version = "0.2.40"; authors = [ "The Rust Project Developers" ]; - sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1"; + sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; inherit dependencies buildDependencies features; }; - libsqlite3_sys_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "libsqlite3-sys"; - version = "0.9.0"; + version = "0.9.1"; authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; - sha256 = "1pnx3i9h85si6cs4nhazfb28hsvk7dn0arnfvpdzpjdnj9z38q57"; + sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7"; build = "build.rs"; inherit dependencies buildDependencies features; }; @@ -230,6 +208,13 @@ rec { sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; inherit dependencies buildDependencies features; }; + memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "2.0.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; + inherit dependencies buildDependencies features; + }; nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "nom"; version = "3.2.1"; @@ -237,32 +222,11 @@ rec { sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; inherit dependencies buildDependencies features; }; - num_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num"; - version = "0.1.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0b29c25n9mpf6a921khj7a6y3hz5va4vgwppcd2if975qq1shakg"; - inherit dependencies buildDependencies features; - }; - num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-integer"; - version = "0.1.35"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; - inherit dependencies buildDependencies features; - }; - num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-iter"; - version = "0.1.34"; - authors = [ "The Rust Project Developers" ]; - sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; - inherit dependencies buildDependencies features; - }; - num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "num-traits"; - version = "0.1.40"; + version = "0.2.2"; authors = [ "The Rust Project Developers" ]; - sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0"; inherit dependencies buildDependencies features; }; pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -272,25 +236,39 @@ rec { sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; inherit dependencies buildDependencies features; }; - quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.3.6"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp"; + inherit dependencies buildDependencies features; + }; + quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quick-error"; + version = "1.2.1"; + authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ]; + sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6"; + inherit dependencies buildDependencies features; + }; + quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "quote"; - version = "0.3.15"; + version = "0.5.1"; authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r"; inherit dependencies buildDependencies features; }; - rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "rand"; - version = "0.3.18"; + version = "0.4.2"; authors = [ "The Rust Project Developers" ]; - sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; + sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; inherit dependencies buildDependencies features; }; - redox_syscall_0_1_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "redox_syscall"; - version = "0.1.32"; + version = "0.1.37"; authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "1axxj8x6ngh6npkzqc5h216fajkcyrdxdgb7m2f0n5xfclbk47fv"; + sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; libName = "syscall"; inherit dependencies buildDependencies features; }; @@ -302,18 +280,25 @@ rec { libPath = "src/lib.rs"; inherit dependencies buildDependencies features; }; - regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "regex"; - version = "0.2.2"; + version = "0.2.10"; authors = [ "The Rust Project Developers" ]; - sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; + sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca"; inherit dependencies buildDependencies features; }; - regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "regex-syntax"; - version = "0.4.1"; + version = "0.5.5"; authors = [ "The Rust Project Developers" ]; - sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; + sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp"; + inherit dependencies buildDependencies features; + }; + remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.0"; + authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; + sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y"; inherit dependencies buildDependencies features; }; rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -323,75 +308,68 @@ rec { sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; inherit dependencies buildDependencies features; }; - rustc_demangle_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "rustc-demangle"; - version = "0.1.5"; + version = "0.1.7"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; + sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6"; inherit dependencies buildDependencies features; }; - serde_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde"; - version = "1.0.21"; + version = "1.0.38"; authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; + sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk"; inherit dependencies buildDependencies features; }; - serde_derive_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde_derive"; - version = "1.0.21"; + version = "1.0.38"; authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0r20qyimm9scfaz7lc0swnhik9d045zklmbidd0zzpd4b2f3jsqm"; + sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m"; procMacro = true; inherit dependencies buildDependencies features; }; - serde_derive_internals_0_17_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde_derive_internals"; - version = "0.17.0"; + version = "0.23.1"; authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1g1j3v6pj9wbcz3v3w4smjpwrcdwjicmf6yd5cbai04as9iwhw74"; + sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4"; inherit dependencies buildDependencies features; }; - serde_json_1_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde_json"; - version = "1.0.6"; + version = "1.0.14"; authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; + sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj"; inherit dependencies buildDependencies features; }; - strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "strsim"; - version = "0.6.0"; + version = "0.7.0"; authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; - sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; inherit dependencies buildDependencies features; }; - syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "syn"; - version = "0.11.11"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; - inherit dependencies buildDependencies features; - }; - synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "synom"; - version = "0.11.3"; + version = "0.13.1"; authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg"; inherit dependencies buildDependencies features; }; - tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "tempdir"; - version = "0.3.5"; + version = "0.3.7"; authors = [ "The Rust Project Developers" ]; - sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; inherit dependencies buildDependencies features; }; - termcolor_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "termcolor"; - version = "0.3.3"; + version = "0.3.6"; authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1rb853jzvkbwm62373dhls4x4r3r5cvfcsxvqh0i75rhx5j8kwsz"; + sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; inherit dependencies buildDependencies features; }; termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -408,25 +386,32 @@ rec { sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; inherit dependencies buildDependencies features; }; - thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "thread_local"; - version = "0.3.4"; + version = "0.3.5"; authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; inherit dependencies buildDependencies features; }; - time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "time"; - version = "0.1.38"; + version = "0.1.39"; authors = [ "The Rust Project Developers" ]; - sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; + sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if"; inherit dependencies buildDependencies features; }; - toml_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "toml"; - version = "0.4.5"; + version = "0.4.6"; authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "06zxqhn3y58yzjfaykhcrvlf7p2dnn54kn3g4apmja3cn5b18lkk"; + sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; + inherit dependencies buildDependencies features; + }; + ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; inherit dependencies buildDependencies features; }; unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -436,11 +421,11 @@ rec { sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; inherit dependencies buildDependencies features; }; - unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "unicode-xid"; - version = "0.0.4"; + version = "0.1.0"; authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; - sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; inherit dependencies buildDependencies features; }; unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -457,11 +442,11 @@ rec { sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; inherit dependencies buildDependencies features; }; - vcpkg_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "vcpkg"; - version = "0.2.2"; + version = "0.2.3"; authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; - sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; + sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; inherit dependencies buildDependencies features; }; vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -478,141 +463,161 @@ rec { sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; inherit dependencies buildDependencies features; }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "winapi"; - version = "0.2.8"; + version = "0.3.4"; authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; + build = "build.rs"; inherit dependencies buildDependencies features; }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; + winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; inherit dependencies buildDependencies features; }; - wincolor_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wincolor"; - version = "0.1.4"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0cxv6hadnj5vffb8a73y7055p59n20bpqd524df85cm29dcjl38a"; + winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; inherit dependencies buildDependencies features; }; - aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ { - dependencies = mapFeatures features ([ memchr_1_0_2 ]); - }; - aho_corasick_0_6_3_features = f: updateFeatures f (rec { - aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true); - memchr_1_0_2.default = true; - }) [ memchr_1_0_2_features ]; - ansi_term_0_10_2 = { features?(ansi_term_0_10_2_features {}) }: ansi_term_0_10_2_ {}; - ansi_term_0_10_2_features = f: updateFeatures f (rec { - ansi_term_0_10_2.default = (f.ansi_term_0_10_2.default or true); - }) []; - atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ { + wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wincolor"; + version = "0.1.6"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { + dependencies = mapFeatures features ([ memchr_2_0_1 ]); + }; + aho_corasick_0_6_4_features = f: updateFeatures f (rec { + aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); + memchr_2_0_1.default = true; + }) [ memchr_2_0_1_features ]; + ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + ansi_term_0_11_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.errhandlingapi = true; + winapi_0_3_4.processenv = true; + }) [ winapi_0_3_4_features ]; + atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ { dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); }; - atty_0_2_3_features = f: updateFeatures f (rec { - atty_0_2_3.default = (f.atty_0_2_3.default or true); - kernel32_sys_0_2_2.default = true; - libc_0_2_33.default = (f.libc_0_2_33.default or false); + atty_0_2_8_features = f: updateFeatures f (rec { + atty_0_2_8.default = (f.atty_0_2_8.default or true); + libc_0_2_40.default = (f.libc_0_2_40.default or false); termion_1_5_1.default = true; - winapi_0_2_8.default = true; - }) [ termion_1_5_1_features libc_0_2_33_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - backtrace_0_3_4 = { features?(backtrace_0_3_4_features {}) }: backtrace_0_3_4_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_5 ]) + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwinbase = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processenv = true; + winapi_0_3_4.winbase = true; + }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; + backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ]) ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_4.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else []) + ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_4.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else []) - ++ (if features.backtrace_0_3_4.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else []) - ++ (if features.backtrace_0_3_4.winapi or false then [ winapi_0_2_8 ] else [])) else []); - features = mkFeatures (features.backtrace_0_3_4 or {}); - }; - backtrace_0_3_4_features = f: updateFeatures f (rec { - backtrace_0_3_4.addr2line = - (f.backtrace_0_3_4.addr2line or false) || - (f.backtrace_0_3_4.gimli-symbolize or false) || - (backtrace_0_3_4.gimli-symbolize or false); - backtrace_0_3_4.backtrace-sys = - (f.backtrace_0_3_4.backtrace-sys or false) || - (f.backtrace_0_3_4.libbacktrace or false) || - (backtrace_0_3_4.libbacktrace or false); - backtrace_0_3_4.coresymbolication = - (f.backtrace_0_3_4.coresymbolication or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.dbghelp = - (f.backtrace_0_3_4.dbghelp or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.dbghelp-sys = - (f.backtrace_0_3_4.dbghelp-sys or false) || - (f.backtrace_0_3_4.dbghelp or false) || - (backtrace_0_3_4.dbghelp or false); - backtrace_0_3_4.default = (f.backtrace_0_3_4.default or true); - backtrace_0_3_4.dladdr = - (f.backtrace_0_3_4.dladdr or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.findshlibs = - (f.backtrace_0_3_4.findshlibs or false) || - (f.backtrace_0_3_4.gimli-symbolize or false) || - (backtrace_0_3_4.gimli-symbolize or false); - backtrace_0_3_4.kernel32-sys = - (f.backtrace_0_3_4.kernel32-sys or false) || - (f.backtrace_0_3_4.dbghelp or false) || - (backtrace_0_3_4.dbghelp or false); - backtrace_0_3_4.libbacktrace = - (f.backtrace_0_3_4.libbacktrace or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.libunwind = - (f.backtrace_0_3_4.libunwind or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.rustc-serialize = - (f.backtrace_0_3_4.rustc-serialize or false) || - (f.backtrace_0_3_4.serialize-rustc or false) || - (backtrace_0_3_4.serialize-rustc or false); - backtrace_0_3_4.serde = - (f.backtrace_0_3_4.serde or false) || - (f.backtrace_0_3_4.serialize-serde or false) || - (backtrace_0_3_4.serialize-serde or false); - backtrace_0_3_4.serde_derive = - (f.backtrace_0_3_4.serde_derive or false) || - (f.backtrace_0_3_4.serialize-serde or false) || - (backtrace_0_3_4.serialize-serde or false); - backtrace_0_3_4.winapi = - (f.backtrace_0_3_4.winapi or false) || - (f.backtrace_0_3_4.dbghelp or false) || - (backtrace_0_3_4.dbghelp or false); + ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []); + features = mkFeatures (features.backtrace_0_3_6 or {}); + }; + backtrace_0_3_6_features = f: updateFeatures f (rec { + backtrace_0_3_6.addr2line = + (f.backtrace_0_3_6.addr2line or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.backtrace-sys = + (f.backtrace_0_3_6.backtrace-sys or false) || + (f.backtrace_0_3_6.libbacktrace or false) || + (backtrace_0_3_6.libbacktrace or false); + backtrace_0_3_6.coresymbolication = + (f.backtrace_0_3_6.coresymbolication or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.dbghelp = + (f.backtrace_0_3_6.dbghelp or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true); + backtrace_0_3_6.dladdr = + (f.backtrace_0_3_6.dladdr or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.findshlibs = + (f.backtrace_0_3_6.findshlibs or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.gimli = + (f.backtrace_0_3_6.gimli or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.libbacktrace = + (f.backtrace_0_3_6.libbacktrace or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.libunwind = + (f.backtrace_0_3_6.libunwind or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.memmap = + (f.backtrace_0_3_6.memmap or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.object = + (f.backtrace_0_3_6.object or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.rustc-serialize = + (f.backtrace_0_3_6.rustc-serialize or false) || + (f.backtrace_0_3_6.serialize-rustc or false) || + (backtrace_0_3_6.serialize-rustc or false); + backtrace_0_3_6.serde = + (f.backtrace_0_3_6.serde or false) || + (f.backtrace_0_3_6.serialize-serde or false) || + (backtrace_0_3_6.serialize-serde or false); + backtrace_0_3_6.serde_derive = + (f.backtrace_0_3_6.serde_derive or false) || + (f.backtrace_0_3_6.serialize-serde or false) || + (backtrace_0_3_6.serialize-serde or false); + backtrace_0_3_6.winapi = + (f.backtrace_0_3_6.winapi or false) || + (f.backtrace_0_3_6.dbghelp or false) || + (backtrace_0_3_6.dbghelp or false); backtrace_sys_0_1_16.default = true; cfg_if_0_1_2.default = true; - dbghelp_sys_0_2_0.default = true; - kernel32_sys_0_2_2.default = true; - libc_0_2_33.default = true; - rustc_demangle_0_1_5.default = true; - winapi_0_2_8.default = true; - }) [ cfg_if_0_1_2_features rustc_demangle_0_1_5_features backtrace_sys_0_1_16_features libc_0_2_33_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + libc_0_2_40.default = true; + rustc_demangle_0_1_7.default = true; + winapi_0_3_4.dbghelp = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processthreadsapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.winnt = true; + }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ]; backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ { - dependencies = mapFeatures features ([ libc_0_2_33 ]); - buildDependencies = mapFeatures features ([ cc_1_0_3 ]); + dependencies = mapFeatures features ([ libc_0_2_40 ]); + buildDependencies = mapFeatures features ([ cc_1_0_10 ]); }; backtrace_sys_0_1_16_features = f: updateFeatures f (rec { backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true); - cc_1_0_3.default = true; - libc_0_2_33.default = true; - }) [ libc_0_2_33_features cc_1_0_3_features ]; - bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { - bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); - }) []; + cc_1_0_10.default = true; + libc_0_2_40.default = true; + }) [ libc_0_2_40_features cc_1_0_10_features ]; bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { features = mkFeatures (features.bitflags_1_0_1 or {}); }; @@ -623,159 +628,143 @@ rec { (f.bitflags_1_0_1.default or false) || (bitflags_1_0_1.default or false); }) []; - carnix_0_6_6 = { features?(carnix_0_6_6_features {}) }: carnix_0_6_6_ { - dependencies = mapFeatures features ([ clap_2_28_0 env_logger_0_5_3 error_chain_0_11_0 itertools_0_7_3 log_0_4_1 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]); + carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ { + dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]); }; - carnix_0_6_6_features = f: updateFeatures f (rec { - carnix_0_6_6.default = (f.carnix_0_6_6.default or true); - clap_2_28_0.default = true; - env_logger_0_5_3.default = true; + carnix_0_7_2_features = f: updateFeatures f (rec { + carnix_0_7_2.default = (f.carnix_0_7_2.default or true); + clap_2_31_2.default = true; + env_logger_0_5_7.default = true; error_chain_0_11_0.default = true; - itertools_0_7_3.default = true; + itertools_0_7_8.default = true; log_0_4_1.default = true; nom_3_2_1.default = true; - regex_0_2_2.default = true; + regex_0_2_10.default = true; rusqlite_0_13_0.default = true; - serde_1_0_21.default = true; - serde_derive_1_0_21.default = true; - serde_json_1_0_6.default = true; - tempdir_0_3_5.default = true; - toml_0_4_5.default = true; - }) [ clap_2_28_0_features env_logger_0_5_3_features error_chain_0_11_0_features itertools_0_7_3_features log_0_4_1_features nom_3_2_1_features regex_0_2_2_features rusqlite_0_13_0_features serde_1_0_21_features serde_derive_1_0_21_features serde_json_1_0_6_features tempdir_0_3_5_features toml_0_4_5_features ]; - cc_1_0_3 = { features?(cc_1_0_3_features {}) }: cc_1_0_3_ { + serde_1_0_38.default = true; + serde_derive_1_0_38.default = true; + serde_json_1_0_14.default = true; + tempdir_0_3_7.default = true; + toml_0_4_6.default = true; + }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ]; + cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_3 or {}); - }; - cc_1_0_3_features = f: updateFeatures f (rec { - cc_1_0_3.default = (f.cc_1_0_3.default or true); - cc_1_0_3.rayon = - (f.cc_1_0_3.rayon or false) || - (f.cc_1_0_3.parallel or false) || - (cc_1_0_3.parallel or false); + features = mkFeatures (features.cc_1_0_10 or {}); + }; + cc_1_0_10_features = f: updateFeatures f (rec { + cc_1_0_10.default = (f.cc_1_0_10.default or true); + cc_1_0_10.rayon = + (f.cc_1_0_10.rayon or false) || + (f.cc_1_0_10.parallel or false) || + (cc_1_0_10.parallel or false); }) []; cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; cfg_if_0_1_2_features = f: updateFeatures f (rec { cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); }) []; - chrono_0_4_0 = { features?(chrono_0_4_0_features {}) }: chrono_0_4_0_ { - dependencies = mapFeatures features ([ num_0_1_40 time_0_1_38 ]); - }; - chrono_0_4_0_features = f: updateFeatures f (rec { - chrono_0_4_0.default = (f.chrono_0_4_0.default or true); - num_0_1_40.default = (f.num_0_1_40.default or false); - time_0_1_38.default = true; - }) [ num_0_1_40_features time_0_1_38_features ]; - clap_2_28_0 = { features?(clap_2_28_0_features {}) }: clap_2_28_0_ { + clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ] - ++ (if features.clap_2_28_0.ansi_term or false then [ ansi_term_0_10_2 ] else []) - ++ (if features.clap_2_28_0.atty or false then [ atty_0_2_3 ] else []) - ++ (if features.clap_2_28_0.strsim or false then [ strsim_0_6_0 ] else []) - ++ (if features.clap_2_28_0.vec_map or false then [ vec_map_0_8_0 ] else [])); - features = mkFeatures (features.clap_2_28_0 or {}); - }; - clap_2_28_0_features = f: updateFeatures f (rec { - ansi_term_0_10_2.default = true; - atty_0_2_3.default = true; + ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else []) + ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) + ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ ] + ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); + features = mkFeatures (features.clap_2_31_2 or {}); + }; + clap_2_31_2_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = true; + atty_0_2_8.default = true; bitflags_1_0_1.default = true; - clap_2_28_0.ansi_term = - (f.clap_2_28_0.ansi_term or false) || - (f.clap_2_28_0.color or false) || - (clap_2_28_0.color or false); - clap_2_28_0.atty = - (f.clap_2_28_0.atty or false) || - (f.clap_2_28_0.color or false) || - (clap_2_28_0.color or false); - clap_2_28_0.clippy = - (f.clap_2_28_0.clippy or false) || - (f.clap_2_28_0.lints or false) || - (clap_2_28_0.lints or false); - clap_2_28_0.color = - (f.clap_2_28_0.color or false) || - (f.clap_2_28_0.default or false) || - (clap_2_28_0.default or false); - clap_2_28_0.default = (f.clap_2_28_0.default or true); - clap_2_28_0.strsim = - (f.clap_2_28_0.strsim or false) || - (f.clap_2_28_0.suggestions or false) || - (clap_2_28_0.suggestions or false); - clap_2_28_0.suggestions = - (f.clap_2_28_0.suggestions or false) || - (f.clap_2_28_0.default or false) || - (clap_2_28_0.default or false); - clap_2_28_0.term_size = - (f.clap_2_28_0.term_size or false) || - (f.clap_2_28_0.wrap_help or false) || - (clap_2_28_0.wrap_help or false); - clap_2_28_0.vec_map = - (f.clap_2_28_0.vec_map or false) || - (f.clap_2_28_0.default or false) || - (clap_2_28_0.default or false); - clap_2_28_0.yaml = - (f.clap_2_28_0.yaml or false) || - (f.clap_2_28_0.doc or false) || - (clap_2_28_0.doc or false); - clap_2_28_0.yaml-rust = - (f.clap_2_28_0.yaml-rust or false) || - (f.clap_2_28_0.yaml or false) || - (clap_2_28_0.yaml or false); - strsim_0_6_0.default = true; + clap_2_31_2.ansi_term = + (f.clap_2_31_2.ansi_term or false) || + (f.clap_2_31_2.color or false) || + (clap_2_31_2.color or false); + clap_2_31_2.atty = + (f.clap_2_31_2.atty or false) || + (f.clap_2_31_2.color or false) || + (clap_2_31_2.color or false); + clap_2_31_2.clippy = + (f.clap_2_31_2.clippy or false) || + (f.clap_2_31_2.lints or false) || + (clap_2_31_2.lints or false); + clap_2_31_2.color = + (f.clap_2_31_2.color or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.default = (f.clap_2_31_2.default or true); + clap_2_31_2.strsim = + (f.clap_2_31_2.strsim or false) || + (f.clap_2_31_2.suggestions or false) || + (clap_2_31_2.suggestions or false); + clap_2_31_2.suggestions = + (f.clap_2_31_2.suggestions or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.term_size = + (f.clap_2_31_2.term_size or false) || + (f.clap_2_31_2.wrap_help or false) || + (clap_2_31_2.wrap_help or false); + clap_2_31_2.vec_map = + (f.clap_2_31_2.vec_map or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.yaml = + (f.clap_2_31_2.yaml or false) || + (f.clap_2_31_2.doc or false) || + (clap_2_31_2.doc or false); + clap_2_31_2.yaml-rust = + (f.clap_2_31_2.yaml-rust or false) || + (f.clap_2_31_2.yaml or false) || + (clap_2_31_2.yaml or false); + strsim_0_7_0.default = true; textwrap_0_9_0.default = true; textwrap_0_9_0.term_size = (f.textwrap_0_9_0.term_size or false) || - (clap_2_28_0.wrap_help or false) || - (f.clap_2_28_0.wrap_help or false); + (clap_2_31_2.wrap_help or false) || + (f.clap_2_31_2.wrap_help or false); unicode_width_0_1_4.default = true; vec_map_0_8_0.default = true; - }) [ ansi_term_0_10_2_features atty_0_2_3_features bitflags_1_0_1_features strsim_0_6_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; - dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - dbghelp_sys_0_2_0_features = f: updateFeatures f (rec { - dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ]; dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; dtoa_0_4_2_features = f: updateFeatures f (rec { dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); }) []; - either_1_4_0 = { features?(either_1_4_0_features {}) }: either_1_4_0_ { + either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.either_1_4_0 or {}); - }; - either_1_4_0_features = f: updateFeatures f (rec { - either_1_4_0.default = (f.either_1_4_0.default or true); - either_1_4_0.use_std = - (f.either_1_4_0.use_std or false) || - (f.either_1_4_0.default or false) || - (either_1_4_0.default or false); + features = mkFeatures (features.either_1_5_0 or {}); + }; + either_1_5_0_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or true); + either_1_5_0.use_std = + (f.either_1_5_0.use_std or false) || + (f.either_1_5_0.default or false) || + (either_1_5_0.default or false); }) []; - env_logger_0_5_3 = { features?(env_logger_0_5_3_features {}) }: env_logger_0_5_3_ { - dependencies = mapFeatures features ([ atty_0_2_3 chrono_0_4_0 log_0_4_1 termcolor_0_3_3 ] - ++ (if features.env_logger_0_5_3.regex or false then [ regex_0_2_2 ] else [])); - features = mkFeatures (features.env_logger_0_5_3 or {}); - }; - env_logger_0_5_3_features = f: updateFeatures f (rec { - atty_0_2_3.default = true; - chrono_0_4_0.default = true; - env_logger_0_5_3.default = (f.env_logger_0_5_3.default or true); - env_logger_0_5_3.regex = - (f.env_logger_0_5_3.regex or false) || - (f.env_logger_0_5_3.default or false) || - (env_logger_0_5_3.default or false); + env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ { + dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ] + ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else [])); + features = mkFeatures (features.env_logger_0_5_7 or {}); + }; + env_logger_0_5_7_features = f: updateFeatures f (rec { + atty_0_2_8.default = true; + env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true); + env_logger_0_5_7.regex = + (f.env_logger_0_5_7.regex or false) || + (f.env_logger_0_5_7.default or false) || + (env_logger_0_5_7.default or false); + humantime_1_1_1.default = true; log_0_4_1.default = true; log_0_4_1.std = true; - regex_0_2_2.default = true; - termcolor_0_3_3.default = true; - }) [ atty_0_2_3_features chrono_0_4_0_features log_0_4_1_features regex_0_2_2_features termcolor_0_3_3_features ]; + regex_0_2_10.default = true; + termcolor_0_3_6.default = true; + }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ]; error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { dependencies = mapFeatures features ([ ] - ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_4 ] else [])); + ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else [])); features = mkFeatures (features.error_chain_0_11_0 or {}); }; error_chain_0_11_0_features = f: updateFeatures f (rec { - backtrace_0_3_4.default = true; + backtrace_0_3_6.default = true; error_chain_0_11_0.backtrace = (f.error_chain_0_11_0.backtrace or false) || (f.error_chain_0_11_0.default or false) || @@ -785,129 +774,129 @@ rec { (f.error_chain_0_11_0.example_generated or false) || (f.error_chain_0_11_0.default or false) || (error_chain_0_11_0.default or false); - }) [ backtrace_0_3_4_features ]; - fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ { - dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]); - }; - fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec { - fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true); - fuchsia_zircon_sys_0_2_0.default = true; - }) [ fuchsia_zircon_sys_0_2_0_features ]; - fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ { - dependencies = mapFeatures features ([ bitflags_0_7_0 ]); - }; - fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec { - bitflags_0_7_0.default = true; - fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true); - }) [ bitflags_0_7_0_features ]; - itertools_0_7_3 = { features?(itertools_0_7_3_features {}) }: itertools_0_7_3_ { - dependencies = mapFeatures features ([ either_1_4_0 ]); - features = mkFeatures (features.itertools_0_7_3 or {}); - }; - itertools_0_7_3_features = f: updateFeatures f (rec { - either_1_4_0.default = (f.either_1_4_0.default or false); - itertools_0_7_3.default = (f.itertools_0_7_3.default or true); - itertools_0_7_3.use_std = - (f.itertools_0_7_3.use_std or false) || - (f.itertools_0_7_3.default or false) || - (itertools_0_7_3.default or false); - }) [ either_1_4_0_features ]; - itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { - features = mkFeatures (features.itoa_0_3_4 or {}); - }; - itoa_0_3_4_features = f: updateFeatures f (rec { - itoa_0_3_4.default = (f.itoa_0_3_4.default or true); + }) [ backtrace_0_3_6_features ]; + fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]); + }; + fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); + fuchsia_zircon_sys_0_3_3.default = true; + }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ]; + fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; + fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); }) []; - kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { + humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ { + dependencies = mapFeatures features ([ quick_error_1_2_1 ]); + }; + humantime_1_1_1_features = f: updateFeatures f (rec { + humantime_1_1_1.default = (f.humantime_1_1_1.default or true); + quick_error_1_2_1.default = true; + }) [ quick_error_1_2_1_features ]; + itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ { + dependencies = mapFeatures features ([ either_1_5_0 ]); + features = mkFeatures (features.itertools_0_7_8 or {}); + }; + itertools_0_7_8_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or false); + itertools_0_7_8.default = (f.itertools_0_7_8.default or true); + itertools_0_7_8.use_std = + (f.itertools_0_7_8.use_std or false) || + (f.itertools_0_7_8.default or false) || + (itertools_0_7_8.default or false); + }) [ either_1_5_0_features ]; + itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ { + features = mkFeatures (features.itoa_0_4_1 or {}); + }; + itoa_0_4_1_features = f: updateFeatures f (rec { + itoa_0_4_1.default = (f.itoa_0_4_1.default or true); + itoa_0_4_1.std = + (f.itoa_0_4_1.std or false) || + (f.itoa_0_4_1.default or false) || + (itoa_0_4_1.default or false); + }) []; + lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_0_2_11 or {}); - }; - lazy_static_0_2_11_features = f: updateFeatures f (rec { - lazy_static_0_2_11.compiletest_rs = - (f.lazy_static_0_2_11.compiletest_rs or false) || - (f.lazy_static_0_2_11.compiletest or false) || - (lazy_static_0_2_11.compiletest or false); - lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); - lazy_static_0_2_11.nightly = - (f.lazy_static_0_2_11.nightly or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); - lazy_static_0_2_11.spin = - (f.lazy_static_0_2_11.spin or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); + features = mkFeatures (features.lazy_static_1_0_0 or {}); + }; + lazy_static_1_0_0_features = f: updateFeatures f (rec { + lazy_static_1_0_0.compiletest_rs = + (f.lazy_static_1_0_0.compiletest_rs or false) || + (f.lazy_static_1_0_0.compiletest or false) || + (lazy_static_1_0_0.compiletest or false); + lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); + lazy_static_1_0_0.nightly = + (f.lazy_static_1_0_0.nightly or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + lazy_static_1_0_0.spin = + (f.lazy_static_1_0_0.spin or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); }) []; - libc_0_2_33 = { features?(libc_0_2_33_features {}) }: libc_0_2_33_ { - features = mkFeatures (features.libc_0_2_33 or {}); - }; - libc_0_2_33_features = f: updateFeatures f (rec { - libc_0_2_33.default = (f.libc_0_2_33.default or true); - libc_0_2_33.use_std = - (f.libc_0_2_33.use_std or false) || - (f.libc_0_2_33.default or false) || - (libc_0_2_33.default or false); + libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { + features = mkFeatures (features.libc_0_2_40 or {}); + }; + libc_0_2_40_features = f: updateFeatures f (rec { + libc_0_2_40.default = (f.libc_0_2_40.default or true); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || + (f.libc_0_2_40.default or false) || + (libc_0_2_40.default or false); }) []; - libsqlite3_sys_0_9_0 = { features?(libsqlite3_sys_0_9_0_features {}) }: libsqlite3_sys_0_9_0_ { + libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ { dependencies = (if abi == "msvc" then mapFeatures features ([]) else []); buildDependencies = mapFeatures features ([ ] - ++ (if features.libsqlite3_sys_0_9_0.pkg-config or false then [ pkg_config_0_3_9 ] else [])); - features = mkFeatures (features.libsqlite3_sys_0_9_0 or {}); - }; - libsqlite3_sys_0_9_0_features = f: updateFeatures f (rec { - libsqlite3_sys_0_9_0.bindgen = - (f.libsqlite3_sys_0_9_0.bindgen or false) || - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_0.buildtime_bindgen or false); - libsqlite3_sys_0_9_0.cc = - (f.libsqlite3_sys_0_9_0.cc or false) || - (f.libsqlite3_sys_0_9_0.bundled or false) || - (libsqlite3_sys_0_9_0.bundled or false); - libsqlite3_sys_0_9_0.default = (f.libsqlite3_sys_0_9_0.default or true); - libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_0.default or false) || - (libsqlite3_sys_0_9_0.default or false); - libsqlite3_sys_0_9_0.pkg-config = - (f.libsqlite3_sys_0_9_0.pkg-config or false) || - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false); - libsqlite3_sys_0_9_0.vcpkg = - (f.libsqlite3_sys_0_9_0.vcpkg or false) || - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false); + ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else [])); + features = mkFeatures (features.libsqlite3_sys_0_9_1 or {}); + }; + libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec { + libsqlite3_sys_0_9_1.bindgen = + (f.libsqlite3_sys_0_9_1.bindgen or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false); + libsqlite3_sys_0_9_1.cc = + (f.libsqlite3_sys_0_9_1.cc or false) || + (f.libsqlite3_sys_0_9_1.bundled or false) || + (libsqlite3_sys_0_9_1.bundled or false); + libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true); + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.default or false) || + (libsqlite3_sys_0_9_1.default or false); + libsqlite3_sys_0_9_1.pkg-config = + (f.libsqlite3_sys_0_9_1.pkg-config or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); + libsqlite3_sys_0_9_1.vcpkg = + (f.libsqlite3_sys_0_9_1.vcpkg or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); pkg_config_0_3_9.default = true; }) [ pkg_config_0_3_9_features ]; linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ { @@ -955,13 +944,13 @@ rec { }) [ linked_hash_map_0_4_2_features ]; memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { dependencies = mapFeatures features ([ ] - ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_33 ] else [])); + ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else [])); features = mkFeatures (features.memchr_1_0_2 or {}); }; memchr_1_0_2_features = f: updateFeatures f (rec { - libc_0_2_33.default = (f.libc_0_2_33.default or false); - libc_0_2_33.use_std = - (f.libc_0_2_33.use_std or false) || + libc_0_2_40.default = (f.libc_0_2_40.default or false); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || (memchr_1_0_2.use_std or false) || (f.memchr_1_0_2.use_std or false); memchr_1_0_2.default = (f.memchr_1_0_2.default or true); @@ -975,7 +964,30 @@ rec { (f.memchr_1_0_2.use_std or false) || (f.memchr_1_0_2.default or false) || (memchr_1_0_2.default or false); - }) [ libc_0_2_33_features ]; + }) [ libc_0_2_40_features ]; + memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { + dependencies = mapFeatures features ([ ] + ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); + features = mkFeatures (features.memchr_2_0_1 or {}); + }; + memchr_2_0_1_features = f: updateFeatures f (rec { + libc_0_2_40.default = (f.libc_0_2_40.default or false); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || + (memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.use_std or false); + memchr_2_0_1.default = (f.memchr_2_0_1.default or true); + memchr_2_0_1.libc = + (f.memchr_2_0_1.libc or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false) || + (f.memchr_2_0_1.use_std or false) || + (memchr_2_0_1.use_std or false); + memchr_2_0_1.use_std = + (f.memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false); + }) [ libc_0_2_40_features ]; nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { dependencies = mapFeatures features ([ memchr_1_0_2 ]); features = mkFeatures (features.nom_3_2_1 or {}); @@ -1012,282 +1024,303 @@ rec { (f.nom_3_2_1.default or false) || (nom_3_2_1.default or false); }) [ memchr_1_0_2_features ]; - num_0_1_40 = { features?(num_0_1_40_features {}) }: num_0_1_40_ { - dependencies = mapFeatures features ([ num_integer_0_1_35 num_iter_0_1_34 num_traits_0_1_40 ]); - features = mkFeatures (features.num_0_1_40 or {}); - }; - num_0_1_40_features = f: updateFeatures f (rec { - num_0_1_40.bigint = - (f.num_0_1_40.bigint or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_0_1_40.complex = - (f.num_0_1_40.complex or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_0_1_40.default = (f.num_0_1_40.default or true); - num_0_1_40.num-bigint = - (f.num_0_1_40.num-bigint or false) || - (f.num_0_1_40.bigint or false) || - (num_0_1_40.bigint or false); - num_0_1_40.num-complex = - (f.num_0_1_40.num-complex or false) || - (f.num_0_1_40.complex or false) || - (num_0_1_40.complex or false); - num_0_1_40.num-rational = - (f.num_0_1_40.num-rational or false) || - (f.num_0_1_40.rational or false) || - (num_0_1_40.rational or false); - num_0_1_40.rational = - (f.num_0_1_40.rational or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_0_1_40.rustc-serialize = - (f.num_0_1_40.rustc-serialize or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_integer_0_1_35.default = true; - num_iter_0_1_34.default = true; - num_traits_0_1_40.default = true; - }) [ num_integer_0_1_35_features num_iter_0_1_34_features num_traits_0_1_40_features ]; - num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { - dependencies = mapFeatures features ([ num_traits_0_1_40 ]); - }; - num_integer_0_1_35_features = f: updateFeatures f (rec { - num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); - num_traits_0_1_40.default = true; - }) [ num_traits_0_1_40_features ]; - num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { - dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]); - }; - num_iter_0_1_34_features = f: updateFeatures f (rec { - num_integer_0_1_35.default = true; - num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); - num_traits_0_1_40.default = true; - }) [ num_integer_0_1_35_features num_traits_0_1_40_features ]; - num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; - num_traits_0_1_40_features = f: updateFeatures f (rec { - num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); + num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ { + features = mkFeatures (features.num_traits_0_2_2 or {}); + }; + num_traits_0_2_2_features = f: updateFeatures f (rec { + num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true); + num_traits_0_2_2.std = + (f.num_traits_0_2_2.std or false) || + (f.num_traits_0_2_2.default or false) || + (num_traits_0_2_2.default or false); }) []; pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; pkg_config_0_3_9_features = f: updateFeatures f (rec { pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); }) []; - quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; - quote_0_3_15_features = f: updateFeatures f (rec { - quote_0_3_15.default = (f.quote_0_3_15.default or true); + proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ { + dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); + features = mkFeatures (features.proc_macro2_0_3_6 or {}); + }; + proc_macro2_0_3_6_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (f.proc_macro2_0_3_6.default or false) || + (proc_macro2_0_3_6.default or false) || + (f.proc_macro2_0_3_6.nightly or false) || + (proc_macro2_0_3_6.nightly or false); + unicode_xid_0_1_0.default = true; + }) [ unicode_xid_0_1_0_features ]; + quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {}; + quick_error_1_2_1_features = f: updateFeatures f (rec { + quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true); }) []; - rand_0_3_18 = { features?(rand_0_3_18_features {}) }: rand_0_3_18_ { - dependencies = mapFeatures features ([ libc_0_2_33 ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_2_1 ]) else []); - features = mkFeatures (features.rand_0_3_18 or {}); - }; - rand_0_3_18_features = f: updateFeatures f (rec { - fuchsia_zircon_0_2_1.default = true; - libc_0_2_33.default = true; - rand_0_3_18.default = (f.rand_0_3_18.default or true); - rand_0_3_18.i128_support = - (f.rand_0_3_18.i128_support or false) || - (f.rand_0_3_18.nightly or false) || - (rand_0_3_18.nightly or false); - }) [ libc_0_2_33_features fuchsia_zircon_0_2_1_features ]; - redox_syscall_0_1_32 = { features?(redox_syscall_0_1_32_features {}) }: redox_syscall_0_1_32_ {}; - redox_syscall_0_1_32_features = f: updateFeatures f (rec { - redox_syscall_0_1_32.default = (f.redox_syscall_0_1_32.default or true); + quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]); + features = mkFeatures (features.quote_0_5_1 or {}); + }; + quote_0_5_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (quote_0_5_1.proc-macro or false) || + (f.quote_0_5_1.proc-macro or false); + quote_0_5_1.default = (f.quote_0_5_1.default or true); + quote_0_5_1.proc-macro = + (f.quote_0_5_1.proc-macro or false) || + (f.quote_0_5_1.default or false) || + (quote_0_5_1.default or false); + }) [ proc_macro2_0_3_6_features ]; + rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] + ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + features = mkFeatures (features.rand_0_4_2 or {}); + }; + rand_0_4_2_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + libc_0_2_40.default = true; + rand_0_4_2.default = (f.rand_0_4_2.default or true); + rand_0_4_2.i128_support = + (f.rand_0_4_2.i128_support or false) || + (f.rand_0_4_2.nightly or false) || + (rand_0_4_2.nightly or false); + rand_0_4_2.libc = + (f.rand_0_4_2.libc or false) || + (f.rand_0_4_2.std or false) || + (rand_0_4_2.std or false); + rand_0_4_2.std = + (f.rand_0_4_2.std or false) || + (f.rand_0_4_2.default or false) || + (rand_0_4_2.default or false); + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.ntsecapi = true; + winapi_0_3_4.profileapi = true; + winapi_0_3_4.winnt = true; + }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; + redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; + redox_syscall_0_1_37_features = f: updateFeatures f (rec { + redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); }) []; redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_32 ]); + dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); }; redox_termios_0_1_1_features = f: updateFeatures f (rec { - redox_syscall_0_1_32.default = true; + redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_32_features ]; - regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_2 or {}); - }; - regex_0_2_2_features = f: updateFeatures f (rec { - aho_corasick_0_6_3.default = true; - memchr_1_0_2.default = true; - regex_0_2_2.default = (f.regex_0_2_2.default or true); - regex_0_2_2.simd = - (f.regex_0_2_2.simd or false) || - (f.regex_0_2_2.simd-accel or false) || - (regex_0_2_2.simd-accel or false); - regex_syntax_0_4_1.default = true; - thread_local_0_3_4.default = true; + }) [ redox_syscall_0_1_37_features ]; + regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ { + dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]); + features = mkFeatures (features.regex_0_2_10 or {}); + }; + regex_0_2_10_features = f: updateFeatures f (rec { + aho_corasick_0_6_4.default = true; + memchr_2_0_1.default = true; + regex_0_2_10.default = (f.regex_0_2_10.default or true); + regex_0_2_10.pattern = + (f.regex_0_2_10.pattern or false) || + (f.regex_0_2_10.unstable or false) || + (regex_0_2_10.unstable or false); + regex_syntax_0_5_5.default = true; + thread_local_0_3_5.default = true; utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_3_features memchr_1_0_2_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {}; - regex_syntax_0_4_1_features = f: updateFeatures f (rec { - regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true); - }) []; + }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; + regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ { + dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); + }; + regex_syntax_0_5_5_features = f: updateFeatures f (rec { + regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true); + ucd_util_0_1_1.default = true; + }) [ ucd_util_0_1_1_features ]; + remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + remove_dir_all_0_5_0_features = f: updateFeatures f (rec { + remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true); + winapi_0_3_4.default = true; + winapi_0_3_4.errhandlingapi = true; + winapi_0_3_4.fileapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.winbase = true; + winapi_0_3_4.winerror = true; + }) [ winapi_0_3_4_features ]; rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_0 lru_cache_0_1_1 time_0_1_38 ]); + dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]); features = mkFeatures (features.rusqlite_0_13_0 or {}); }; rusqlite_0_13_0_features = f: updateFeatures f (rec { bitflags_1_0_1.default = true; - libsqlite3_sys_0_9_0.buildtime_bindgen = - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + libsqlite3_sys_0_9_1.buildtime_bindgen = + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || (rusqlite_0_13_0.buildtime_bindgen or false) || (f.rusqlite_0_13_0.buildtime_bindgen or false); - libsqlite3_sys_0_9_0.bundled = - (f.libsqlite3_sys_0_9_0.bundled or false) || + libsqlite3_sys_0_9_1.bundled = + (f.libsqlite3_sys_0_9_1.bundled or false) || (rusqlite_0_13_0.bundled or false) || (f.rusqlite_0_13_0.bundled or false); - libsqlite3_sys_0_9_0.default = true; - libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || + libsqlite3_sys_0_9_1.default = true; + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || (rusqlite_0_13_0.backup or false) || (f.rusqlite_0_13_0.backup or false); - libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || (rusqlite_0_13_0.trace or false) || (f.rusqlite_0_13_0.trace or false); - libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || + libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || (rusqlite_0_13_0.functions or false) || (f.rusqlite_0_13_0.functions or false); - libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || + libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || (rusqlite_0_13_0.blob or false) || (f.rusqlite_0_13_0.blob or false); - libsqlite3_sys_0_9_0.sqlcipher = - (f.libsqlite3_sys_0_9_0.sqlcipher or false) || + libsqlite3_sys_0_9_1.sqlcipher = + (f.libsqlite3_sys_0_9_1.sqlcipher or false) || (rusqlite_0_13_0.sqlcipher or false) || (f.rusqlite_0_13_0.sqlcipher or false); lru_cache_0_1_1.default = true; rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true); - time_0_1_38.default = true; - }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_0_features lru_cache_0_1_1_features time_0_1_38_features ]; - rustc_demangle_0_1_5 = { features?(rustc_demangle_0_1_5_features {}) }: rustc_demangle_0_1_5_ {}; - rustc_demangle_0_1_5_features = f: updateFeatures f (rec { - rustc_demangle_0_1_5.default = (f.rustc_demangle_0_1_5.default or true); + time_0_1_39.default = true; + }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ]; + rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {}; + rustc_demangle_0_1_7_features = f: updateFeatures f (rec { + rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true); }) []; - serde_1_0_21 = { features?(serde_1_0_21_features {}) }: serde_1_0_21_ { + serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_21 or {}); - }; - serde_1_0_21_features = f: updateFeatures f (rec { - serde_1_0_21.default = (f.serde_1_0_21.default or true); - serde_1_0_21.serde_derive = - (f.serde_1_0_21.serde_derive or false) || - (f.serde_1_0_21.derive or false) || - (serde_1_0_21.derive or false) || - (f.serde_1_0_21.playground or false) || - (serde_1_0_21.playground or false); - serde_1_0_21.std = - (f.serde_1_0_21.std or false) || - (f.serde_1_0_21.default or false) || - (serde_1_0_21.default or false); - serde_1_0_21.unstable = - (f.serde_1_0_21.unstable or false) || - (f.serde_1_0_21.alloc or false) || - (serde_1_0_21.alloc or false); + features = mkFeatures (features.serde_1_0_38 or {}); + }; + serde_1_0_38_features = f: updateFeatures f (rec { + serde_1_0_38.default = (f.serde_1_0_38.default or true); + serde_1_0_38.serde_derive = + (f.serde_1_0_38.serde_derive or false) || + (f.serde_1_0_38.derive or false) || + (serde_1_0_38.derive or false) || + (f.serde_1_0_38.playground or false) || + (serde_1_0_38.playground or false); + serde_1_0_38.std = + (f.serde_1_0_38.std or false) || + (f.serde_1_0_38.default or false) || + (serde_1_0_38.default or false); + serde_1_0_38.unstable = + (f.serde_1_0_38.unstable or false) || + (f.serde_1_0_38.alloc or false) || + (serde_1_0_38.alloc or false); }) []; - serde_derive_1_0_21 = { features?(serde_derive_1_0_21_features {}) }: serde_derive_1_0_21_ { - dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ]); - }; - serde_derive_1_0_21_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - serde_derive_1_0_21.default = (f.serde_derive_1_0_21.default or true); - serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or false); - syn_0_11_11.default = true; - syn_0_11_11.visit = true; - }) [ quote_0_3_15_features serde_derive_internals_0_17_0_features syn_0_11_11_features ]; - serde_derive_internals_0_17_0 = { features?(serde_derive_internals_0_17_0_features {}) }: serde_derive_internals_0_17_0_ { - dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]); - }; - serde_derive_internals_0_17_0_features = f: updateFeatures f (rec { - serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or true); - syn_0_11_11.default = (f.syn_0_11_11.default or false); - syn_0_11_11.parsing = true; - synom_0_11_3.default = true; - }) [ syn_0_11_11_features synom_0_11_3_features ]; - serde_json_1_0_6 = { features?(serde_json_1_0_6_features {}) }: serde_json_1_0_6_ { - dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_21 ]); - features = mkFeatures (features.serde_json_1_0_6 or {}); - }; - serde_json_1_0_6_features = f: updateFeatures f (rec { + serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]); + features = mkFeatures (features.serde_derive_1_0_38 or {}); + }; + serde_derive_1_0_38_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = true; + quote_0_5_1.default = true; + serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true); + serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false); + syn_0_13_1.default = true; + syn_0_13_1.visit = true; + }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ]; + serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]); + }; + serde_derive_internals_0_23_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = true; + serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true); + syn_0_13_1.clone-impls = true; + syn_0_13_1.default = (f.syn_0_13_1.default or false); + syn_0_13_1.derive = true; + syn_0_13_1.parsing = true; + }) [ proc_macro2_0_3_6_features syn_0_13_1_features ]; + serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]); + features = mkFeatures (features.serde_json_1_0_14 or {}); + }; + serde_json_1_0_14_features = f: updateFeatures f (rec { dtoa_0_4_2.default = true; - itoa_0_3_4.default = true; - num_traits_0_1_40.default = true; - serde_1_0_21.default = true; - serde_json_1_0_6.default = (f.serde_json_1_0_6.default or true); - serde_json_1_0_6.linked-hash-map = - (f.serde_json_1_0_6.linked-hash-map or false) || - (f.serde_json_1_0_6.preserve_order or false) || - (serde_json_1_0_6.preserve_order or false); - }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_1_0_21_features ]; - strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { - strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + itoa_0_4_1.default = true; + num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false); + serde_1_0_38.default = true; + serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true); + serde_json_1_0_14.linked-hash-map = + (f.serde_json_1_0_14.linked-hash-map or false) || + (f.serde_json_1_0_14.preserve_order or false) || + (serde_json_1_0_14.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ]; + strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; + strsim_0_7_0_features = f: updateFeatures f (rec { + strsim_0_7_0.default = (f.strsim_0_7_0.default or true); }) []; - syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { - dependencies = mapFeatures features ([ ] - ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) - ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) - ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); - features = mkFeatures (features.syn_0_11_11 or {}); - }; - syn_0_11_11_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - syn_0_11_11.default = (f.syn_0_11_11.default or true); - syn_0_11_11.parsing = - (f.syn_0_11_11.parsing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.printing = - (f.syn_0_11_11.printing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.quote = - (f.syn_0_11_11.quote or false) || - (f.syn_0_11_11.printing or false) || - (syn_0_11_11.printing or false); - syn_0_11_11.synom = - (f.syn_0_11_11.synom or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - syn_0_11_11.unicode-xid = - (f.syn_0_11_11.unicode-xid or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - synom_0_11_3.default = true; - unicode_xid_0_0_4.default = true; - }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; - synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { - dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); - }; - synom_0_11_3_features = f: updateFeatures f (rec { - synom_0_11_3.default = (f.synom_0_11_3.default or true); - unicode_xid_0_0_4.default = true; - }) [ unicode_xid_0_0_4_features ]; - tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ { - dependencies = mapFeatures features ([ rand_0_3_18 ]); - }; - tempdir_0_3_5_features = f: updateFeatures f (rec { - rand_0_3_18.default = true; - tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true); - }) [ rand_0_3_18_features ]; - termcolor_0_3_3 = { features?(termcolor_0_3_3_features {}) }: termcolor_0_3_3_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_4 ]) else []); - }; - termcolor_0_3_3_features = f: updateFeatures f (rec { - termcolor_0_3_3.default = (f.termcolor_0_3_3.default or true); - wincolor_0_1_4.default = true; - }) [ wincolor_0_1_4_features ]; + syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ] + ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else [])); + features = mkFeatures (features.syn_0_13_1 or {}); + }; + syn_0_13_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.proc-macro or false); + quote_0_5_1.default = (f.quote_0_5_1.default or false); + quote_0_5_1.proc-macro = + (f.quote_0_5_1.proc-macro or false) || + (syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.proc-macro or false); + syn_0_13_1.clone-impls = + (f.syn_0_13_1.clone-impls or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.default = (f.syn_0_13_1.default or true); + syn_0_13_1.derive = + (f.syn_0_13_1.derive or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.parsing = + (f.syn_0_13_1.parsing or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.printing = + (f.syn_0_13_1.printing or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.proc-macro = + (f.syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.quote = + (f.syn_0_13_1.quote or false) || + (f.syn_0_13_1.printing or false) || + (syn_0_13_1.printing or false); + unicode_xid_0_1_0.default = true; + }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ]; + tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { + dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]); + }; + tempdir_0_3_7_features = f: updateFeatures f (rec { + rand_0_4_2.default = true; + remove_dir_all_0_5_0.default = true; + tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); + }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ]; + termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); + }; + termcolor_0_3_6_features = f: updateFeatures f (rec { + termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); + wincolor_0_1_6.default = true; + }) [ wincolor_0_1_6_features ]; termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_33 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 redox_termios_0_1_1 ]) else []); + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); }; termion_1_5_1_features = f: updateFeatures f (rec { - libc_0_2_33.default = true; - redox_syscall_0_1_32.default = true; + libc_0_2_40.default = true; + redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = true; termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_33_features redox_syscall_0_1_32_features redox_termios_0_1_1_features ]; + }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); }; @@ -1295,44 +1328,54 @@ rec { textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); unicode_width_0_1_4.default = true; }) [ unicode_width_0_1_4_features ]; - thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ { - dependencies = mapFeatures features ([ lazy_static_0_2_11 unreachable_1_0_0 ]); + thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { + dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); }; - thread_local_0_3_4_features = f: updateFeatures f (rec { - lazy_static_0_2_11.default = true; - thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true); + thread_local_0_3_5_features = f: updateFeatures f (rec { + lazy_static_1_0_0.default = true; + thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); unreachable_1_0_0.default = true; - }) [ lazy_static_0_2_11_features unreachable_1_0_0_features ]; - time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ { - dependencies = mapFeatures features ([ libc_0_2_33 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); - }; - time_0_1_38_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - libc_0_2_33.default = true; - redox_syscall_0_1_32.default = true; - time_0_1_38.default = (f.time_0_1_38.default or true); - winapi_0_2_8.default = true; - }) [ libc_0_2_33_features redox_syscall_0_1_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - toml_0_4_5 = { features?(toml_0_4_5_features {}) }: toml_0_4_5_ { - dependencies = mapFeatures features ([ serde_1_0_21 ]); - }; - toml_0_4_5_features = f: updateFeatures f (rec { - serde_1_0_21.default = true; - toml_0_4_5.default = (f.toml_0_4_5.default or true); - }) [ serde_1_0_21_features ]; + }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; + time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ { + dependencies = mapFeatures features ([ libc_0_2_40 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + time_0_1_39_features = f: updateFeatures f (rec { + libc_0_2_40.default = true; + redox_syscall_0_1_37.default = true; + time_0_1_39.default = (f.time_0_1_39.default or true); + winapi_0_3_4.default = true; + winapi_0_3_4.minwinbase = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.ntdef = true; + winapi_0_3_4.profileapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.sysinfoapi = true; + winapi_0_3_4.timezoneapi = true; + }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ]; + toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { + dependencies = mapFeatures features ([ serde_1_0_38 ]); + }; + toml_0_4_6_features = f: updateFeatures f (rec { + serde_1_0_38.default = true; + toml_0_4_6.default = (f.toml_0_4_6.default or true); + }) [ serde_1_0_38_features ]; + ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; + ucd_util_0_1_1_features = f: updateFeatures f (rec { + ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); + }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; unicode_width_0_1_4_features = f: updateFeatures f (rec { unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; - unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { - features = mkFeatures (features.unicode_xid_0_0_4 or {}); + unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { + features = mkFeatures (features.unicode_xid_0_1_0 or {}); }; - unicode_xid_0_0_4_features = f: updateFeatures f (rec { - unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); + unicode_xid_0_1_0_features = f: updateFeatures f (rec { + unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); }) []; unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { dependencies = mapFeatures features ([ void_1_0_2 ]); @@ -1345,9 +1388,9 @@ rec { utf8_ranges_1_0_0_features = f: updateFeatures f (rec { utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); }) []; - vcpkg_0_2_2 = { features?(vcpkg_0_2_2_features {}) }: vcpkg_0_2_2_ {}; - vcpkg_0_2_2_features = f: updateFeatures f (rec { - vcpkg_0_2_2.default = (f.vcpkg_0_2_2.default or true); + vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; + vcpkg_0_2_3_features = f: updateFeatures f (rec { + vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); }) []; vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { dependencies = mapFeatures features ([]); @@ -1374,20 +1417,34 @@ rec { (f.void_1_0_2.default or false) || (void_1_0_2.default or false); }) []; - winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { - winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); + features = mkFeatures (features.winapi_0_3_4 or {}); + }; + winapi_0_3_4_features = f: updateFeatures f (rec { + winapi_0_3_4.default = (f.winapi_0_3_4.default or true); + winapi_i686_pc_windows_gnu_0_4_0.default = true; + winapi_x86_64_pc_windows_gnu_0_4_0.default = true; + }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; + winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; + winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); }) []; - winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { - winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; + winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); }) []; - wincolor_0_1_4 = { features?(wincolor_0_1_4_features {}) }: wincolor_0_1_4_ { - dependencies = mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]); - }; - wincolor_0_1_4_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - winapi_0_2_8.default = true; - wincolor_0_1_4.default = (f.wincolor_0_1_4.default or true); - }) [ kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { + dependencies = mapFeatures features ([ winapi_0_3_4 ]); + }; + wincolor_0_1_6_features = f: updateFeatures f (rec { + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processenv = true; + winapi_0_3_4.winbase = true; + winapi_0_3_4.wincon = true; + wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); + }) [ winapi_0_3_4_features ]; } diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 83ef146de5f8..f407ba25bf85 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -4,7 +4,7 @@ let inherit stdenv cacert git rust cargo-vendor; }; in -{ name, cargoSha256 ? null +{ name, cargoSha256 ? "unset" , src ? null , srcs ? null , sourceRoot ? null @@ -17,7 +17,7 @@ in , cargoVendorDir ? null , ... } @ args: -assert cargoVendorDir == null -> cargoSha256 != null; +assert cargoVendorDir == null -> cargoSha256 != "unset"; let lib = stdenv.lib; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 9664abeb4651..d092efb556e5 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -170,6 +170,7 @@ rec { *** _EOF_ + exit 1 ''; }; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 49588a589937..8e8b88a9bd2d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -3,7 +3,7 @@ , img ? pkgs.stdenv.platform.kernelTarget , storeDir ? builtins.storeDir , rootModules ? - [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" ] + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos" }: diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 59a7612c6aa0..25df45258a6f 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "stdman-${version}"; - version = "2017.04.02"; + version = "2018.03.11"; src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; rev = "${version}"; - sha256 = "1wfxd9ca8b9l976rnlhjd0sp364skfm99wxi633swwwjvhy26sgm"; + sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r"; }; outputDevdoc = "out"; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index b33295f89b2c..fbf62e3ba386 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,19 +1,19 @@ {stdenv, fetchzip}: let - version = "10.0.2"; + version = "11.0.2"; in fetchzip { name = "babelstone-han-${version}"; - url = http://www.babelstone.co.uk/Fonts/7932/BabelStoneHan.zip; + url = http://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; - sha256 = "17r5cf028v66yzjf9qbncn4rchv2xxkl2adxr35ppg1l7zssz9v6"; + sha256 = "003cz520riskjp729y3piqhmnzfw3jyrmb94im7jyvlc7hp14cdh"; meta = with stdenv.lib; { - description = "Unicode CJK font with over 32600 Han characters"; + description = "Unicode CJK font with over 36000 Han characters"; homepage = http://www.babelstone.co.uk/Fonts/Han.html; license = licenses.free; diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 560aed970bbf..9d4c1e22e145 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source emoji set"; homepage = http://emojione.com/; license = licenses.cc-by-40; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 4c1e484253cf..9b626291c2cb 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -19,7 +19,7 @@ in fetchzip rec { sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; meta = with stdenv.lib; { - homepage = http://software.sil.org/gentium/; + homepage = https://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; maintainers = with maintainers; [ ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 8815bf688389..528055a5e80e 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, bash, which, withFont ? "" }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "2.0.0"; name = "nerdfonts-${version}"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "nerd-fonts"; rev = version; - sha256 = "0h12d33wnhs5w8r3h1gqil98442vf7a13ms3nwldsam4naapsqxz"; + sha256 = "09i467hyskvzj2wn5sj6shvc9pb0a0rx5iknjkkkbg1ng3bla7nm"; }; dontPatchShebangs = true; buildInputs = [ which ]; diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix new file mode 100644 index 000000000000..b35f537c06b9 --- /dev/null +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchzip }: + +let + version = "2.100"; +in fetchzip rec { + name = "scheherazade-${version}"; + + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} + unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation + ''; + + sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + + meta = with stdenv.lib; { + homepage = https://software.sil.org/scheherazade/; + description = "A font designed in a similar style to traditional Naskh typefaces"; + longDescription = '' + Scheherazade, named after the heroine of the classic Arabian Nights tale, + is designed in a similar style to traditional typefaces such as Monotype + Naskh, extended to cover the Unicode Arabic repertoire through Unicode + 8.0. + + Scheherazade provides a “simplified” rendering of Arabic script, using + basic connecting glyphs but not including a wide variety of additional + ligatures or contextual alternates (only the required lam-alef + ligatures). This simplified style is often preferred for clarity, + especially in non-Arabic languages, but may not be considered appropriate + in situations where a more elaborate style of calligraphy is preferred. + + This package contains the regular and bold styles for the Scheherazade + font family, along with documentation. + ''; + downloadPage = "https://software.sil.org/scheherazade/download/"; + license = licenses.ofl; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index e99e0bfb342f..3f9726ee094f 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -1,4 +1,4 @@ -{ variant, stdenv, fetchzip }: +{ stdenv, fetchzip }: let variants = { @@ -27,40 +27,43 @@ let outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; }; }; - current = variants."${variant}"; - dotless_version = builtins.replaceStrings ["."] [""] current.version; -in stdenv.mkDerivation rec { - name = "tex-gyre-${variant}-math-${current.version}"; - version = "${current.version}"; - src = fetchzip { - url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; - sha256 = current.sha256; - }; + mkVariant = variant: current: + let dotless_version = builtins.replaceStrings ["."] [""] current.version; in + stdenv.mkDerivation rec { + name = "tex-gyre-${variant}-math-${current.version}"; + version = "${current.version}"; - installPhase = '' - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/${name}/ - cp -v opentype/*.otf $out/share/fonts/opentype/ - cp -v doc/*.txt $out/share/doc/${name}/ - ''; + src = fetchzip { + url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; + sha256 = current.sha256; + }; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = current.outputHash; + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/${name}/ + cp -v opentype/*.otf $out/share/fonts/opentype/ + cp -v doc/*.txt $out/share/doc/${name}/ + ''; - meta = with stdenv.lib; { - longDescription = '' - TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre - ${current.displayName} family of fonts (see - http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. - ''; - homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; - # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), - # which is a free license, legally equivalent to the LaTeX Project Public - # License (LPPL), version 1.3c or later." - GUST website - license = licenses.lppl13c; - maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.all; - }; -} + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = current.outputHash; + + meta = with stdenv.lib; { + longDescription = '' + TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre + ${current.displayName} family of fonts (see + http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. + ''; + homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; + # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), + # which is a free license, legally equivalent to the LaTeX Project Public + # License (LPPL), version 1.3c or later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; + }; +in + stdenv.lib.mapAttrs mkVariant variants diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index df974d8a0359..c0f4727f48fb 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20180214"; + version = "20180401"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "0lsp5cmq5wdqw6vyh6hqqrshgpzxfj8dx87l7qdlgrk73dajjmki"; + sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c20e56a17117..e7dbf947815b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b09de4efc2a385cf3407072c24c21ec8ec774a03.tar.gz"; - sha256 = "0yy3k5wgi9zgwz51gxakhlalwac59fkh0flydf334msrxlc3xf9z"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz"; + sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 6b1abad02d74..d5ab50f0b8c2 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iana-etc-${version}"; - version = "20180108"; + version = "20180405"; src = fetchurl { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "1x4jacrvjwcsan88rg2wf2a8bajsglg6w4396vbr18zh0sya84a2"; + sha256 = "0x6i95arrc4lcq2il3r05hbnd9vsi87z4yc8s3agkvbj74d6hfhj"; }; installPhase = '' diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index bbcc55f9bc55..93676b790890 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180311"; + name = "osinfo-db-20180325"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0pzm9vsr2f5943nlp2ljm19czcys5pvq6hjxh0ja2vx74pwhylb6"; + sha256 = "0lma4szxwg5vzb23p3hplllz9yi77x57dzijsz6n4qa399wzv8rs"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 5e4d17bcc8fd..e54dc3fa9feb 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}: +{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix +, singleWordlist ? null +}: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "scowl"; @@ -11,10 +14,15 @@ stdenv.mkDerivation rec { sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz"; }; - buildInputs = []; - nativeBuildInputs = [unzip zip perl aspell dos2unix]; + postPatch = '' + substituteInPlace scowl/src/Makefile \ + --replace g++ c++ + ''; + + nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - NIX_CFLAGS_COMPILE = " -Wno-narrowing "; + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; preConfigure = '' patchShebangs . @@ -34,8 +42,8 @@ stdenv.mkDerivation rec { installPhase = if singleWordlist == null then '' eval "$preInstall" - mkdir -p "$out/share/scowl" - mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" + mkdir -p "$out/share/scowl" + mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" mkdir -p "$out/share/dict" cp -r scowl/speller/aspell "$out/lib/aspell" diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index 640659a61080..4986101584e1 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation"; - homepage = http://docbook.org/xml/5.0/; + homepage = https://docbook.org/xml/5.0/; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index e965882a9c3c..ef7b1f93d74e 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -60,6 +60,7 @@ in { docbook_xsl_ns = common { pname = "docbook-xsl-ns"; sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"; - }; + patches = [ ./docbook-xsl-ns-infinite.patch ]; + }; } diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch new file mode 100644 index 000000000000..5729f9b43c80 --- /dev/null +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch @@ -0,0 +1,30 @@ +Description: Remove infinite recursion +Attribute: docbook5_xsl +Version: 1.79.1 +URL: https://github.com/NixOS/nixpkgs/issues/39090 +diff -ru a/lib/lib.xsl b/lib/lib.xsl +--- a/lib/lib.xsl 2015-12-26 15:15:37.000000000 -0800 ++++ b/lib/lib.xsl 2018-03-22 11:52:45.311949264 -0700 +@@ -11,8 +11,10 @@ + + ******************************************************************** --> + <xsl:stylesheet exclude-result-prefixes="d" +- xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook" +-version="1.0"> ++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns:d="http://docbook.org/ns/docbook" ++ xmlns:str="http://exslt.org/strings" ++ version="1.0"> + + <xsl:template name="dot.count"> + <!-- Returns the number of "." characters in a string --> +@@ -58,6 +61,9 @@ + <xsl:param name="replacement"/> + + <xsl:choose> ++ <xsl:when test="function-available('str:replace')"> ++ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/> ++ </xsl:when> + <xsl:when test="contains($string, $target)"> + <xsl:variable name="rest"> + <xsl:call-template name="string.subst"> diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index b03349ce2dff..2070e7bc77f5 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,14 +1,10 @@ -{ pkgs, newScope }: +{ pkgs, makeScope, libsForQt5 }: let - callPackage = newScope self; - - self = rec { + packages = self: with self; { deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; - deepin-icon-theme = callPackage ./deepin-icon-theme { }; - deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; @@ -16,4 +12,5 @@ let }; -in self +in + makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 7739e2bd09ec..60e63dc68ed9 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "econnman-${version}"; @@ -11,13 +11,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; - buildInputs = [ efl python2Packages.python dbus curl ]; + buildInputs = [ efl python2Packages.python dbus ]; pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; postInstall = '' wrapPythonPrograms - wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib ''; meta = { diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index fff15a9981d2..9660bc3e4c78 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig -, fribidi, SDL2, SDL, libGLU_combined, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio +, fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp -, curl, libinput, systemd, writeText +, curl, libinput, systemd, mesa_noglu, writeText }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.20.6"; + version = "1.20.7"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1h9jkb1pkp2g6ld7ra9mxgblx3x5id4162ja697klx9mfjkpxijn"; + sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGLU_combined + buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev systemd ]; @@ -70,6 +70,12 @@ stdenv.mkDerivation rec { 'Cflags: -I''${includedir}/eina-1/eina'"$modules" ''; + # EFL applications depend on libcurl, although it is linked at + # runtime by hand in code (it is dlopened). + postFixup = '' + patchelf --add-needed ${curl.out}/lib/libcurl.so $out/lib/libecore_con.so + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 5dc9e9a72623..9b782b94f7ff 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.22.2"; + version = "0.22.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d"; + sha256 = "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index eef9eafae38b..6a49852909e6 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }: stdenv.mkDerivation rec { name = "ephoto-${version}"; @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ]; - buildInputs = [ efl pcre curl ]; - - postInstall = '' - wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib - ''; + buildInputs = [ efl pcre ]; meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 9b3bdc90eb53..5de225220733 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, curl, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; @@ -24,12 +24,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-libav pcre - curl - ]; - - postInstall = '' - wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib - ''; + ]; meta = { description = "Video + Audio player along the lines of mplayer"; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 935546efa869..3a52707fcf4c 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }: stdenv.mkDerivation rec { name = "terminology-${version}"; @@ -17,15 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ efl pcre - curl ]; - postInstall = '' - for f in $out/bin/*; do - wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib - done - ''; - meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 7202be839082..276bc7e79c1a 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -3,7 +3,7 @@ , glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 -, libSM }: +, libSM, docbook_xml_dtd_412 }: stdenv.mkDerivation { name = "gnome-control-center-2.32.1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils - gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 + gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon - libSM + libSM docbook_xml_dtd_412 ]; configureFlags = "--disable-scrollkeeper"; } diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 05da06846418..9efca75e8f87 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -38,4 +38,6 @@ stdenv.mkDerivation rec { preConfigure = optionalString stdenv.isDarwin '' intltoolize --force ''; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 55a5f9c0a234..014255785ddf 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk -, gnome-doc-utils, intltool, libglade, libX11, which }: +, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }: stdenv.mkDerivation { name = "zenity-2.32.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gtk libglade libxml2 libxslt libX11 ]; + buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; } diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index b8a41a529b05..ef18f0783ce3 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: stdenv.mkDerivation rec { name = "ORBit2-${minVer}.19"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 3a316f71f082..834ec2201581 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -12,9 +12,20 @@ stdenv.mkDerivation rec { [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ]; propagatedBuildInputs = [ pangox_compat ]; - # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and - # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. - CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; + patches = [ + # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and + # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. + (fetchpatch { + name = "02_fix_gtk-2.20_deprecated_symbols.diff"; + url = https://git.gnome.org/browse/gtkglext/patch/?id=d8f285d1397f6c41099c67e668288eecc1cdae67; + sha256 = "1zxak73plhy3m6psil1q9ssvjh9aqrif7kcbcz69y480qfb4ja08"; + }) + # Fix build with glibc ≥ 2.27 + (fetchurl { + url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff; + sha256 = "1l1swkjkai6pnah23xfsfpbq2fgbhp5pzj3l0ybsx6b858cxqzj5"; + }) + ]; meta = with stdenv.lib; { homepage = https://projects.gnome.org/gtkglext/; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 5003215529e4..956fec1ddf15 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -14,6 +14,4 @@ stdenv.mkDerivation { buildInputs = [ gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 91b16bbba96e..93a2c41caf35 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "bijiben-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "047w8kigrdmphd17dma2lldf6r60sgx3zybai9bz9yr0hm601kr6"; + sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index f41262d85b4e..d7def6e27091 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0b6yw664jdfc8ppd78akmrl36iximh7ipknf5mlzgga6lr6pl2nf"; + sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index a9148fa52dba..80f2a825c122 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0"; postPatch = '' chmod +x postinstall.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 7c90b16d86a1..919ebdd77d17 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv"; + sha256 = "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 577382a49866..a1777137c019 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "glade-${version}"; - version = "3.22.0"; + version = "3.22.1"; src = fetchurl { url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1j7kpy4jisz4nkd3yb5af4vd4bapyqchvp2gvq6ypfw3b0x88rkc"; + sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 52fa45812fa3..8921d70787ca 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.27.92"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1v1br4zh2w3w70np5imi31md6lnqamabiin521f806rdrxsnyggq"; + sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 35888b21c2e8..b88bad2f6497 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs"; + sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 7ca258483747..1587fec2c695 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ]; mesonFlags = [ - "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" + "-Ddbus_service_dir=share/dbus-1/services" ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 3fc444dbdd4a..b3ede7028902 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-getting-started-docs-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "09khgzrbvcqvgjkqh8rp609bx818v5c8gzq61nxy5582s8habg8g"; + sha256 = "0x60aava6ba4xliy4p4i6jm5d2nq8hx9aqgnaw4d34fvmcpcy5w0"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 1c9d243c0c51..b5c8188bd064 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1imcgw67cw1qkfz8m2my0f4qmss11fbqqqi4w7afcfq9p0rplgy0"; + sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 47ea6768a04e..c2d5045e79ea 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.28.0.1"; + version = "3.28.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; - sha256 = "0yyysmxwmk167n8wghcbmxz73kgl1y1j9js3mgkjjqsmkd9brk65"; + sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ]; @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { gdk_pixbuf gnome3.defaultIconTheme python3 grilo grilo-plugins libnotify gnome3.gsettings-desktop-schemas tracker - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]; propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ]; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 502485862614..85587d11178d 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0d8fi5ydsh8n7d85dps8svl1bhid1p8jbnlwiqywj2gd2wpxpyjv"; + sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 6877b20df44d..3ece64dc163f 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.28.0.1"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i"; + sha256 = "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md"; }; # Tests need an X display diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index c60087cf47bc..74f10cc384d7 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, intltool, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook +, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook , librsvg, gobjectIntrospection, yelp-tools , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "evince-${version}"; - version = "3.28.0"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1a3kcls18dcz1lj8hrx8skcli9xxfyi71c17xjwayh71cm5jc8zs"; + sha256 = "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89"; }; passthru = { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 gnome3.gsettings-desktop-schemas - poppler ghostscriptX djvulibre libspectre + poppler ghostscriptX djvulibre libspectre libarchive libsecret librsvg gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 350c29fa9076..01891ad82473 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.28.0"; + version = "3.28.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1ybyyy6nls11az8lbri1y9527snz5h7qbhyfqvk0vc6vzvald5gv"; + sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"; }; nativeBuildInputs = [ @@ -30,9 +30,11 @@ stdenv.mkDerivation rec { "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; + postPatch = '' + cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" + ''; preFixup = '' for f in $(find $out/libexec/ -type f -executable); do diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 999c3f05748b..6b6b23f21b54 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0i5rzr6fdvlm88gl85gvql1wf1yflkmg90x81dqjf39as3ixs81s"; + sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 888eb073a46a..68b85d9dfe0f 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.52.0"; + version = "1.52.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1jm40imin4sxzfcxcbmf4v71apk8y9icccq1a4m4mlz1wm2s092m"; + sha256 = "1s1m8xv3ixgl0hah3r364ws249d6w8yn56q2ahfn3dg2j54rmz58"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index f30243003cbb..03fdf4b14fe0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn"; + sha256 = "05zpdp9mkfjz22hs7hfjikkxhzmvy02mxrldrjxsv8ff17w9xvic"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 9c9b26360aa8..c8636cb1dc1f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,13 +5,13 @@ , vala, meson, ninja }: let - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1qqj6k5rvmvg6v6vg4cak98w6rqknpqfsm0vfrwva6l6wbql2v8i"; + sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 5f6ed213e3e0..55ac087cfa2c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -9,13 +9,13 @@ let pname = "gnome-control-center"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0nyx5nl2rky0249rdcy0hsccnxf3angpya0q859rrbrwaixqnxh3"; + sha256 = "0f2p91bzbl39q3cb1qj5vi55km7wxb2fibx07vciz39g5va5cpn6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index dad8d8177de6..ed1e59da62c2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "17fm5z3kfm1m3420kjpvk1y0pc34p42rqfpmb1npy51jkv1p3pzi"; + sha256 = "16nbgrp0hihvrsa6kmqk0z8y7ajravyagmkmq1nnwn27psi9g8vq"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 0478877acb4b..4f9e2dda5402 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-disk-utility-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ad98mxyygyzq0y280m6z73anyv3xxr6irpkp6vc803lhdr5b7fc"; + sha256 = "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 20ff00ff218b..740748631ee2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-keyring-${version}"; - version = "3.28.0.1"; + version = "3.28.0.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0qxxc3wx4abb07vmbhqy4gipdzilx3v8yba9hsfzpn8p15prjz6i"; + sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index d36e7ce7432e..7b407aad5068 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-session-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b"; + sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq"; }; mesonFlags = [ "-Dsystemd=true" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 99b66fc1fe72..cfb41c01e6ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1p3ccf4a4qbz73hqyx9i55hkp6l7c7la5kazqawcndl7bksywgny"; + sha256 = "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr"; }; patches = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dudev_dir=lib/udev" ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 0d856e494c38..7ba3545848f7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib, gnome3 }: +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib +, gnome3, substituteAll }: stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; @@ -16,6 +17,13 @@ stdenv.mkDerivation rec { }; }; + patches = [ + (substituteAll { + src = ./fix_gmenu.patch; + gmenu_path = "${gnome3.gnome-menus}/lib/girepository-1.0"; + }) + ]; + doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; @@ -23,6 +31,28 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dextension_set=all" ]; + preFixup = '' + # The meson build doesn't compile the schemas. + # Fixup adapted from export-zips.sh in the source. + + extensiondir=$out/share/gnome-shell/extensions + schemadir=$out/share/gsettings-schemas/gnome-shell-extensions-3.28.0/glib-2.0/schemas/ + + glib-compile-schemas $schemadir + + for f in $extensiondir/*; do + name=`basename ''${f%%@*}` + uuid=$name@gnome-shell-extensions.gcampax.github.com + schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml + + if [ -f $schema ]; then + mkdir $f/schemas + ln -s $schema $f/schemas; + glib-compile-schemas $f/schemas + fi + done + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; description = "Modify and extend GNOME Shell functionality and behavior"; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch new file mode 100644 index 000000000000..c384826de617 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch @@ -0,0 +1,24 @@ +From f72924a59d4a30daefccf84526bd854ebbe65ac8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com> +Date: Tue, 3 Apr 2018 14:13:12 +0200 +Subject: [PATCH] Fix gmenu typelib path + +--- + extensions/apps-menu/extension.js | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js +index 5b38213..d706f64 100644 +--- a/extensions/apps-menu/extension.js ++++ b/extensions/apps-menu/extension.js +@@ -1,5 +1,7 @@ + /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ + ++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++ + const Atk = imports.gi.Atk; + const DND = imports.ui.dnd; + const GMenu = imports.gi.GMenu; +-- +2.16.2 + diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 2c4663b54ec7..21a1e1a1c4c7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0zwbgxzl805c4l8kwy5bn3p91s2qxlcn4syzzg4vd4kilc6nnjwk"; + sha256 = "0j27zygb3g08q9i8ygwpxqf6g0lrivq2vhj7p7g9x0zh9r0vzlbs"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 5f707152aed8..46a91dda70e0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1wvgx5p0a29d8yzp7rinpln90pg8vsjagqlvm4cxyhnl5hsdvrvn"; + sha256 = "0wdpd5mfrm0gwmwjvcj556c3mpxf3pcfnvh7x698i8if53ci0gw7"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 9e99e84cfd55..6f80fe0c90bf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1i5wlcjb0aigm1lbmn16nmh9rkjqfdpzzgf6qw7mcrhgw7pdald5"; + sha256 = "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index dd11da3b11e2..0503d3baa6c1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -3,13 +3,13 @@ let pname = "gnome-themes-extra"; - version = "3.27.92"; + version = "3.28"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "04jwsg9f29vzhcmf146d3rr27c8ldra378m465ahsal9vaaiywcm"; + sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index d4ba838bef3c..a8efa2384470 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0sx46j61kjn8kaf75303vym5sigki239pqzf5q4n72k1hwp7albp"; + sha256 = "189j78d23c6jr5x5j9nxkbdqxg31xvmwvyblz7f9xi9ncy0qdvfh"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 367485668807..509c10d75648 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-user-share-${version}"; - version = "3.27.90"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1wd183cjr1gmzpsq7bqwkwhmcdng0m105f6ymc89r17fz85f4jhy"; + sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index a65d0f401f0e..a5ce9ee5e105 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -6,8 +6,6 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - outputs = [ "out" "dev" ]; - src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; @@ -15,12 +13,11 @@ stdenv.mkDerivation rec { doCheck = true; + patches = [ ./fix_introspection_paths.patch ]; + nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; buildInputs = [ glib ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch new file mode 100644 index 000000000000..67003f451645 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch @@ -0,0 +1,13 @@ +--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 ++++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 +@@ -12085,8 +12085,8 @@ + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" ++ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 7c513e9398a5..fbae8fbcfbd4 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -3,7 +3,7 @@ let pname = "libgweather"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr"; + sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index a52ec342675c..2daaf2d43261 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -4,13 +4,13 @@ let pname = "nautilus"; - version = "3.28.0.1"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1i3li3nd434vncd6j6has73xihbzjx1ab0xyw8wif11mym15ixrh"; + sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w"; }; nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 3528a9a93d9c..e4458b7d0a3f 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ki95d0v9l0pb5jvk1v8k49vb7snp9j7bnxw3m8q63m00yl33qhz"; + sha256 = "140vz94vml0vf6kiw3sg436qfvajk21x6q86smvycgf24qfyvk6a"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 49bd43e61950..b4c15b5dce2e 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ]; + mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 73fd244c5489..6577ba3ae587 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vte-${version}"; - version = "0.52.0"; + version = "0.52.1"; src = fetchurl { url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0rq5gkg7bfrxlsm8mgdh4605hki81wljmjhhz8x4kbspvpfp5bnm"; + sha256 = "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 691ec2fdb94a..9a47ecd2842a 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v"; + sha256 = "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8"; }; nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 05637e200e31..b97881063427 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "zenity-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1y3dha9faqgy5l8wqh3qp354gzdh36fx70q2kc9k1nw7p498yn2y"; + sha256 = "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 786eece7194a..97a425bccb1f 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "devhelp-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1b4l71775p3mps1jsv7pz26v0lhd0qczsp6qr1dwv7hyslmpb5qn"; + sha256 = "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 87e0d79dce68..152b9522beff 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-dock-${version}"; - version = "v62"; + version = "v63"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-" + version; - sha256 = "1kmf7vxhd1c1zgaim1pwmcmsg0kffng7hcl5gfcy5qb5yvb4dy5d"; + sha256 = "140ih4l3nn2lbgw684xjvkhqxflr1xg2vm1m46z632bb0y3py4yg"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix index d82ff652bd0f..24b4c1cf703f 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-impatience-${version}"; - version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494"; + version = "0.4.5"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = version; - sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn"; + rev = "version-${version}"; + sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx"; }; buildInputs = [ @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - cp -r impatience $out + mkdir -p $out/share/gnome-shell/extensions + cp -r impatience $out/share/gnome-shell/extensions/${uuid} ''; uuid = "impatience@gfxmonk.net"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Speed up builtin gnome-shell animations"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa timbertson ]; + maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ]; homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml; }; } diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 0c3e65633c81..eed34ae523d4 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchFromGitHub, glib }: +{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }: stdenv.mkDerivation rec { name = "gnome-shell-system-monitor-${version}"; - version = "8b31f070e9e59109d729661ced313d6a63e31787"; + version = "33"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = version; - sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3"; + rev = "v${version}"; + sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk"; }; buildInputs = [ glib + glib_networking + libgtop + ]; + + patches = [ + (substituteAll { + src = ./paths_and_nonexisting_dirs.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + glib_net_path = "${glib_networking}/lib/girepository-1.0"; + }) ]; buildPhase = '' @@ -20,7 +30,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - cp -r ${uuid} $out + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions ''; uuid = "system-monitor@paradoxxx.zero.gmail.com"; @@ -28,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa ]; + maintainers = with maintainers; [ aneeshusa tiramiseb ]; homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; }; } diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch new file mode 100644 index 000000000000..82e3d7c541ba --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch @@ -0,0 +1,23 @@ +diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js +index b4b7f15..d139135 100644 +--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js ++++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js +@@ -18,6 +18,9 @@ + + // Author: Florian Mounier aka paradoxxxzero + ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); ++ + /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily + * by loading the new libnm.so. Should go away eventually */ + const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0"); +@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({ + connected: false, + _init: function () { + this._volumeMonitor = Gio.VolumeMonitor.get(); +- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; ++ let sys_mounts = ['/home', '/tmp', '/boot']; + this.base_mounts = ['/']; + sys_mounts.forEach(Lang.bind(this, function (sMount) { + if (this.is_sys_mount(sMount + '/')) { diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 063b97801b4e..aebd72d65df2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-chess-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1vxgb36njv4v3bgdpwxd89rvr6s6pkbh9d3xislxqry2yp4f03w0"; + sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 75b5060d7b3d..a7c69de44eb6 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-tweaks"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0d8zxfa8r4n4l6jzyzy6q58padxjlrad3c71mwqidm2ww8nm6i19"; + sha256 = "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp"; }; nativeBuildInputs = [ @@ -24,6 +24,8 @@ in stdenv.mkDerivation rec { libsoup gnome3.gnome-settings-daemon gnome3.nautilus gnome3.mutter gnome3.gnome-desktop gobjectIntrospection gnome3.nautilus + # Makes it possible to select user themes through the `user-theme` extension + gnome3.gnome-shell-extensions ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index b24b51a0c334..361b1ac97f62 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.28.0"; + version = "3.28.1"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "15zigqmhd2x58ml0rl6srgvpx8ms7a3dapphcr75563pacv46mir"; + sha256 = "19rdi2syshrk32hqnjh63fm0wargw546j5wlsnsg1axml0x1xww9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 5712d612e9a1..d777ec0baae5 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -2,13 +2,13 @@ let pname = "libgnome-games-support"; - version = "1.4.0"; + version = "1.4.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x"; + sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1"; }; nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty; diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index a28fef8f3d99..399bad2581f6 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,12 +1,12 @@ { gsmakeDerivation, fetchurl, base }: let - version = "0.25.0"; + version = "0.26.2"; in gsmakeDerivation { name = "gnustep-gui-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; - sha256 = "10jf3xir59qzbhhl0bvs9wdw40fsmvv6mdv5akdkia1rnck60xf5"; + sha256 = "1dsbkifnjha3ghq8xx55bpsbbng0cjsni3yz71r7342ax2ixcvxc"; }; buildInputs = [ base ]; patches = [ ./fixup-all.patch ]; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 622505864971..6ef87cece4e4 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, clang, which, libobjc }: let - version = "2.6.8"; + version = "2.7.0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "0r00439f7vrggdwv60n8p626gnyymhq968i5x9ad2i4v6g8x4gk0"; + sha256 = "1khiygfkz0zhh9b5nybn40g0xnnjxchk24n49hff1bwanszir84h"; }; configureFlags = [ diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 0ada9af3b5e0..7563e3447504 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libxcb + xorg.libXdamage xorg.xcbutilwm xorg.xcbutilimage qtbase diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index b17ab4fda659..6e8644b19b0c 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool ]; meta = { - homepage = http://lxde.org/; + homepage = https://lxde.org/; license = stdenv.lib.licenses.gpl2; description = "Freedesktop.org desktop menus for LXDE"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 1225f425b263..af9570a2c733 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight X11 desktop panel for LXDE"; - homepage = http://lxde.org/; + homepage = https://lxde.org/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ryneeverett ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix index 966566db7c8d..7938e4fd9a17 100644 --- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ qt5.qtbase qt5.qtsvg ]; preConfigure = '' - cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + cmakeFlagsArray+=( + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index 77a49410bb60..9a8e6e7a5ca9 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -4,7 +4,7 @@ qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data, pcre + lxmenu-data, pcre, libXdamage }: stdenv.mkDerivation rec { @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { menu-cache lxmenu-data pcre + libXdamage ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 070808504d14..bf0583189bc0 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "05shyqqapqbz4w0gbhx0i3kj6xg7rcj80hkaq7wf5pyj91wmkxqg"; + sha256 = "1qqqq3fi1aqjqg36y3v73z4d0bqkx7d5f79i6h9lxyh3s0876v9c"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 209edf1f363b..fb7a8308ee5f 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmatekbd-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1n2zphb3g6ai54nfr0r9s06vn3bmm361xpjga88hmq947fvbpx19"; + sha256 = "1d80xnbb8w51cv9cziybdxca037lksqkc5bd8wqlyb2p79z77426"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index e5a544ae33e5..42c74aa1173d 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marco-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "07asf8i15ih6ajkp5yapk720qyssi2cinxwg2z5q5j9m6mxax6lr"; + sha256 = "1qnx47aibvl00qaf1jik457cwncxb71pf5pd1m3gdg7ky61ljkm4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 0be643c97189..b9f9e0ece35d 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-applets-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1jmhswfcbawp9ax5p5h2dj8pyajadjdyxa0ac7ldvh7viv8qy52s"; + sha256 = "1a119g49sr7jrd8i32bw7sn2qlsg3sdiwqdb2v36bm2999j261wc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index efe8adae678e..7e501fcf379b 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-calc-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "03cma6b00chd4026pbnh5i0ckpl8b1l7i1ppvcmbfbx0s3vpbc73"; + sha256 = "00k063ia4dclvcpg1q733lbi56533s6mj8bgb1nrgna6y7zw4q87"; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Calculator for the MATE desktop"; homepage = http://mate-desktop.org; license = [ licenses.gpl2Plus ]; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index fdee351aeed5..6bde7d7a0172 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-control-center-${version}"; - version = "1.20.0"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0qq3ln40w7lxa7qvbvbsgdq1c5ybzqw3bw2x4z6y6brl4c77sbh7"; + sha256 = "1x40gxrz1hrzbdfl8vbag231g08h45vaky5z827k44qwl6pjd6nl"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 56c0ae4632ca..f84b6b254207 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-desktop-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0y5172sbj6f4dvimf4pmz74b9cfidbpmnwwb9f6vlc6fa0kp5l1n"; + sha256 = "0jxhhf9w6mz8ha6ymgj2alzmiydylg4ngqslkjxx37vvpvms2dyx"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 93ad93b07b98..7291b475fe16 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; buildInputs = [ librsvg hicolor-icon-theme ]; - + postInstall = '' for theme in "$out"/share/icons/*; do "${gtk3.out}/bin/gtk-update-icon-cache" "$theme" done ''; - + meta = { description = "Icon themes from MATE"; homepage = http://mate-desktop.org; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 0adcb58758c3..df1c15bddd37 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-panel-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0cz1pfwvsmrjcd0wa83cid9yjcygla6rhigyr7f75d75kiknlcm7"; + sha256 = "1vmvn93apvq6r9m823zyrncbxgsjr4nmigw9k4s4n05z8zd8wy8k"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index ddde6acf0e0e..c056b1f62fbd 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "038c2q5kqvqmkp1i93p4pp9x8p6a9i7lyn3nv522mq06qsbynbww"; + sha256 = "1s46jvjcrai6xb2k0dy7i121b9ihfl5h3y5809fg9fzrbvw6bafn"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index b97b5294d39b..490500fca697 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-settings-daemon-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0p4fr2sgkjcjsrmkdy579xmk20dl0sa6az40rzvm6fb2w6693sf5"; + sha256 = "1hmc5qfr9yrvrlc1d2mmsqbhv0lhikbadaac18bxjynw9ff857iq"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index c68b8b7d9bd8..9d82d439c825 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mate-themes-${version}"; - version = "3.22.15"; + version = "3.22.16"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0cmlbj6vlkavdirc5xnsgwmy0m11bj9yrbv1dkq46n1s23rvv6wg"; + sha256 = "1k8qp2arjv4vj8kyjhjgyj5h46jy0darlfh48l5h25623z1firdj"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index d951c9f9bbd0..bbff7d246978 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pluma-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0w2x270n11rfa321cdlycfhcgncwxqpikjyl3lwmn4vkx8nhgq5f"; + sha256 = "09arzypdz6q1zpxd1qqnsn1ykvhmzlf7nylkz2vpwlvnnd3x8ip3"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 22e790784d57..7f259d669547 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }: stdenv.mkDerivation rec { majorVersion = "0.4"; @@ -9,19 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss"; }; - preConfigure = '' - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig" - ''; - - preFixup = '' - for f in $out/bin/*; do - wrapProgram $f \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share" - done - ''; - nativeBuildInputs = [ - perl cmake vala_0_38 pkgconfig makeWrapper + perl cmake vala_0_38 pkgconfig wrapGAppsHook # For setup hook gobjectIntrospection ]; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 20fdddfe46c0..117401b0eab1 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index ea58cad12ae0..ccbf3820b908 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,11 +1,11 @@ { mkDerivation, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtx11extras, + kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm }: mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ]; + buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; } diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 14b5f3a39ad1..df031ba06275 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/bluedevil-5.12.3.tar.xz"; - sha256 = "1vzdj2byxrsnxg1hkw8fhjnmxazypb8x6nplfi2wpjbm0inpv0gk"; - name = "bluedevil-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz"; + sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x"; + name = "bluedevil-5.12.4.tar.xz"; }; }; breeze = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/breeze-5.12.3.tar.xz"; - sha256 = "0mknaxcgr51wbv43hhlplxmvi8k7xk73ns3ld86djj3mpa9cxfhw"; - name = "breeze-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz"; + sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7"; + name = "breeze-5.12.4.tar.xz"; }; }; breeze-grub = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/breeze-grub-5.12.3.tar.xz"; - sha256 = "1fh26sywr9cawywndw16zhdhs6pz9bfx0i9j0x1v7nbbnz0qam2b"; - name = "breeze-grub-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz"; + sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs"; + name = "breeze-grub-5.12.4.tar.xz"; }; }; breeze-gtk = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/breeze-gtk-5.12.3.tar.xz"; - sha256 = "0nw1d62fd74m9dsvnvy25bcd1y08fv3c51jnp06b3p1yljx8gw8x"; - name = "breeze-gtk-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz"; + sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c"; + name = "breeze-gtk-5.12.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/breeze-plymouth-5.12.3.tar.xz"; - sha256 = "15px5iw237lb27ms70w8vcm1kqf5k5wmyqkxqdd70x8aqrqzf9zn"; - name = "breeze-plymouth-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz"; + sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr"; + name = "breeze-plymouth-5.12.4.tar.xz"; }; }; discover = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/discover-5.12.3.tar.xz"; - sha256 = "132hbrnpr416yyzl8yh1d66j6j8h7paxw1lx2dm6fpyd0nf8zkdd"; - name = "discover-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz"; + sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq"; + name = "discover-5.12.4.tar.xz"; }; }; drkonqi = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/drkonqi-5.12.3.tar.xz"; - sha256 = "0vc5q9g9chwsbbg98mg0mnxcfva7dm9qgcpwxv5v0qdlddzm6m7m"; - name = "drkonqi-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz"; + sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6"; + name = "drkonqi-5.12.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kactivitymanagerd-5.12.3.tar.xz"; - sha256 = "0fmr8n4s4qbfvrg0nmxl0rdl07rsy4l76idramn85rfbplv4nqr1"; - name = "kactivitymanagerd-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz"; + sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg"; + name = "kactivitymanagerd-5.12.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kde-cli-tools-5.12.3.tar.xz"; - sha256 = "0d2mkrpy2pib0za75m2mg6pvkklbwizh14cqi3zabqi384fys1j3"; - name = "kde-cli-tools-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz"; + sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb"; + name = "kde-cli-tools-5.12.4.tar.xz"; }; }; kdecoration = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kdecoration-5.12.3.tar.xz"; - sha256 = "1xsjq8aw8r4yl5wpr0alihfaf6r146x4rz7p8k635n771b25ilsy"; - name = "kdecoration-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz"; + sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj"; + name = "kdecoration-5.12.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kde-gtk-config-5.12.3.tar.xz"; - sha256 = "0wsxz5v585srkn8qbb4b82ci1wgrpzg87krixzsxzd3k0wc0c71q"; - name = "kde-gtk-config-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz"; + sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6"; + name = "kde-gtk-config-5.12.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kdeplasma-addons-5.12.3.tar.xz"; - sha256 = "06g61flgszaks5p9xrlnyjkdyfddyxrgv0vyf85h78wvydxca18p"; - name = "kdeplasma-addons-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz"; + sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5"; + name = "kdeplasma-addons-5.12.4.tar.xz"; }; }; kgamma5 = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kgamma5-5.12.3.tar.xz"; - sha256 = "0nvv4fg2hjxxmkjr1yrwsywgcm2y8w7xng928kisgaarf55dfmvm"; - name = "kgamma5-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz"; + sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h"; + name = "kgamma5-5.12.4.tar.xz"; }; }; khotkeys = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/khotkeys-5.12.3.tar.xz"; - sha256 = "1sx3g6pk23lwpc7x2a90vakb4vlmr3lzmhy86iq07r0kbp6fz3wa"; - name = "khotkeys-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz"; + sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f"; + name = "khotkeys-5.12.4.tar.xz"; }; }; kinfocenter = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kinfocenter-5.12.3.tar.xz"; - sha256 = "0l9mfxylcf9rmq3yih7gp43vxy8j9rfgniml831prax5kcqgk3yr"; - name = "kinfocenter-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz"; + sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3"; + name = "kinfocenter-5.12.4.tar.xz"; }; }; kmenuedit = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kmenuedit-5.12.3.tar.xz"; - sha256 = "1x60z8g1lphsjmsrf6j3br0nx5ip6rk8f8g4r1xmbczgpnyzsqr4"; - name = "kmenuedit-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz"; + sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099"; + name = "kmenuedit-5.12.4.tar.xz"; }; }; kscreen = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kscreen-5.12.3.tar.xz"; - sha256 = "1azgvl7zx98a4jlqdb3w2h3951kg05l5lgz2bqfss5npm2kddis9"; - name = "kscreen-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz"; + sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315"; + name = "kscreen-5.12.4.tar.xz"; }; }; kscreenlocker = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kscreenlocker-5.12.3.tar.xz"; - sha256 = "1incnja96342wdyqyayn4kyk5fhmyvg7r13pszcc9a5gx937n2dm"; - name = "kscreenlocker-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz"; + sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m"; + name = "kscreenlocker-5.12.4.tar.xz"; }; }; ksshaskpass = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/ksshaskpass-5.12.3.tar.xz"; - sha256 = "11wgb311pi1mxhy1xiylg5y3blyl234gcyfdn0xivmrgjn1kzg7h"; - name = "ksshaskpass-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz"; + sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5"; + name = "ksshaskpass-5.12.4.tar.xz"; }; }; ksysguard = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/ksysguard-5.12.3.tar.xz"; - sha256 = "0w7yz7qwfz3hy0vg95rv09c4yzw7g90hm9a0jzz3prdm1sicsvbc"; - name = "ksysguard-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz"; + sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk"; + name = "ksysguard-5.12.4.tar.xz"; }; }; kwallet-pam = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kwallet-pam-5.12.3.tar.xz"; - sha256 = "106dyl7w1b29351kzmgh5fjvy06yf6ab26x5p0aj7di2ymai9cqz"; - name = "kwallet-pam-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz"; + sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q"; + name = "kwallet-pam-5.12.4.tar.xz"; }; }; kwayland-integration = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kwayland-integration-5.12.3.tar.xz"; - sha256 = "0cx1dnds4wr5fm2kbc7mlkpq82pzhq59jgij273lr6y656drxxdi"; - name = "kwayland-integration-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz"; + sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla"; + name = "kwayland-integration-5.12.4.tar.xz"; }; }; kwin = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kwin-5.12.3.tar.xz"; - sha256 = "0xsqiqnvk1gxrgik2cpqmzyl3q3ncr58r5p0xbyzqsybqz1jys71"; - name = "kwin-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz"; + sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8"; + name = "kwin-5.12.4.tar.xz"; }; }; kwrited = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/kwrited-5.12.3.tar.xz"; - sha256 = "1yhx94wdf19k2qaym7d89xj03rs6br2mk6z64nkw70d8i01vlax1"; - name = "kwrited-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz"; + sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy"; + name = "kwrited-5.12.4.tar.xz"; }; }; libkscreen = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/libkscreen-5.12.3.tar.xz"; - sha256 = "09pg4fnzyklhgkgqrwqpc0kb4siiyz67mq2lyk5h50gmys4l48b4"; - name = "libkscreen-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz"; + sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr"; + name = "libkscreen-5.12.4.tar.xz"; }; }; libksysguard = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/libksysguard-5.12.3.tar.xz"; - sha256 = "06lg3sd8h3wya9ss3cii9fsn4r4al2vqa0m0zb68s2l5340mcy7l"; - name = "libksysguard-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz"; + sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd"; + name = "libksysguard-5.12.4.tar.xz"; }; }; milou = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/milou-5.12.3.tar.xz"; - sha256 = "0ywa8yvblc07mzmrzhrmsgdygzxdq6c3nnd7ayw68iil8886r7wq"; - name = "milou-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz"; + sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7"; + name = "milou-5.12.4.tar.xz"; }; }; oxygen = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/oxygen-5.12.3.tar.xz"; - sha256 = "1fcp3swa7b8qk2zzvs9nxjp0100hgpxc4av39rvvw0d2m647k856"; - name = "oxygen-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz"; + sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa"; + name = "oxygen-5.12.4.tar.xz"; }; }; plasma-desktop = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-desktop-5.12.3.tar.xz"; - sha256 = "1mz20r7cc7mn1ay7dkz6sikhadnk2dsxf5y6ijlpan7mp3ljlsq8"; - name = "plasma-desktop-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz"; + sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy"; + name = "plasma-desktop-5.12.4.tar.xz"; }; }; plasma-integration = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-integration-5.12.3.tar.xz"; - sha256 = "0q9kgfsa530qkjari4zw6bxrk7127v6gpirs76phw9lphpqbvgww"; - name = "plasma-integration-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz"; + sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb"; + name = "plasma-integration-5.12.4.tar.xz"; }; }; plasma-nm = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-nm-5.12.3.tar.xz"; - sha256 = "143xma5i5qpfzg727pixvjgwcczj6zi0jwyibd05qmpbcyy09c9w"; - name = "plasma-nm-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz"; + sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj"; + name = "plasma-nm-5.12.4.tar.xz"; }; }; plasma-pa = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-pa-5.12.3.tar.xz"; - sha256 = "0jlx07isw63nw2dfvn4sbv8j0az8bw62j7wp2mhxnwn5g6afci2l"; - name = "plasma-pa-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz"; + sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56"; + name = "plasma-pa-5.12.4.tar.xz"; }; }; plasma-sdk = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-sdk-5.12.3.tar.xz"; - sha256 = "0hla9vi4yp79fmv06w89974fxzsfxnxfad4iyhpqpsrp3g004qli"; - name = "plasma-sdk-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz"; + sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2"; + name = "plasma-sdk-5.12.4.tar.xz"; }; }; plasma-tests = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-tests-5.12.3.tar.xz"; - sha256 = "1025prmvwlx5id14243m14hmz626nbpzn98q25i1nagmj2whw4w7"; - name = "plasma-tests-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz"; + sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9"; + name = "plasma-tests-5.12.4.tar.xz"; }; }; plasma-vault = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-vault-5.12.3.tar.xz"; - sha256 = "0a9cqfvxjzcgka786s9arz3zahl2qpj6qkh5vdxpf6akvcffw70h"; - name = "plasma-vault-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz"; + sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n"; + name = "plasma-vault-5.12.4.tar.xz"; }; }; plasma-workspace = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-5.12.3.tar.xz"; - sha256 = "0br36qyd7w7cgd6fzw1iai06mfzyvsf94qyip008h68j92wznfcy"; - name = "plasma-workspace-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz"; + sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7"; + name = "plasma-workspace-5.12.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-wallpapers-5.12.3.tar.xz"; - sha256 = "0gmpf0d7dzpnmm9lzgjqmr201mjkvjwbf0qlg5n87w7j9j4c580v"; - name = "plasma-workspace-wallpapers-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz"; + sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j"; + name = "plasma-workspace-wallpapers-5.12.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/plymouth-kcm-5.12.3.tar.xz"; - sha256 = "1zqmlmzrxmvm49mj33wj51q83j15rq8a6v3xmv7fr55gsfh9hmpk"; - name = "plymouth-kcm-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz"; + sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn"; + name = "plymouth-kcm-5.12.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.12.3"; + version = "1-5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/polkit-kde-agent-1-5.12.3.tar.xz"; - sha256 = "0kb2ijjfqncrw02lrkh6jw2g2rps7aqs7v20gjdam9sacmnwy5j0"; - name = "polkit-kde-agent-1-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz"; + sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q"; + name = "polkit-kde-agent-1-5.12.4.tar.xz"; }; }; powerdevil = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/powerdevil-5.12.3.tar.xz"; - sha256 = "1xj6d4b3iam0xpv27506k11qyh9bwafq4vlwah6bla944cvza484"; - name = "powerdevil-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz"; + sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx"; + name = "powerdevil-5.12.4.tar.xz"; }; }; sddm-kcm = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/sddm-kcm-5.12.3.tar.xz"; - sha256 = "1fd3ski6pnz6lba2zwvwqnxrszsn5505gnxbs15wc7zk6avf2hp2"; - name = "sddm-kcm-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz"; + sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7"; + name = "sddm-kcm-5.12.4.tar.xz"; }; }; systemsettings = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/systemsettings-5.12.3.tar.xz"; - sha256 = "05l3yl27577567apmbiw884qkbrlgjzwz93s26va76apqn71vali"; - name = "systemsettings-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz"; + sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a"; + name = "systemsettings-5.12.4.tar.xz"; }; }; user-manager = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/user-manager-5.12.3.tar.xz"; - sha256 = "11glncc24qna9v6mjz7rgv18nrx90bhmfamlf07n3fziz9fmxvkh"; - name = "user-manager-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz"; + sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm"; + name = "user-manager-5.12.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.3/xdg-desktop-portal-kde-5.12.3.tar.xz"; - sha256 = "0swy8kcczvs2ariyjrkln6mvc0xqrjznpkhw5gzyh61v3hpddgk9"; - name = "xdg-desktop-portal-kde-5.12.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz"; + sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c"; + name = "xdg-desktop-portal-kde-5.12.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 80153332934a..541b30ec1b3d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 8a602b8b4a1e..5331c29a4546 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 1ba4340fcb5e..c420c9fb6436 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Battery plugin for Xfce panel"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix index 88ed804191ac..ab64acee0504 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix @@ -9,7 +9,7 @@ mkXfceDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - propagatedNativeBuildInputs = [ + propagatedBuildInputs = [ autoconf automake glib diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 69182c3aa0d8..f46e705fb901 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,23 +1,40 @@ -{ stdenv, lib, buildFHSUserEnv -}: +{ lib, buildFHSUserEnv }: + let - pio-pkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle - python27Packages.platformio + pio-pkgs = pkgs: + let + python = pkgs.python.override { + packageOverrides = self: super: { + + # https://github.com/platformio/platformio-core/issues/349 + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; + }; + }); + + platformio = self.callPackage ./core.nix { }; + }; + }; + in (with pkgs; [ zlib + ]) ++ (with python.pkgs; [ + python + setuptools + pip + bottle + platformio ]); -in -buildFHSUserEnv { + +in buildFHSUserEnv { name = "platformio"; targetPkgs = pio-pkgs; multiPkgs = pio-pkgs; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source ecosystem for IoT development"; homepage = http://platformio.org; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/arduino/platformio/core.nix index 01d47b458606..9d30c2268554 100644 --- a/pkgs/development/python-modules/platformio/default.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -1,24 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi -, bottle, click_5, colorama +, bottle, click, colorama , lockfile, pyserial, requests , semantic-version -, isPy3k, isPyPy , git }: -buildPythonPackage rec { - disabled = isPy3k || isPyPy; +buildPythonPackage rec { pname = "platformio"; - version="3.5.1"; - name = "${pname}-${version}"; + version = "3.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0cc15mzh7p1iykip0jpxldz81yz946vrgvhwmfl8w3z5kgjjgx3n"; + sha256 = "bb311ce5b8f12c95bc45c2071626a4887a3632fb2472b4d69a873b2acfc2e4ec"; }; propagatedBuildInputs = [ - bottle click_5 colorama git lockfile + bottle click colorama git lockfile pyserial requests semantic-version ]; diff --git a/pkgs/development/python-modules/platformio/fix-searchpath.patch b/pkgs/development/arduino/platformio/fix-searchpath.patch index a215ffc7d614..a215ffc7d614 100644 --- a/pkgs/development/python-modules/platformio/fix-searchpath.patch +++ b/pkgs/development/arduino/platformio/fix-searchpath.patch diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index ccb366ffe1cb..63dd315e8e4e 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; - homepage = "http://www.adobe.com/products/flex.html"; + homepage = "https://www.adobe.com/products/flex.html"; license = stdenv.lib.licenses.mpl11; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix deleted file mode 100755 index 6fa25df5e033..000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{stdenv, fetchurl -, arm-frc-linux-gnueabi-binutils, arm-frc-linux-gnueabi-eglibc, arm-frc-linux-gnueabi-linux-api-headers -, elfutils -, libmpc, gmp, mpfr, zlib, isl_0_15, cloog}: - -stdenv.mkDerivation rec { - _target = "arm-frc-linux-gnueabi"; - - version = "4.9.4"; - name = "${_target}-gcc-${version}"; - - src = fetchurl { - url = "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092"; - }; - - patches = [ - ./minorSOname.patch - ./no-nested-deprecated-warnings.patch - ]; - - hardeningDisable = [ "format" ]; - - buildInputs = [ - arm-frc-linux-gnueabi-binutils - arm-frc-linux-gnueabi-eglibc - arm-frc-linux-gnueabi-linux-api-headers - elfutils - libmpc - gmp - mpfr - zlib - isl_0_15 - cloog - ]; - - - configurePhase = '' - mkdir gcc-build - cd gcc-build - ../configure \ - --prefix=$out \ - --host=$CHOST \ - --build=$CHOST \ - --program-prefix=${_target}- \ - --target=${_target} \ - --enable-shared \ - --disable-nls \ - --enable-threads=posix \ - --enable-languages=c,c++ \ - --disable-multilib \ - --disable-multiarch \ - --with-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \ - --with-build-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \ - --with-as=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/as \ - --with-ld=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/ld \ - --with-cpu=cortex-a9 \ - --with-float=softfp \ - --with-fpu=vfp \ - --with-specs='%{save-temps:-fverbose-asm} %{funwind-tables|fno-unwind-tables|mabi=*|ffreestanding|nostdlib:;:-funwind-tables}' \ - --enable-lto \ - --with-pkgversion='GCC-for-FRC' \ - --with-cloog \ - --enable-poison-system-directories \ - --enable-plugin \ - --with-system-zlib \ - --disable-libmudflap \ - --disable-libsanitizer - ''; - - makeFlags = [ - "all-gcc" - "all-target-libgcc" - "all-target-libstdc++-v3" - ]; - - installPhase = '' - make install-gcc install-target-libgcc install-target-libstdc++-v3 - ''; - - postInstall = '' - rm -rf $out/share/{man/man7,info}/ "$out/share/gcc-${version}/python" - ''; - - meta = with stdenv.lib; { - description = "FRC cross compiler"; - longDescription = '' - arm-frc-linux-gnueabi-gcc is a cross compiler for building - code for FIRST Robotics Competition. Used as a cross compiler - for the NI RoboRio. - ''; - license = licenses.gpl2; - maintainers = [ maintainers.colescott ]; - platforms = platforms.linux; - - priority = 4; - }; -} diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch deleted file mode 100755 index d97d12bc629a..000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Make the default SONAME include minor numbers (c++) - This patch adds .0.20 to the end of the SONAME for libstdc++ to support - independent side-by-side usage of .17 and .20. - . - gcc-armel (4.9.1-0frc2) trusty; urgency=low - . - * Fixing dependency ambiguity yet again... -Author: Patrick Plenefisch <phplenefisch@wpi.edu> - ---- - ---- gcc-armel-4.9.1.orig/libstdc++-v3/configure -+++ gcc-armel-4.9.1/libstdc++-v3/configure -@@ -10698,7 +10698,7 @@ gnu*) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -10824,7 +10824,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -14382,7 +14382,7 @@ gnu*) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -14508,7 +14508,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch deleted file mode 100755 index 050a63e92fd6..000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Get rid of recursive deprecated warnings. - As is, gcc gives warnings when a function with the - deprecated attribute calls another function with - the deprecated attribute. - See http://stackoverflow.com/questions/13459602/how-can-i-get-rid-of-deprecated-warnings-in-deprecated-functions-in-gcc - -Author: James Kuszmaul <jbkuszmaul@wpi.edu> - --- - ---- gcc-armel-4.9.1.orig/gcc/tree.c -+++ gcc-armel-4.9.1/gcc/tree.c -@@ -12063,6 +12063,9 @@ warn_deprecated_use (tree node, tree attr) - if (node == 0 || !warn_deprecated_decl) - return; - -+ if (current_function_decl && TREE_DEPRECATED(current_function_decl)) -+ return; -+ - if (!attr) - { - if (DECL_P (node)) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 2c2869f76e72..fc75fe92c730 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "44"; + defaultVersion = "45"; # Map from git revs to SHA256 hashes sha256s = { - "version_44" = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p"; + "version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; "1.37.36" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; }; in diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 9472384020bc..de3126371bfa 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20180204"; + version = "20180319"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "1nh4yznabwpp9k6flk9562w87d6sxk1fwwpk4d3knwy25iyn3mwq"; + sha256 = "181cskxamq9vkrmb2c78v6hpknrzzp49vkzp53r9pisf5j0p7220"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 0681e8210a6a..3861501d3996 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { name = "coreclr-${version}"; - version = "2.0.0"; + version = "2.0.7"; src = fetchFromGitHub { owner = "dotnet"; repo = "coreclr"; rev = "v${version}"; - sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw"; + sha256 = "0pzkrfgqywhpijbx7j1v4lxa6270h6whymb64jdkp7yj56ipqh2n"; }; patches = [ @@ -34,12 +34,20 @@ stdenv.mkDerivation rec { url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch; sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; }) + (fetchpatch { + # clang 5 + url = https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch; + sha256 = "1w1lxw5ryvhq8m5m0kv880c4bh6y9xdgypkr76sqbh3v568yghzg"; + }) ]; - buildInputs = [ + nativeBuildInputs = [ which cmake clang + ]; + + buildInputs = [ llvmPackages.llvm llvmPackages.lldb libunwind @@ -68,7 +76,8 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ./build.sh $BuildArch $BuildType + # disable -Werror which can potentially breaks with every compiler upgrade + ./build.sh $BuildArch $BuildType cmakeargs "-DCLR_CMAKE_WARNINGS_ARE_ERRORS=OFF" runHook postBuild ''; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix new file mode 100644 index 000000000000..93e53aa30d13 --- /dev/null +++ b/pkgs/development/compilers/eli/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, fetchurl +, symlinkJoin +, makeWrapper +, tcl +, fontconfig +, tk +, ncurses +, xorg +, file +}: + +let + # eli derives the location of the include folder from the location of the lib folder + tk_combined = symlinkJoin { + name = "tk_combined"; + paths = [ + tk + tk.dev + ]; + }; + curses_combined = symlinkJoin { + name = "curses_combined"; + paths = [ + ncurses + ncurses.dev + ]; + }; +in +stdenv.mkDerivation rec { + name = "eli"; + version = "4.8.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2"; + sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; + }; + + buildInputs = [ + ncurses + fontconfig + ] ++ (with xorg; [ + libX11.dev + libXt.dev + libXaw.dev + libXext.dev + ]); + + nativeBuildInputs = [ + file + makeWrapper + ]; + + # skip interactive browser check + buildFlags = "nobrowsers"; + + + preConfigure='' + configureFlagsArray=( + --with-tcltk="${tcl} ${tk_combined}" + --with-curses="${curses_combined}" + ) + export ODIN_LOCALIPC=1 + ''; + + postInstall = '' + wrapProgram "$out/bin/eli" \ + --set ODIN_LOCALIPC 1 + ''; + + # Test if eli starts + doInstallCheck = true; + installCheckPhase = '' + export HOME="$TMP/home" + mkdir -p "$HOME" + $out/bin/eli "!ls" + ''; + + meta = { + description = "Translator Construction Made Easy"; + longDescription = '' + Eli is a programming environment that supports all phases of translator + construction with extensive libraries implementing common tasks, yet handling + arbitrary special cases. Output is the C subset of C++. + ''; + homepage = http://eli-project.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ timokau ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 4520363a53b2..8ed34cf9d1e0 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -74,23 +74,26 @@ let elm-format = self.callPackage ./packages/elm-format.nix { }; elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix { aeson-pretty = self.aeson-pretty_0_7_2; + either = hlib.overrideCabal self.either (drv :{ + jailbreak = true; + version = "4.4.1.1"; + sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh"; + libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ + self.exceptions self.free self.mmorph self.monad-control + self.MonadRandom self.profunctors self.transformers + self.transformers-base + ]; + }); }; }; in elmPkgs // { inherit elmPkgs; elmVersion = elmRelease.version; - # needed for elm-package - http-client = hlib.overrideCabal super.http-client (drv: { - version = "0.4.31.2"; - sha256 = "12yq2l6bvmxg5w6cw5ravdh39g8smwn1j44mv36pfmkhm5402h8n"; - }); - http-client-tls = hlib.overrideCabal super.http-client-tls (drv: { - version = "0.2.4.1"; - sha256 = "18wbca7jg15p0ds3339f435nqv2ng0fqc4bylicjzlsww625ij4d"; - }); # https://github.com/elm-lang/elm-compiler/issues/1566 indents = hlib.overrideCabal super.indents (drv: { version = "0.3.3"; + #test dep tasty has a version mismatch + doCheck = false; sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn"; libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative]; }); diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index 4a60b3dfb387..49eddb58a142 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary , bytestring, containers, directory, edit-distance, elm-compiler -, fetchgit, filepath, HTTP, http-client, http-client-tls +, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls , http-types, mtl, network, optparse-applicative, parallel-io , pretty, stdenv, text, time, unordered-containers, vector , zip-archive @@ -13,6 +13,10 @@ mkDerivation { sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7"; rev = "8bd150314bacab5b6fc451927aa01deec2276fbf"; }; + patches = fetchurl { + url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch; + sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib"; + }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix index 490dace2faaf..10c1107da026 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, binutils-raw, wrapCCWith, symlinkJoin }: +{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }: let callPackage = newScope (self // {inherit stdenv;}); @@ -7,7 +7,7 @@ let emscriptenfastcomp-wrapped = wrapCCWith { cc = self.emscriptenfastcomp-unwrapped; # Never want Apple's cctools for WASM target - bintools = binutils-raw; + bintools = binutils; libc = stdenv.cc.libc; extraBuildCommands = '' # hardening flags break WASM support diff --git a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 5317cf25d41b..5317cf25d41b 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 7376aec27501..05e804a1f740 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Optimizing Scheme to C compiler, bootstrap step"; homepage = "http://gambitscheme.org"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix new file mode 100644 index 000000000000..202e55254222 --- /dev/null +++ b/pkgs/development/compilers/gambit/build.nix @@ -0,0 +1,70 @@ +{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }: + +stdenv.mkDerivation rec { + name = "gambit-${version}"; + src = SRC; + + bootstrap = import ./bootstrap.nix ( pkgs ); + + # Use makeStaticLibraries to enable creation of statically linked binaries + buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)]; + + configurePhase = '' + options=( + --prefix=$out + --enable-single-host + --enable-c-opt=-O2 + --enable-gcc-opts + --enable-shared + --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. + --enable-poll + --enable-openssl + --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O + #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log + + #--enable-multiple-versions # Nope, NixOS already does version multiplexing + #--enable-guide + #--enable-track-scheme + #--enable-high-res-timing + #--enable-max-processors=4 + #--enable-multiple-vms + #--enable-dynamic-tls + #--enable-multiple-vms + #--enable-multiple-threaded-vms ## when SMP branch is merged in + #--enable-thread-system=posix ## default when --enable-multiple-vms is on. + #--enable-profile + #--enable-coverage + #--enable-inline-jumps + #--enable-char-size=1" ; default is 4 + ) + ./configure ''${options[@]} + ''; + + buildPhase = '' + # Make bootstrap compiler, from release bootstrap + mkdir -p boot && + cp -rp ${bootstrap}/. boot/. && + chmod -R u+w boot && + cd boot && + cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + ./configure && + for i in lib gsi gsc ; do (cd $i ; make ) ; done && + cd .. && + cp boot/gsc/gsc gsc-boot && + + # Now use the bootstrap compiler to build the real thing! + make -j2 from-scratch + ''; + + doCheck = true; + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + # NB regarding platforms: only actually tested on Linux, *should* work everywhere, + # but *might* need adaptation e.g. on macOS. + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 95e8dba762a2..0996d0c3078a 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,75 +1,13 @@ -{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs, makeStaticLibraries }: +{ callPackage, fetchgit }: -# TODO: distinct packages for gambit-release and gambit-devel - -stdenv.mkDerivation rec { - name = "gambit-${version}"; +callPackage ./build.nix { version = "4.8.9"; - bootstrap = import ./bootstrap.nix ( pkgs ); + # TODO: for next version, prefer the unpatched tarball for the stable/default gambit. + git-version = "4.8.9-8-g793679bd"; - src = fetchgit { + SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; rev = "dd54a71dfc0bd09813592f1645d755867a02195d"; sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc"; }; - - # Use makeStaticLibraries to enable creation of statically linked binaries - buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)]; - - configurePhase = '' - options=( - --prefix=$out - --enable-single-host - --enable-c-opt=-O2 - --enable-gcc-opts - --enable-shared - --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. - --enable-poll - --enable-openssl - --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O - #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log - - #--enable-multiple-versions # Nope, NixOS already does version multiplexing - #--enable-guide - #--enable-track-scheme - #--enable-high-res-timing - #--enable-max-processors=4 - #--enable-multiple-vms - #--enable-dynamic-tls - #--enable-multiple-vms - #--enable-multiple-threaded-vms ## when SMP branch is merged in - #--enable-thread-system=posix ## default when --enable-multiple-vms is on. - #--enable-profile - #--enable-coverage - #--enable-inline-jumps - #--enable-char-size=1" ; default is 4 - ) - ./configure ''${options[@]} - ''; - - buildPhase = '' - # Make bootstrap compiler, from release bootstrap - mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && - chmod -R u+w boot && - cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ - ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && - cd .. && - cp boot/gsc/gsc gsc-boot && - - # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch - ''; - - doCheck = true; - - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; - }; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix new file mode 100644 index 000000000000..f98fd5ca935a --- /dev/null +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -0,0 +1,11 @@ +{ callPackage, fetchgit }: + +callPackage ./build.nix { + version = "unstable-2018-03-26"; + git-version = "4.8.9-8-g793679bd"; + SRC = fetchgit { + url = "https://github.com/feeley/gambit.git"; + rev = "793679bd57eb6275cb06e6570b05f4a78df61bf9"; + sha256 = "0bippvmrc8vcaa6ka3mhzfgkagb6a1616g7nxk0i0wapxai5cngj"; + }; +} diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 8e7cd3d3fab8..0b19aa95effe 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -57,16 +57,18 @@ let version = "7.3.0"; enableParallelBuilding = true; patches = - [ ] + [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html + ./riscv-pthread-reentrant.patch + # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html + ./riscv-no-relax.patch + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs"; }) - ++ optional langFortran ../gfortran-driving.patch - # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html - ++ optional targetPlatform.isRiscV ./riscv-pthread-reentrant.patch; + ++ optional langFortran ../gfortran-driving.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -212,7 +214,12 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" ''; - postPatch = + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig @@ -271,7 +278,7 @@ stdenv.mkDerivation ({ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) - else null; + else ""); # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; diff --git a/pkgs/development/compilers/gcc/7/riscv-no-relax.patch b/pkgs/development/compilers/gcc/7/riscv-no-relax.patch new file mode 100644 index 000000000000..93d9cd1d60f5 --- /dev/null +++ b/pkgs/development/compilers/gcc/7/riscv-no-relax.patch @@ -0,0 +1,109 @@ +commit e7c570f37384d824cb9725f237920e9691e57269 +gpg: Signature made Tue 06 Mar 2018 04:52:46 PM PST +gpg: using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41 +gpg: issuer "palmer@dabbelt.com" +gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [ultimate] +gpg: aka "Palmer Dabbelt <palmer@sifive.com>" [ultimate] +Author: Palmer Dabbelt <palmer@sifive.com> +Date: Thu Mar 1 12:01:06 2018 -0800 + + RISC-V: Add and document the "-mno-relax" option + + RISC-V relies on aggressive linker relaxation to get good code size. As + a result no text symbol addresses can be known until link time, which + means that alignment must be handled during the link. This alignment + pass is essentially just another linker relaxation, so this has the + unfortunate side effect that linker relaxation is required for + correctness on many RISC-V targets. + + The RISC-V assembler has supported an ".option norelax" for a long time + because there are situations in which linker relaxation is a bad idea -- + the canonical example is when trying to materialize the initial value of + the global pointer into a register, which would otherwise be relaxed to + a NOP. We've been relying on users who want to disable relaxation for + an entire link to pass "-Wl,--no-relax", but that still relies on the + linker relaxing R_RISCV_ALIGN to handle alignment despite it not being + strictly necessary. + + This patch adds a GCC option, "-mno-relax", that disable linker + relaxation by adding ".option norelax" to the top of every generated + assembly file. The assembler is smart enough to handle alignment at + assemble time for files that have never emitted a relaxable relocation, + so this is sufficient to really disable all relaxations in the linker, + which results in significantly faster link times for large objects. + + This also has the side effect of allowing toolchains that don't support + linker relaxation (LLVM and the Linux module loader) to function + correctly. Toolchains that don't support linker relaxation should + default to "-mno-relax" and error when presented with any R_RISCV_ALIGN + relocation as those need to be handled for correctness. + + gcc/ChangeLog + + 2018-03-01 Palmer Dabbelt <palmer@sifive.com> + + * config/riscv/riscv.opt (mrelax): New option. + * config/riscv/riscv.c (riscv_file_start): Emit ".option + "norelax" when riscv_mrelax is disabled. + * doc/invoke.texi (RISC-V): Document "-mrelax" and "-mno-relax". + +diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c +index c38f6c394d54..3e81874de232 100644 +--- a/gcc/config/riscv/riscv.c ++++ b/gcc/config/riscv/riscv.c +@@ -3979,6 +3979,11 @@ riscv_file_start (void) + + /* Instruct GAS to generate position-[in]dependent code. */ + fprintf (asm_out_file, "\t.option %spic\n", (flag_pic ? "" : "no")); ++ ++ /* If the user specifies "-mno-relax" on the command line then disable linker ++ relaxation in the assembler. */ ++ if (! riscv_mrelax) ++ fprintf (asm_out_file, "\t.option norelax\n"); + } + + /* Implement TARGET_ASM_OUTPUT_MI_THUNK. Generate rtl rather than asm text +diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt +index 581a26bb5c1e..b37ac75d9bb4 100644 +--- a/gcc/config/riscv/riscv.opt ++++ b/gcc/config/riscv/riscv.opt +@@ -106,6 +106,11 @@ mexplicit-relocs + Target Report Mask(EXPLICIT_RELOCS) + Use %reloc() operators, rather than assembly macros, to load addresses. + ++mrelax ++Target Bool Var(riscv_mrelax) Init(1) ++Take advantage of linker relaxations to reduce the number of instructions ++required to materialize symbol addresses. ++ + Mask(64BIT) + + Mask(MUL) +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 8d366c626bae..deb48af2ecad 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1042,7 +1042,8 @@ See RS/6000 and PowerPC Options. + -msave-restore -mno-save-restore @gol + -mstrict-align -mno-strict-align @gol + -mcmodel=medlow -mcmodel=medany @gol +--mexplicit-relocs -mno-explicit-relocs @gol} ++-mexplicit-relocs -mno-explicit-relocs @gol ++-mrelax -mno-relax @gol} + + @emph{RL78 Options} + @gccoptlist{-msim -mmul=none -mmul=g13 -mmul=g14 -mallregs @gol +@@ -23102,6 +23103,12 @@ Use or do not use assembler relocation operators when dealing with symbolic + addresses. The alternative is to use assembler macros instead, which may + limit optimization. + ++@item -mrelax ++@itemx -mno-relax ++Take advantage of linker relaxations to reduce the number of instructions ++required to materialize symbol addresses. The default is to take advantage of ++linker relaxations. ++ + @end table + + @node RL78 Options + diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix new file mode 100644 index 000000000000..5609de15d4cb --- /dev/null +++ b/pkgs/development/compilers/gerbil/build.nix @@ -0,0 +1,88 @@ +{ stdenv, lib, makeStaticLibraries, + coreutils, rsync, bash, + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, + version, git-version, GAMBIT, SRC }: + +# TODO: distinct packages for gerbil-release and gerbil-devel +# TODO: make static compilation work + +stdenv.mkDerivation rec { + name = "gerbil-${version}"; + src = SRC; + + # Use makeStaticLibraries to enable creation of statically linked binaries + buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; + buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ GAMBIT coreutils rsync bash ] + ++ buildInputs_libraries ++ buildInputs_staticLibraries; + + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; + + postPatch = '' + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm + + patchShebangs . + + find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' + done + + cat > etc/gerbil_static_libraries.sh <<EOF +#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING! +#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING! +ZLIB=${makeStaticLibraries zlib}/lib/libz.a +# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING! +# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING! +# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING! +MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a +# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING! +LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a +EOF + ''; + + buildPhase = '' + runHook preBuild + + # Enable all optional libraries + substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' + + # gxprof testing uses $HOME/.cache/gerbil/gxc + export HOME=$$PWD + + # Build, replacing make by build.sh + ( cd src && sh build.sh ) + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -fa bin lib etc doc $out/ + + cat > $out/bin/gxi <<EOF +#!${bash}/bin/bash -e +export GERBIL_HOME=$out +case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac +if [[ \$# = 0 ]] ; then + exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ; +else + exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" +fi +EOF + runHook postInstall + ''; + + dontStrip = true; + + meta = { + description = "Gerbil Scheme"; + homepage = "https://github.com/vyzo/gerbil"; + license = stdenv.lib.licenses.lgpl2; + # NB regarding platforms: only actually tested on Linux, *should* work everywhere, + # but *might* need adaptation e.g. on macOS. Please report success and/or failure to fare. + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index c1a411120d03..eaab0e71d3bd 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,91 +1,11 @@ -{ stdenv, lib, fetchurl, fetchgit, makeStaticLibraries, gambit, - coreutils, rsync, bash, - openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql }: - -# TODO: distinct packages for gerbil-release and gerbil-devel -# TODO: make static compilation work - -stdenv.mkDerivation rec { - name = "gerbil-${version}"; +{ callPackage, fetchurl, gambit }: +callPackage ./build.nix { version = "0.12-RELEASE"; - src = fetchgit { - url = "https://github.com/vyzo/gerbil.git"; - rev = "5618892d7939e1cb4ef5247912e0bc1ec99f6b52"; - sha256 = "0b2valahf5k81r4sp6y12d44fb286p92s7k6dphij0kmvg0dp818"; - }; - - # Use makeStaticLibraries to enable creation of statically linked binaries - buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; - buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - - buildInputs = [ gambit coreutils rsync bash ] - ++ buildInputs_libraries ++ buildInputs_staticLibraries; - - NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; - - postPatch = '' - echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm - - patchShebangs . - - find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do - substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - done - - cat > etc/gerbil_static_libraries.sh <<EOF -#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING! -#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING! -ZLIB=${makeStaticLibraries zlib}/lib/libz.a -# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING! -# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING! -# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING! -MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a -# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING! -LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a -EOF - ''; - - buildPhase = '' - runHook preBuild - - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' - - # gxprof testing uses $HOME/.cache/gerbil/gxc - export HOME=$$PWD - - # Build, replacing make by build.sh - ( cd src && sh build.sh ) - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -fa bin lib etc doc $out/ - - cat > $out/bin/gxi <<EOF -#!${bash}/bin/bash -e -export GERBIL_HOME=$out -case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac -if [[ \$# = 0 ]] ; then - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ; -else - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" -fi -EOF - runHook postInstall - ''; - - dontStrip = true; - - meta = { - description = "Gerbil Scheme"; - homepage = "https://github.com/vyzo/gerbil"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fare ]; + git-version = "0.12"; + GAMBIT = gambit; + SRC = fetchurl { + url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz"; + sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq"; }; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix new file mode 100644 index 000000000000..ec36f42d86e6 --- /dev/null +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchgit, gambit-unstable }: + +callPackage ./build.nix { + version = "unstable-2018-04-03"; + git-version = "0.13-DEV-357-ge61318dc"; + GAMBIT = gambit-unstable; + SRC = fetchgit { + url = "https://github.com/vyzo/gerbil.git"; + rev = "e61318dcaa3a9c843e2cf259e67851f240e4beda"; + sha256 = "1xd7yxiramifdxgp6b3s24z6nkkmy5h4a6pkchvy4w358qv1vqin"; + }; +} diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 1c3f260da1c1..6520daa4d42c 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy, hscolour , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx +, runCommand , libffi, libiconv ? null, ncurses @@ -89,6 +90,7 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index dd0e5e4b0572..df23f660147a 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy , autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 +, runCommand , libffi, libiconv ? null, ncurses @@ -85,7 +86,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - patches = stdenv.lib.optional deterministicProfiling + patches = [ + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) + ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix new file mode 100644 index 000000000000..e381c411925b --- /dev/null +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -0,0 +1,193 @@ +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform + +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? false, gmp ? null, m4 + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? true + +, version ? "8.4.2" +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + '' + stdenv.lib.optionalString enableIntegerSimple '' + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + ''; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation rec { + inherit version; + inherit (src) rev; + name = "${targetPrefix}ghc-${version}"; + + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + rev = "6d7eecff7948ad77854f834f55b4d4f942276ad3"; + sha256 = "0aqy5x0b6qxhyvxw1q9pssf1xvhbyviglqkjrx4gvhbr3nax3wxp"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + echo ${version} >VERSION + echo ${src.rev} >GIT_COMMIT_ID + ./boot + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't + # treat that as a unary `{x,y,z,..}` repetition. + postInstall = '' + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.4.2"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix new file mode 100644 index 000000000000..bc803b74617f --- /dev/null +++ b/pkgs/development/compilers/ghc/abi-depends-determinism.nix @@ -0,0 +1,12 @@ +# https://phabricator.haskell.org/D4159 to fix non-determinism in +# cached abi-depends fields in package databases, modified to only +# contain hunks that exist in distribution tarballs. +{ fetchpatch, runCommand }: let + base = fetchpatch rec { # Non-determinism in cached abi-depends fields + # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D4159.diff"; + sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; + }; +in runCommand base.name {} + "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 3aac2d70e137..07662d32d258 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -189,7 +189,7 @@ in mkDerivation (rec { description = "A Haskell to JavaScript compiler that uses the GHC API"; license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ]; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio elvishjerricco ]; hydraPlatforms = if broken then [] else ghc.meta.platforms; inherit broken; }) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index b5a7a7f7cfc2..7f3cc9440015 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -2,5 +2,4 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs cabal-install; - broken = true; # https://hydra.nixos.org/build/70552553 } diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 151f42a7aa7b..ca1e2f54df93 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,21 +1,35 @@ -{ stdenv, fetchFromGitHub, cmake, bison }: +{ stdenv, fetchFromGitHub, cmake, bison, spirv-tools, jq }: stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2017-08-31"; + version = "2018-02-05"; # `vulkan-loader` requires a specific version of `glslang` as specified in # `<vulkan-loader-repo>/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3a21c880500eac21cdf79bef5b80f970a55ac6af"; - sha256 = "1i15m17r0acmzjrkybris2rgw15il05a4w5h7vhhsiyngcvajcyn"; + rev = "2651ccaec8"; + sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq"; }; - buildInputs = [ cmake bison ]; + buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs; enableParallelBuilding = true; + patchPhase = '' + cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools + ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers + ''; + + preConfigure = '' + HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') + TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') + if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then + echo "ERROR: spirv-tools commits do not match expected versions"; + exit 1; + fi + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978d..7ba547552907 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -25,18 +25,17 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.10"; + version = "1.10.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l"; + sha256 = "1wqwy52ibb343a4v7b9q26xa6r5jk4khfxd90wbpcayws8cxly8m"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] - ++ optionals stdenv.isLinux [ procps ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c4..829309f94268 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,18 +25,17 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "15d9lfiy1cjfz6nqnig5884ykqckx58cynd1bva1xna7bwcwwp2r"; + sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] - ++ optionals stdenv.isLinux [ procps ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a420949711e0..afeef2b3637c 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -53,6 +53,24 @@ let dontStrip = true; + # While it might be a good idea to run the upstream test suite, let's at + # least make sure we can actually run the compiler. + doInstallCheck = true; + installCheckPhase = '' + # Get out of the source directory to make sure the stdlib from the + # sources doesn't interfere with the installed one. + mkdir installcheck + pushd installcheck > /dev/null + cat >> InstallCheck.hx <<EOF + class InstallCheck { + public static function main() trace("test"); + } + EOF + "$out/bin/haxe" -js installcheck.js -main InstallCheck + grep -q 'console\.log.*test' installcheck.js + popd > /dev/null + ''; + meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = https://haxe.org; @@ -75,7 +93,7 @@ in { version = "3.4.6"; sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if"; prePatch = '' - sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml + sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx ''; }; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 5e0970ea12f4..22f80ae559f7 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iasl-${version}"; - version = "20170303"; + version = "20180313"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1dc933rr11gv1nlaf5j8ih1chdakbjbjkn34jgbm330zppmck4y0"; + sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index fb03d98dbdc0..9390cbde6377 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.6.2"; + version = "1.7.1"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "004kwrngyxxlrlzby4vzxjr0xcyngcdc9dfgnvi61ffnjr006ryf"; + sha256 = "1b9z0i9b1dsc2qpfdzbn2fi4vi3idrhm7ig45g1ny40ymvxcwwn9"; }; nativeBuildInputs = [ pkgconfig bc perl ]; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 604474e01fe9..5ffb7b92b26a 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,13 +7,13 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b1036.1"; + version = "152b1136.20"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; + sha256 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b"; } else throw "unsupported system: ${stdenv.system}"; diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 36bbb7d817f7..6fad8e5259c5 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -172,10 +172,14 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for prog in "$out/bin/julia" "$out/bin/julia-debug"; do - wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi done ''; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a263703ffa5d..b5a3a8c6be2d 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; + #broken = stdenv.isi686; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index b6374908757c..62c1c2c96708 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.30"; + version = "1.2.31"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0wg08cncwfajxfx8860wdf5dr4h92j069qvdr90l5m01ff3nasad"; + sha256 = "09l0vjff9kkiprf5irgq1sb9cils8plbzbrf55ajj8m5fyxcd6fs"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index bdb74680b134..1fd839180c56 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage , bootstrapVersion ? false -, version ? "1.7.0" -, ldcSha256 ? "1g8qvmlzvsp030z2rw6lis4kclsd9mlmnbim5kas0k1yr9063m3w" +, version ? "1.8.0" +, ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4" }: let @@ -29,16 +29,12 @@ let sha256 = ldcSha256; }; - sourceRoot = "."; - postUnpack = '' - cd ldc-${version}-src/ - patchShebangs . # Remove cppa test for now because it doesn't work. - rm tests/d2/dmd-testsuite/runnable/cppa.d - rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp '' + stdenv.lib.optionalString (bootstrapVersion) '' @@ -55,12 +51,15 @@ let # #============================== #Test failed: expected rc == 0, exited with rc == 1 - rm tests/d2/dmd-testsuite/runnable/variadic.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/variadic.d '' + stdenv.lib.optionalString (!bootstrapVersion) '' # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org - rm -r tests/dynamiccompile + rm -r ldc-${version}-src/tests/dynamiccompile + + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall ''; ROOT_HOME_DIR = "$(echo ~root)"; @@ -190,8 +189,6 @@ let src = ldcBuild.src; - sourceRoot = "."; - postUnpack = ldcBuild.postUnpack; postPatch = ldcBuild.postPatch; @@ -212,7 +209,7 @@ let "-DLDC_WITH_LLD=OFF" # Xcode 9.0.1 fixes that bug according to ldc release notes "-DRT_ARCHIVE_WITH_LDC=OFF" - "-DD_COMPILER=${ldcBuild}/bin/ldmd2" + "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" ) ''; @@ -223,7 +220,7 @@ let buildCmd = if bootstrapVersion then "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" else - "make -j$NIX_BUILD_CORES DMD=${ldcBuild}/bin/ldc2 druntime-test-runner druntime-test-runner-debug phobos2-test-runner phobos2-test-runner-debug"; + "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; testCmd = if bootstrapVersion then "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" @@ -232,6 +229,7 @@ let buildPhase = '' ${buildCmd} + ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 ${testCmd} ''; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 27047e7d941c..0b29b04825a1 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -90,6 +90,6 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 00b2548d56e6..7dc134b4fcfd 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 7621bd56d47b..929d00491382 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 dontDisableStatic = true; - # In fact I think this line does not help at all to what I - # wanted to achieve: have mono to find libgdiplus automatically configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { configurePhase = '' patchShebangs ./ - ./autogen.sh --prefix $out + ./autogen.sh --prefix $out $configureFlags ''; # Attempt to fix this error when running "mcs --version": @@ -58,13 +56,13 @@ stdenv.mkDerivation rec { substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; - # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + # Fix mono DLLMap so it can find libX11 to run winforms apps + # libgdiplus is correctly handled by the --with-libgdiplus configure flag # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive # http://www.mono-project.com/Config_DllMap postBuild = '' find . -name 'config' -type f | xargs \ - sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ - -e 's#[^"]*libgdiplus[^"]*"#${libgdiplus}/lib/libgdiplus.so"#' \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" ''; # Without this, any Mono application attempting to open an SSL connection will throw with diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 4dce11f93b13..42a585ff51f0 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; src = fetchurl { - url = "http://nekovm.org/media/neko-${version}-src.tar.gz"; + url = "https://nekovm.org/media/neko-${version}-src.tar.gz"; sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g"; }; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 8382be7a2091..d3f654749b04 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { name = "opendylan-2013.2"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; + url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; } else if stdenv.system == "i686-linux" then fetchurl { - url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; + url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; } else throw "platform ${stdenv.system} not supported."; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 773ab9f473f1..95f4dc5b215f 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -2,18 +2,18 @@ {stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { - name = "opendylan-2013.2"; + name = "opendylan-2016.1pre"; src = fetchgit { url = https://github.com/dylan-lang/opendylan; - rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3"; - sha256 = "17jvhv0y63fj25ma05k70b7phcwgjyna5qkrirk48z3xapb8bknd"; + rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; + sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; fetchSubmodules = true; }; buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper - ] ; + ]; preConfigure = if stdenv.system == "i686-linux" then '' mkdir -p $TMPDIR/mps diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/10.nix index 7ac3931c93d7..9cc774727b71 100644 --- a/pkgs/development/compilers/openjdk/9.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -4,8 +4,7 @@ , libjpeg, giflib , setJavaClassPath , minimal ? false -#, enableInfinality ? true # font rendering patch -, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let @@ -16,53 +15,20 @@ let architecture = if stdenv.system == "i686-linux" then "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else - throw "openjdk requires i686-linux or x86_64 linux"; - - update = "9.0.4"; - build = "12"; - baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u"; + else "amd64"; + + update = "10"; + build = "46"; repover = "jdk-${update}+${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; - jdk9 = fetchurl { - url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "06hnrzkwxgrfq26il1mjyl6wgb7x3qym69pjbddhl9m29n2si3jh"; - }; - langtools = fetchurl { - url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "16xqnqn773p6ywcdjx801vbng2skjal7svydn0s7wf3ldqzx64mi"; - }; - hotspot = fetchurl { - url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0g5ddffl2qykrjf17ac9as60rd4sfyv7s2fpgjn86k4a69gkx93v"; - }; - corba = fetchurl { - url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "14585dzs2mfzgzrnbvc062pigngs35hajwpr22m6fzbm7580vnqk"; - }; - jdk = fetchurl { - url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "16595jdg3y9zy70q8i615a7d6w0zzbydfxylvaq42wrsc7jw733h"; - }; - jaxws = fetchurl { - url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1m1aspc1hq74w0bkasrfvp8ygs6psbc1l61vfw9244j2vgfahjgn"; - }; - jaxp = fetchurl { - url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "06ns2giw366vjivb6d46gqwfvfzkaddrgd1x6y8w37ywygp50lxm"; - }; - nashorn = fetchurl { - url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0z6mlzvz1hh1yzli69qjlrcwqdjnivbjbqqrqi4hhpls6z0a2ch7"; - }; - openjdk9 = stdenv.mkDerivation { + + openjdk10 = stdenv.mkDerivation { name = "openjdk-${update}-b${build}"; - srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ]; - sourceRoot = "."; + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz"; + sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg"; + }; outputs = [ "out" "jre" ]; @@ -72,28 +38,15 @@ let libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libXi libXinerama libXcursor lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ - gtk2 gnome_vfs GConf glib + gtk3 gnome_vfs GConf glib ]; - #move the seven other source dirs under the main jdk8u directory, - #with version suffixes removed, as the remainder of the build will expect - prePatch = '' - mainDir=$(find . -maxdepth 1 -name jdk9\*); - find . -maxdepth 1 -name \*jdk\* -not -name jdk9\* | awk -F- '{print $1}' | while read p; do - mv $p-* $mainDir/$p - done - cd $mainDir - ''; - patches = [ - ./fix-java-home-jdk9.patch - ./read-truststore-from-env-jdk9.patch - ./currency-date-range-jdk8.patch - #] ++ lib.optionals (!minimal && enableInfinality) [ - # ./004_add-fontconfig.patch - # ./005_enable-infinality.patch + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch ] ++ lib.optionals (!minimal && enableGnome2) [ - ./swing-use-gtk-jdk9.patch + ./swing-use-gtk-jdk10.patch ]; preConfigure = '' @@ -127,7 +80,7 @@ let NIX_LDFLAGS= lib.optionals (!minimal) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!minimal && enableGnome2) [ - "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; buildFlags = [ "all" ]; @@ -160,18 +113,12 @@ let rm -rf $out/lib/openjdk/demo ${lib.optionalString minimal '' for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do - rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so + rm ''${d}/{libjsound,libjsoundalsa,libfontmanager}.so done ''} lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - # Make sure cmm/*.pf are not symlinks: - # https://youtrack.jetbrains.com/issue/IDEA-147272 - # in 9, it seems no *.pf files end up in $out ... ? - # rm -rf $out/lib/openjdk/jre/lib/cmm - # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm - # Set PaX markings exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') echo "to mark: *$exes*" @@ -188,13 +135,6 @@ let fi done - # Generate certificates. - ( - cd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - ) - ln -s $out/lib/openjdk/bin $out/bin ln -s $jre/lib/openjdk/jre/bin $jre/bin ln -s $jre/lib/openjdk/jre $out/jre @@ -251,12 +191,12 @@ let license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + platforms = ["i686-linux" "x86_64-linux"]; }; passthru = { inherit architecture; - home = "${openjdk9}/lib/openjdk"; + home = "${openjdk10}/lib/openjdk"; }; }; -in openjdk9 +in openjdk10 diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix deleted file mode 100644 index 13f8bcfdb1de..000000000000 --- a/pkgs/development/compilers/openjdk/7.nix +++ /dev/null @@ -1,244 +0,0 @@ -{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype -, which, bootjdk, nettools, xorg, file, cups -, fontconfig, cpio, cacert, perl, setJavaClassPath -, minimal ? false -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else - throw "openjdk requires i686-linux or x86_64 linux"; - - update = "111"; - - build = "01"; - - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - paxflags = if stdenv.isi686 then "msp" else "m"; - - baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u"; - repover = "jdk7u${update}-b${build}"; - jdk7 = fetchurl { - url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0wgb7hr2gipx1jg28fnsjh7xa744sh1mgr6z3xivmnsfy3dm91gi"; - }; - langtools = fetchurl { - url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0x1xs923h6sma02cbp1whg735x8vcndh5k01b7rkf714g6rxwa0y"; - }; - hotspot = fetchurl { - url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "187apnsvnd4cfa7ss5g59dbh7x5ah8f1lwa2wvjfv055h2cmphpn"; - }; - corba = fetchurl { - url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0vmxf5sgjcmkm7i1scanaa2x75a1byj8b36vcajlr6j7qmdx6r8c"; - }; - jdk = fetchurl { - url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1f8f2dgrjhx8aw1gzawrf8qggf5j0dygsla08bbsxhx5mc5a6cka"; - }; - jaxws = fetchurl { - url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "03982ajxm0hzany1jg009ym84vryx7a8qfi6wcgjxyxvk8vnz37c"; - }; - jaxp = fetchurl { - url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "0578h04y1ha60yjplsa8lqdjds9s2lxzgs9ybm9rs1rqzxmm0xmy"; - }; - openjdk = stdenv.mkDerivation rec { - name = "openjdk-7u${update}b${build}"; - - srcs = [ jdk7 langtools hotspot corba jdk jaxws jaxp ]; - sourceRoot = "."; - - outputs = [ "out" "jre" ]; - - buildInputs = - [ unzip procps ant which zip cpio nettools alsaLib - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst - xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - fontconfig perl file bootjdk - ]; - - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - "-Wno-error=format-overflow" # newly detected by gcc7 - ]; - - NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama"; - - postUnpack = '' - ls | grep jdk | grep -v '^jdk7u' | awk -F- '{print $1}' | while read p; do - mv $p-* $(ls | grep '^jdk7u')/$p - done - cd jdk7u-* - - sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ - -e "s@/bin/ls@${coreutils}/bin/ls@" \ - hotspot/make/linux/makefiles/sa.make - - sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ - {jdk,corba}/make/common/shared/Defs-utils.gmk - - tar xf ${cups.src} - cupsDir=$(echo $(pwd)/cups-*) - makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) - ''; - - patches = [ - ./cppflags-include-fix.patch - ./fix-java-home.patch - ./paxctl.patch - ./read-truststore-from-env.patch - ./currency-date-range.patch - ]; - - NIX_NO_SELF_RPATH = true; - - makeFlags = [ - "SORT=${coreutils}/bin/sort" - "ALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" - "FREETYPE_HEADERS_PATH=${freetype.dev}/include" - "FREETYPE_LIB_PATH=${freetype.out}/lib" - "MILESTONE=${update}" - "BUILD_NUMBER=b${build}" - "USRBIN_PATH=" - "COMPILER_PATH=" - "DEVTOOLS_PATH=" - "UNIXCOMMAND_PATH=" - "BOOTDIR=${bootjdk.home}" - "STATIC_CXX=false" - "UNLIMITED_CRYPTO=1" - "FULL_DEBUG_SYMBOLS=0" - ] ++ stdenv.lib.optional minimal "BUILD_HEADLESS=1"; - - configurePhase = "true"; - - preBuild = '' - # We also need to PaX-mark in the middle of the build - substituteInPlace hotspot/make/linux/makefiles/launcher.make \ - --replace XXX_PAXFLAGS_XXX ${paxflags} - substituteInPlace jdk/make/common/Program.gmk \ - --replace XXX_PAXFLAGS_XXX ${paxflags} - ''; - - installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk - - cp -av build/*/j2sdk-image/* $out/lib/openjdk - - # Move some stuff to top-level. - mv $out/lib/openjdk/include $out/include - mv $out/lib/openjdk/man $out/share/man - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove some broken manpages. - rm -rf $out/share/man/ja* - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample - - # Move the JRE to a separate output. - mv $out/lib/openjdk/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - - rm -rf $out/lib/openjdk/jre/bin - ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin - - # Set PaX markings - exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - echo "to mark: *$exes*" - for file in $exes; do - echo "marking *$file*" - paxmark ${paxflags} "$file" - done - - # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done - - # Generate certificates. - pushd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - popd - - ln -s $out/lib/openjdk/bin $out/bin - ln -s $jre/lib/openjdk/jre/bin $jre/bin - ''; # */ - - # FIXME: this is unnecessary once the multiple-outputs branch is merged. - preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedBuildInputs+=" $jre" - - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $outputs; do - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - - # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do - OUTPUTDIR="$(eval echo \$$output)" - BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)" - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done - ''; - - meta = { - homepage = http://openjdk.java.net/; - license = stdenv.lib.licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; - - passthru = { - inherit architecture; - home = "${openjdk}/lib/openjdk"; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 24cf1b8a0c93..705898a74f37 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -93,7 +93,7 @@ let ./004_add-fontconfig.patch ./005_enable-infinality.patch ] ++ lib.optionals (!minimal && enableGnome2) [ - ./swing-use-gtk.patch + ./swing-use-gtk-jdk8.patch ]; preConfigure = '' diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 668ca552adf1..3c29df7ec78e 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,5 +1,5 @@ { stdenv -, runCommand, fetchurl, file +, runCommand, fetchurl, file, zlib , version }: @@ -7,30 +7,19 @@ assert stdenv.hostPlatform.libc == "glibc"; let - # !!! These should be on nixos.org + fetchboot = version: arch: sha256: fetchurl { + name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz"; + url = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz"; + inherit sha256; + }; + src = if stdenv.hostPlatform.system == "x86_64-linux" then - (if version == "8" then - fetchurl { - url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1"; - sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"; - } - else if version == "7" then - fetchurl { - url = "https://www.dropbox.com/s/rssfbeommrfbsjf/openjdk7-bootstrap-x86_64-linux.tar.xz?dl=1"; - sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra"; - } + (if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2" + else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks" else throw "No bootstrap for version") else if stdenv.hostPlatform.system == "i686-linux" then - (if version == "8" then - fetchurl { - url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1"; - sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"; - } - else if version == "7" then - fetchurl { - url = "https://www.dropbox.com/s/6xe64td7eg2wurs/openjdk7-bootstrap-i686-linux.tar.xz?dl=1"; - sha256 = "0xwqjk1zx8akziw8q9sbjc1rs8s7c0w6mw67jdmmi26cwwp8ijnx"; - } + (if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7" + else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9" else throw "No bootstrap for version") else throw "No bootstrap for system"; @@ -45,7 +34,7 @@ let find "$out" -type f -print0 | while IFS= read -r -d "" elf; do isELF "$elf" || continue patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true - patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" "$elf" || true + patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true done # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: diff --git a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch deleted file mode 100644 index 8931c122538f..000000000000 --- a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk ---- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400 -+++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500 -@@ -234,12 +234,6 @@ - endif # !HEADLESS - endif # PLATFORM - --ifeq ($(PLATFORM), linux) -- # Checking for the X11/extensions headers at the additional location -- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ -- $(wildcard /usr/include/X11/extensions)) --endif -- - ifeq ($(PLATFORM), macosx)) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/openjdk/currency-date-range.patch b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch index b1c461591d1e..e058eff07466 100644 --- a/pkgs/development/compilers/openjdk/currency-date-range.patch +++ b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch @@ -1,6 +1,5 @@ -diff -Naur openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java ---- openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-07-17 05:42:14.000000000 -0430 -+++ openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-12-30 10:15:50.327905933 -0430 +--- ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java ++++ ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java @@ -281,8 +281,8 @@ checkCurrencyCode(newCurrency); String timeString = currencyInfo.substring(4, length - 4); diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index cc7c5fd371d2..cc7c5fd371d2 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 6ecc785be3b9..6ecc785be3b9 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch index f9755d58e48f..c037fde29722 100644 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch +++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch @@ -1,14 +1,14 @@ ---- a/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400 -+++ b/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400 -@@ -2318,10 +2318,7 @@ +--- a/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400 ++++ b/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400 +@@ -2270,8 +2270,5 @@ assert(ret, "cannot locate libjvm"); char *rp = NULL; if (ret && dli_fname[0] != '\0') { -- rp = realpath(dli_fname, buf); +- rp = os::Posix::realpath(dli_fname, buf, buflen); - } - if (rp == NULL) { - return; + snprintf(buf, buflen, "%s", dli_fname); } - + if (Arguments::sun_java_launcher_is_altjvm()) { diff --git a/pkgs/development/compilers/openjdk/fix-java-home.patch b/pkgs/development/compilers/openjdk/fix-java-home.patch deleted file mode 100644 index 5def344f1717..000000000000 --- a/pkgs/development/compilers/openjdk/fix-java-home.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100 -@@ -2358,12 +2358,10 @@ - CAST_FROM_FN_PTR(address, os::jvm_path), - dli_fname, sizeof(dli_fname), NULL); - assert(ret, "cannot locate libjvm"); - char *rp = NULL; - if (ret && dli_fname[0] != '\0') { -- rp = realpath(dli_fname, buf); -+ snprintf(buf, buflen, "%s", dli_fname); - } -- if (rp == NULL) -- return; - - if (Arguments::created_by_gamma_launcher()) { - // Support for the gamma launcher. Typical value for buf is diff --git a/pkgs/development/compilers/openjdk/paxctl.patch b/pkgs/development/compilers/openjdk/paxctl.patch deleted file mode 100644 index 12528a601cc8..000000000000 --- a/pkgs/development/compilers/openjdk/paxctl.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/hotspot/make/linux/makefiles/launcher.make b/hotspot/make/linux/makefiles/launcher.make -index 34bbcd6..41b9332 100644 ---- a/hotspot/make/linux/makefiles/launcher.make -+++ b/hotspot/make/linux/makefiles/launcher.make -@@ -83,6 +83,8 @@ $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) - $(QUIETLY) echo Linking launcher... - $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) - $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER) -+ paxctl -c $(LAUNCHER) -+ paxctl -zex -XXX_PAXFLAGS_XXX $(LAUNCHER) - $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) - - $(LAUNCHER): $(LAUNCHER_SCRIPT) -diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk -index 091800d..1de8cb4 100644 ---- a/jdk/make/common/Program.gmk -+++ b/jdk/make/common/Program.gmk -@@ -60,6 +60,10 @@ ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME) - program_default_rule: all - - program: $(ACTUAL_PROGRAM) -+ if [[ "$(PROGRAM)" = "java" ]]; then \ -+ paxctl -c $(ACTUAL_PROGRAM); \ -+ paxctl -zex -XXX_PAXFLAGS_XXX $(ACTUAL_PROGRAM); \ -+ fi - - # Work-around for missing processor specific mapfiles - ifndef CROSS_COMPILE_ARCH diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch index cb8d59ff8063..b5abc1d794db 100644 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch @@ -1,5 +1,5 @@ ---- a/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 -+++ b/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java.new 2017-07-05 20:45:57.491295030 -0400 +--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 ++++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 @@ -71,6 +71,7 @@ * * The preference of the default trusted KeyStore is: diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch deleted file mode 100644 index 8fb0f409d0ab..000000000000 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 -+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 -@@ -158,6 +158,7 @@ - /* - * Try: - * javax.net.ssl.trustStore (if this variable exists, stop) -+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE - * jssecacerts - * cacerts - * -@@ -165,6 +166,9 @@ - */ - - storeFileName = props.get("trustStore"); -+ if (storeFileName == null) { -+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); -+ } - if (!"NONE".equals(storeFileName)) { - if (storeFileName != null) { - storeFile = new File(storeFileName); diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch index 07d95ba71b8a..b9258c500db4 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch +++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch @@ -1,6 +1,5 @@ -diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java ---- a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300 -+++ b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300 +--- a/src/java.desktop/share/classes/javax/swing/UIManager.java ++++ b/src/java.desktop/share/classes/javax/swing/UIManager.java @@ -607,11 +607,9 @@ if (osType == OSInfo.OSType.WINDOWS) { return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; @@ -23,4 +22,3 @@ diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/cla + lafName = getSystemLookAndFeelClassName(); } lafName = swingProps.getProperty(defaultLAFKey, lafName); - diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch index 9538aade6726..9538aade6726 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk.patch +++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index 1d06f122b235..642c17dc6d3f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -29,7 +29,7 @@ assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let - version = "10"; + version = "10.0.1"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -52,19 +52,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; - sha256 = "0338m0x5lka0xjsbcll70r1i308bjw3m42cm9dx9zmfk70kplj5c"; + sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre10-downloads-4417026.html"; - sha256 = "1clawcahkla1h9pxnqfqzcgv51aqgq78v1ws5jygbk6fbbi7l54w"; + sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; - sha256 = "0kiyg33fv29ad0nyl35r7y0bhyxivb2hxlds44m9l0259s55nwhw"; + sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; } else abort "unknown package Type ${packageType}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 5bafa70af9fc..bdd367ef3523 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "161"; + patchVersion = "171"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "1p6p93msn3bsg9775rq171kd4160w4w8z57p0qpjdjycfix62sfg"; - sha256.x86_64-linux = "07h2wah80qr78y0f821z12lbdmsv90xbckdn3glnj2riwfh5dg3d"; - sha256.armv7l-linux = "0mngw2lnhx3hzgp444advybhjn5hjk3mi14y72km4kp03gh82a7x"; - sha256.aarch64-linux = "18l5fny7yxhpj5c935rnlq4pvwadyr5zkid6yh9x87frl401shy7"; + sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; + sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; + sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; + sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 78d5a6f2c40c..901eea0f8f15 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "162"; + patchVersion = "172"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "097vlvvj1vr7815rgarf5x97lagi4q0kai0x4lvd4y3wrzdqikzf"; - sha256.x86_64-linux = "0mq2d0lj53gzn4qqdjdgbwl0h857k2rnsnr2hkmvihnrgza85v38"; - sha256.armv7l-linux = "0xzsgdmpgs1n1g70hgly0mpxflhjrmq3vxwx8gl0kmqdiv4hqwjp"; - sha256.aarch64-linux = "19ykcsmvkf7sdq2lqwvyi60nhb8v7f88dqjycimrsar9y4r7skf8"; + sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; + sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; + sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; + sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix deleted file mode 100644 index 87f2e49b4431..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ /dev/null @@ -1,158 +0,0 @@ -{ swingSupport ? true -, stdenv -, requireFile -, makeWrapper -, unzip -, file -, xorg ? null -, packageType ? "JDK" # JDK, JRE, or ServerJRE -, pluginSupport ? true -, glib -, libxml2 -, ffmpeg_2 -, libxslt -, libGL -, freetype -, fontconfig -, gtk2 -, pango -, cairo -, alsaLib -, atk -, gdk_pixbuf -, zlib -, elfutils -, setJavaClassPath -}: - -assert stdenv.system == "x86_64-linux"; -assert swingSupport -> xorg != null; - -let - version = "9.0.4"; - - downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; - - rSubPaths = [ - "lib/jli" - "lib/server" - "lib" - ]; - -in - -let result = stdenv.mkDerivation rec { - name = if packageType == "JDK" then "oraclejdk-${version}" - else if packageType == "JRE" then "oraclejre-${version}" - else if packageType == "ServerJRE" then "oracleserverjre-${version}" - else abort "unknown package Type ${packageType}"; - - src = - if packageType == "JDK" then - requireFile { - name = "jdk-${version}_linux-x64_bin.tar.gz"; - url = "${downloadUrlBase}/jdk9-downloads-3848520.html"; - sha256 = "18nsjn64wkfmyb09wf2k7lvhazf83cs3dyichr038vl1gs3ymi4h"; - } - else if packageType == "JRE" then - requireFile { - name = "jre-${version}_linux-x64_bin.tar.gz"; - url = "${downloadUrlBase}/jre9-downloads-3848532.html"; - sha256 = "01fp079mr04nniyf06w8vd47qxr6rly1lbh8dqkddb8fp9h6a79k"; - } - else if packageType == "ServerJRE" then - requireFile { - name = "serverjre-${version}_linux-x64_bin.tar.gz"; - url = "${downloadUrlBase}/server-jre9-downloads-3848530.html"; - sha256 = "1jlpa4mn306hx0p9jcw3i6cpdvnng29dwjsymgcan56810q6p6yj"; - } - else abort "unknown package Type ${packageType}"; - - nativeBuildInputs = [ file ]; - - buildInputs = [ makeWrapper ]; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - # Set PaX markings - exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} - done - - mv $sourceRoot $out - - shopt -s extglob - for file in $out/* - do - if test -f $file ; then - rm $file - fi - done - - if test -z "$pluginSupport"; then - rm -f $out/bin/javaws - fi - - mkdir $out/lib/plugins - ln -s $out/lib/libnpjp2.so $out/lib/plugins - - # for backward compatibility - ln -s $out $out/jre - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <<EOF >> $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - - # Oracle Java Mission Control needs to know where libgtk-x11 and related is - if test -x $out/bin/jmc; then - wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "$rpath" - fi - ''; - - /** - * libXt is only needed on amd64 - */ - libraries = - [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ - (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); - - rpath = stdenv.lib.strings.makeLibraryPath libraries; - - passthru.mozillaPlugin = "/lib/plugins"; - - passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - - passthru.home = result; - - # for backward compatibility - passthru.architecture = ""; - - meta = with stdenv.lib; { - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms - }; - -}; in result diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 390d37dd245f..de5b85055273 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "polyml-${version}"; - version = "5.7"; + version = "5.7.1"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "polyml"; repo = "polyml"; rev = "v${version}"; - sha256 = "10nsljmcl0zjbcc7ifc991ypwfwq5gh4rcp5rg4nnb706c6bs16y"; + sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 451722aea060..d94179e16fe9 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.2.5"; + version = "0.3.2"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "15g0l8g8l6m5x4f73w68r9iav091x12b3wjxh0rx3ggnj093g6j1"; + sha256 = "1zpzcyh82xl0grvgcj8b7yzh053i9z94kbym5qrv413pcx7w50cm"; }; isLibrary = false; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 9b488bab5b3b..44d96bc4ad1d 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.23.0"; + version = "1.24.1"; - # fetch hashes by running `print-hashes.sh 1.23.0` + # fetch hashes by running `print-hashes.sh 1.24.1` hashes = { - i686-unknown-linux-gnu = "dc5bd0ef47e1036c8ca64676d8967102cb86ce4bf50b90a9845951c3e940423f"; - x86_64-unknown-linux-gnu = "9a34b23a82d7f3c91637e10ceefb424539dcfa327c2dcd292ff10c047b1fdc7e"; - armv7-unknown-linux-gnueabihf = "587027899267f1961520438c2c7f6775fe224160d43ddf07332b9b943a26b08e"; - aarch64-unknown-linux-gnu = "38379fbd976d2286cb73f21466db40a636a583b9f8a80af5eea73617c7912bc7"; - i686-apple-darwin = "4709eb1ad2fb871fdaee4b3449569cef366b0d170453cf17484a12286564f2ad"; - x86_64-apple-darwin = "9274e977322bb4b153f092255ac9bd85041142c73eaabf900cb2ef3d3abb2eba"; + i686-unknown-linux-gnu = "a483576bb2ab237aa1ef62b66c0814f934afd8129d7c9748cb9a75da4a678c98"; + x86_64-unknown-linux-gnu = "4567e7f6e5e0be96e9a5a7f5149b5452828ab6a386099caca7931544f45d5327"; + armv7-unknown-linux-gnueabihf = "1169ab005b771c4befcdab536347a90242cae544b6b76eccd0f76796b61a534c"; + aarch64-unknown-linux-gnu = "64bb25a9689b18ddadf025b90d9bdb150b809ebfb74432dc69cc2e46120adbb2"; + i686-apple-darwin = "c96f7579e2406220895da80a989daaa194751c141e112ebe95761f2ed4ecb662"; + x86_64-apple-darwin = "9d4aacdb5849977ea619d399903c9378163bd9c76ea11dac5ef6eca27849f501"; }; platform = diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index dd15580c11b8..f47c1f753ee1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,11 +6,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.24.0"; - cargoVersion = "0.24.0"; + version = "1.25.0"; + cargoVersion = "0.26.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "17v3jpyky8vkkgai5yd2zr8zl87qpgj6dx99gx27x1sf0kv7d0mv"; + sha256 = "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"; }; in rec { rustc = callPackage ./rustc.nix { @@ -20,11 +20,14 @@ in rec { configureFlags = [ "--release-channel=stable" ]; + # Upstream is not running tests on aarch64: + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 + # So we do the same. + doCheck = !stdenv.isAarch64; + patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch - # https://github.com/rust-lang/rust/issues/45410 - ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; }; diff --git a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch b/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch deleted file mode 100644 index bafab0e9ef71..000000000000 --- a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/librustc_metadata/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs -index 1b42fa0..92256dc 100644 ---- a/src/librustc_metadata/dynamic_lib.rs -+++ b/src/librustc_metadata/dynamic_lib.rs -@@ -80,6 +80,7 @@ mod tests { - use std::mem; - - #[test] -+ #[ignore] - fn test_loading_cosine() { - if cfg!(windows) { - return diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 92b149865fa2..19c4a590e454 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,5 @@ { stdenv, targetPackages -, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps +, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps , llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version @@ -19,8 +19,6 @@ let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - procps = if stdenv.isDarwin then darwin.ps else args.procps; - llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); @@ -55,6 +53,7 @@ stdenv.mkDerivation { RUSTFLAGS = "-Ccodegen-units=10"; # We need rust to build rust. If we don't provide it, configure will try to download it. + # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] ++ [ "--enable-vendor" ] @@ -64,6 +63,13 @@ stdenv.mkDerivation { ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; + # The boostrap.py will generated a Makefile that then executes the build. + # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass + # to the bootstrap builder. + postConfigure = '' + substituteInPlace Makefile --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' + ''; + patches = patches ++ targetPatches; # the rust build system complains that nix alters the checksums @@ -102,8 +108,7 @@ stdenv.mkDerivation { # Useful debugging parameter # export VERBOSE=1 - '' - + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isDarwin '' # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* @@ -127,7 +132,7 @@ stdenv.mkDerivation { # ps is needed for one of the test cases nativeBuildInputs = - [ file python2 procps rustPlatform.rust.rustc git cmake + [ file python2 ps rustPlatform.rust.rustc git cmake which libffi ] # Only needed for the debuginfo tests diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 39b84ae6a365..0da3e9f0fd1d 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1k6v5b8qv7vyxvh8asx6phf2hbapx5pp5p5j47hgnq123fwnh4fa"; + sha256 = "0y46zgg3lamaqqhxbqmbwzvdakzvc9j07d0ci8f57pfl549v04a4"; }; patchPhase = '' diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index fc142a4026bd..abbfdd2abb72 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -37,7 +37,7 @@ }: let - v_major = "4.0.3"; + v_major = "4.1"; version = "${v_major}-RELEASE"; version_friendly = "${v_major}"; @@ -55,15 +55,15 @@ let # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 clang = fetch { repo = "swift-clang"; - sha256 = "0zm624iwiprk3c3nzqf4p1fd9zqic4yi3jv51cw3249ax4x6vy10"; + sha256 = "0j8bi6jv4m4hqiib02q5cvnxd9j6bwiri853x6px86vai3mdff0h"; }; llvm = fetch { repo = "swift-llvm"; - sha256 = "11vw6461c0cdvwm1wna1a5709fjj14hzp6br6jg94p4f6jp3yv4d"; + sha256 = "03558f5zbchqvdabi3x9ahyz4xkmj7w69gazivz372832lgr9zfh"; }; compilerrt = fetch { repo = "swift-compiler-rt"; - sha256 = "1hj4qaj4c9n2wzg2cvarbyl0n708zd1dlw4zkzq07fjxxqs36nfa"; + sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl"; }; cmark = fetch { repo = "swift-cmark"; @@ -71,32 +71,32 @@ let }; lldb = fetch { repo = "swift-lldb"; - sha256 = "0yk5qg85008vcn63vn2jpn5ls9pdhda222p2w1cfkrj27k5k8vqr"; + sha256 = "09x3d3bc6rn9g6jpi3fb120c4r2carsmqla4bq4scjrs0867jz9m"; }; llbuild = fetch { repo = "swift-llbuild"; - sha256 = "0jffw6z1s6ck1i05brw59x6vsg7zrxbz5n2wz72fj29rh3nppc7a"; + sha256 = "04y0ihfyam2n671vmpk9gy0gb9lb3ivh6mr19862p5kg5bmrcic1"; }; pm = fetch { repo = "swift-package-manager"; - sha256 = "0xj070b8fii7ijfsnyq4fxgv6569vdrg0yippi85h2p1l7s9aagh"; + sha256 = "08d87fc29qq7m92jaxkiczsa7b567pwbibiwwkzdrj6a0gr11qn3"; }; xctest = fetch { repo = "swift-corelibs-xctest"; - sha256 = "0l355wq8zfwrpv044xf4smjwbm0bmib360748n8cwls3vkr9l2yv"; + sha256 = "1alkgxx8jsr2jjv2kchnjaaddb1byjwim015m1z3qxh6lknqm0k5"; }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "0s7yc5gsbd96a4bs8c6q24dyfjm4xhcr2nzhl2ics8dmi60j15s4"; + sha256 = "06pbhb7wg4q5qgprhiyzbqy6hssga7xxjclhlh81gd6rvfd6bxvw"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; - sha256 = "0x8zzq3shhvmhq4sbhaaa0ddiv3nw347pz6ayym6jyzq7j9n15ia"; + sha256 = "198vskbajch8s168a649qz5an92i2mxmmmzcjlgxlzh38fgxri0n"; fetchSubmodules = true; }; swift = fetch { repo = "swift"; - sha256 = "0a1gq0k5701i418f0qi7kywv16q7vh4a4wp0f6fpyv4sjkq27msx"; + sha256 = "1flvr12bg8m4k44yq0xy9qrllv5rpxgxisjgbpakk5p3myfsx7ky"; }; }; @@ -132,19 +132,6 @@ let install_destdir=$SWIFT_INSTALL_DIR \ extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"''; - # from llvm/4/llvm.nix - sigaltstackPatch = fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - }; - - # https://bugs.swift.org/browse/SR-6409 - sigunusedPatch = fetchpatch { - name = "sigunused.patch"; - url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff"; - sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m"; - }; in stdenv.mkDerivation rec { name = "swift-${version_friendly}"; @@ -179,7 +166,7 @@ stdenv.mkDerivation rec { configurePhase = '' cd .. - + export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz mkdir build install @@ -236,20 +223,18 @@ stdenv.mkDerivation rec { '' + '' patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} - patch -p1 -d swift -i ${./patches/0003-build-presets-linux-disable-tests.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} - # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - patch -p1 -i ${./patches/remove_xlocale.patch} - # https://bugs.swift.org/browse/SR-4633 - patch -p1 -d swift -i ${./patches/icu59.patch} + + sed -i swift/utils/build-presets.ini \ + -e 's/^test-installable-package$/# \0/' \ + -e 's/^test$/# \0/' \ + -e 's/^validation-test$/# \0/' \ + -e 's/^long-test$/# \0/' # https://bugs.swift.org/browse/SR-5779 sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake - # https://bugs.swift.org/browse/SR-4838 - sed -i -e '30i#include <functional>' lldb/include/lldb/Utility/TaskPool.h - - substituteInPlace clang/lib/Driver/ToolChains.cpp \ + substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \ --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);' patch -p1 -d clang -i ${./purity.patch} @@ -258,19 +243,15 @@ stdenv.mkDerivation rec { sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt # This test fails on one of my machines, not sure why. - # Disabling for now. + # Disabling for now. rm llbuild/tests/Examples/buildsystem-capi.llbuild PREFIX=''${out/#\/} substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" substituteInPlace swiftpm/Utilities/bootstrap \ - --replace "usr" "$PREFIX" - '' + stdenv.lib.optionalString (stdenv ? glibc) '' - patch -p1 -d compiler-rt -i ${sigaltstackPatch} - patch -p1 -d compiler-rt -i ${./patches/sigaltstack.patch} - patch -p1 -d llbuild -i ${sigunusedPatch} - patch -p1 -i ${./patches/sigunused.patch} + --replace \"usr\" \"$PREFIX\" \ + --replace usr/lib "$PREFIX/lib" ''; doCheck = false; @@ -305,7 +286,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; # Swift doesn't support 32bit Linux, unknown on other platforms. - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; + badPlatforms = platforms.i686; }; } diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch deleted file mode 100644 index f647d9189dd2..000000000000 --- a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fcc7c216da6cd255f884b7aa39f361786e3afa6a Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 28 Mar 2017 15:02:18 -0500 -Subject: [PATCH 3/4] build-presets: (linux) disable tests. - ---- - utils/build-presets.ini | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/utils/build-presets.ini b/utils/build-presets.ini -index 1095cbaab7..1739e91dc2 100644 ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -700,7 +700,7 @@ build-swift-stdlib-unittest-extra - - # Executes the lit tests for the installable package that is created - # Assumes the swift-integration-tests repo is checked out --test-installable-package -+# test-installable-package - - # Path to the root of the installation filesystem. - install-destdir=%(install_destdir)s -@@ -713,9 +713,9 @@ mixin-preset=mixin_linux_installation - build-subdir=buildbot_linux - lldb - release --test --validation-test --long-test -+#test -+#validation-test -+#long-test - foundation - libdispatch - lit-args=-v --- -2.12.2 - diff --git a/pkgs/development/compilers/swift/patches/icu59.patch b/pkgs/development/compilers/swift/patches/icu59.patch deleted file mode 100644 index 26337814cafa..000000000000 --- a/pkgs/development/compilers/swift/patches/icu59.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- a/stdlib/public/stubs/UnicodeNormalization.cpp -+++ b/stdlib/public/stubs/UnicodeNormalization.cpp -@@ -86,11 +86,8 @@ ASCIICollation() { - for (unsigned char c = 0; c < 128; ++c) { - UErrorCode ErrorCode = U_ZERO_ERROR; - intptr_t NumCollationElts = 0; --#if defined(__CYGWIN__) || defined(_MSC_VER) - UChar Buffer[1]; --#else -- uint16_t Buffer[1]; --#endif -+ - Buffer[0] = c; - - UCollationElements *CollationIterator = -@@ -127,18 +124,9 @@ swift::_swift_stdlib_unicode_compare_utf16_utf16(const uint16_t *LeftString, - int32_t LeftLength, - const uint16_t *RightString, - int32_t RightLength) { --#if defined(__CYGWIN__) || defined(_MSC_VER) -- // ICU UChar type is platform dependent. In Cygwin, it is defined -- // as wchar_t which size is 2. It seems that the underlying binary -- // representation is same with swift utf16 representation. - return ucol_strcoll(GetRootCollator(), - reinterpret_cast<const UChar *>(LeftString), LeftLength, - reinterpret_cast<const UChar *>(RightString), RightLength); --#else -- return ucol_strcoll(GetRootCollator(), -- LeftString, LeftLength, -- RightString, RightLength); --#endif - } - - /// Compares the strings via the Unicode Collation Algorithm on the root locale. -@@ -156,12 +144,8 @@ swift::_swift_stdlib_unicode_compare_utf8_utf16(const unsigned char *LeftString, - UErrorCode ErrorCode = U_ZERO_ERROR; - - uiter_setUTF8(&LeftIterator, reinterpret_cast<const char *>(LeftString), LeftLength); --#if defined(__CYGWIN__) || defined(_MSC_VER) - uiter_setString(&RightIterator, reinterpret_cast<const UChar *>(RightString), - RightLength); --#else -- uiter_setString(&RightIterator, RightString, RightLength); --#endif - - uint32_t Diff = ucol_strcollIter(GetRootCollator(), - &LeftIterator, &RightIterator, &ErrorCode); -@@ -199,14 +183,10 @@ swift::_swift_stdlib_unicode_compare_utf8_utf8(const unsigned char *LeftString, - void *swift::_swift_stdlib_unicodeCollationIterator_create( - const __swift_uint16_t *Str, __swift_uint32_t Length) { - UErrorCode ErrorCode = U_ZERO_ERROR; --#if defined(__CYGWIN__) || defined(_MSC_VER) - UCollationElements *CollationIterator = ucol_openElements( - GetRootCollator(), reinterpret_cast<const UChar *>(Str), Length, - &ErrorCode); --#else -- UCollationElements *CollationIterator = ucol_openElements( -- GetRootCollator(), Str, Length, &ErrorCode); --#endif -+ - if (U_FAILURE(ErrorCode)) { - swift::crash("_swift_stdlib_unicodeCollationIterator_create: ucol_openElements() failed."); - } -@@ -244,17 +224,12 @@ swift::_swift_stdlib_unicode_strToUpper(uint16_t *Destination, - const uint16_t *Source, - int32_t SourceLength) { - UErrorCode ErrorCode = U_ZERO_ERROR; --#if defined(__CYGWIN__) || defined(_MSC_VER) - uint32_t OutputLength = u_strToUpper(reinterpret_cast<UChar *>(Destination), - DestinationCapacity, - reinterpret_cast<const UChar *>(Source), - SourceLength, - "", &ErrorCode); --#else -- uint32_t OutputLength = u_strToUpper(Destination, DestinationCapacity, -- Source, SourceLength, -- "", &ErrorCode); --#endif -+ - if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) { - swift::crash("u_strToUpper: Unexpected error uppercasing unicode string."); - } -@@ -271,17 +246,12 @@ swift::_swift_stdlib_unicode_strToLower(uint16_t *Destination, - const uint16_t *Source, - int32_t SourceLength) { - UErrorCode ErrorCode = U_ZERO_ERROR; --#if defined(__CYGWIN__) || defined(_MSC_VER) - uint32_t OutputLength = u_strToLower(reinterpret_cast<UChar *>(Destination), - DestinationCapacity, - reinterpret_cast<const UChar *>(Source), - SourceLength, - "", &ErrorCode); --#else -- uint32_t OutputLength = u_strToLower(Destination, DestinationCapacity, -- Source, SourceLength, -- "", &ErrorCode); --#endif -+ - if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) { - swift::crash("u_strToLower: Unexpected error lowercasing unicode string."); - } -@@ -300,9 +300,9 @@ - - swift::__swift_stdlib_UBreakIterator *swift::__swift_stdlib_ubrk_open( - swift::__swift_stdlib_UBreakIteratorType type, const char *locale, -- const UChar *text, int32_t textLength, __swift_stdlib_UErrorCode *status) { -+ const __swift_stdlib_UChar * text, __swift_int32_t textLength, __swift_stdlib_UErrorCode *status) { - return ptr_cast<swift::__swift_stdlib_UBreakIterator>( -- ubrk_open(static_cast<UBreakIteratorType>(type), locale, text, textLength, -+ ubrk_open(static_cast<UBreakIteratorType>(type), locale, reinterpret_cast<const UChar *>(text), textLength, - ptr_cast<UErrorCode>(status))); - } - diff --git a/pkgs/development/compilers/swift/patches/remove_xlocale.patch b/pkgs/development/compilers/swift/patches/remove_xlocale.patch deleted file mode 100644 index 8ef7e3916962..000000000000 --- a/pkgs/development/compilers/swift/patches/remove_xlocale.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/swift/stdlib/public/SDK/os/os_trace_blob.c -+++ b/swift/stdlib/public/SDK/os/os_trace_blob.c -@@ -14,7 +14,6 @@ - #include <dispatch/dispatch.h> - #include <os/base.h> - #include <os/log.h> --#include <xlocale.h> - #include "os_trace_blob.h" - - OS_NOINLINE - ---- a/swift/stdlib/public/stubs/Stubs.cpp -+++ b/swift/stdlib/public/stubs/Stubs.cpp -@@ -61,7 +61,6 @@ - #define strtof_l swift_strtof_l - #define strtold_l swift_strtold_l - #else --#include <xlocale.h> - #endif - #include <limits> - #include "llvm/ADT/StringExtras.h" - ---- a/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringDefaultEncoding.h -+++ b/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringDefaultEncoding.h -@@ -20,7 +20,6 @@ - #include <unistd.h> - #include <string.h> - #include <stdio.h> --#include <xlocale.h> - - CF_EXTERN_C_BEGIN - - ---- a/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringEncodings.c -+++ b/swift-corelibs-foundation/CoreFoundation/String.subproj/CFStringEncodings.c -@@ -24,7 +24,6 @@ - #include <unistd.h> - #include <string.h> - #include <stdio.h> --#include <xlocale.h> - #include <CoreFoundation/CFStringDefaultEncoding.h> - #endif - - ---- a/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h -+++ b/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h -@@ -95,7 +95,6 @@ - #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD - #if TARGET_OS_CYGWIN - #else --#include <xlocale.h> - #endif - #include <unistd.h> - #include <sys/time.h> diff --git a/pkgs/development/compilers/swift/patches/sigaltstack.patch b/pkgs/development/compilers/swift/patches/sigaltstack.patch deleted file mode 100644 index c529fa3777b3..000000000000 --- a/pkgs/development/compilers/swift/patches/sigaltstack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/esan/esan_sideline_linux.cpp -+++ b/lib/esan/esan_sideline_linux.cpp -@@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Arg) { - - // Set up a signal handler on an alternate stack for safety. - InternalScopedBuffer<char> StackMap(SigAltStackSize); -- struct sigaltstack SigAltStack; -+ stack_t SigAltStack; - SigAltStack.ss_sp = StackMap.data(); - SigAltStack.ss_size = SigAltStackSize; - SigAltStack.ss_flags = 0; diff --git a/pkgs/development/compilers/swift/patches/sigunused.patch b/pkgs/development/compilers/swift/patches/sigunused.patch deleted file mode 100644 index 2701d1a3ae25..000000000000 --- a/pkgs/development/compilers/swift/patches/sigunused.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/swiftpm/Sources/Basic/Process.swift -+++ b/swiftpm/Sources/Basic/Process.swift -@@ -258,7 +258,7 @@ public func launch() throws { - // modify, so we have to take care about the set we use. - var mostSignals = sigset_t() - sigemptyset(&mostSignals) -- for i in 1 ..< SIGUNUSED { -+ for i in 1 ..< SIGSYS { - if i == SIGKILL || i == SIGSTOP { - continue - } diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch index f5fb4c73af47..b30d0d0b5d5b 100644 --- a/pkgs/development/compilers/swift/purity.patch +++ b/pkgs/development/compilers/swift/purity.patch @@ -1,6 +1,17 @@ ---- a/lib/Driver/Tools.cpp 2016-08-25 15:48:05.187553443 +0200 -+++ b/lib/Driver/Tools.cpp 2016-08-25 15:48:47.534468882 +0200 -@@ -9420,13 +9420,6 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_static)) { if (Args.hasArg(options::OPT_rdynamic)) CmdArgs.push_back("-export-dynamic"); @@ -14,3 +25,6 @@ } CmdArgs.push_back("-o"); +-- +2.11.0 + diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 6a020e11a4be..f36bea42e2a8 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz -, glib, libiconv, libintlOrEmpty, libtool, expat +, glib, libiconv, libintl, libtool, expat }: let @@ -16,7 +16,7 @@ let nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; - buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; + buildInputs = [ glib libiconv libintl ] ++ extraBuildInputs; meta = with stdenv.lib; { description = "Compiler for GObject type system"; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 568c94718e7f..c20bffe26ed1 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -35,14 +35,18 @@ stdenv.mkDerivation rec { buildInputs = [ tcl readline libffi python3 bison flex ]; patchPhase = '' + substituteInPlace ../yosys-abc/Makefile \ + --replace 'CC := gcc' "" substituteInPlace ./Makefile \ + --replace 'CXX = clang' "" \ + --replace 'ABCMKARGS = CC="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' ''; preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc - make config-gcc + make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCREV := default' >> Makefile.conf makeFlags="PREFIX=$out $makeFlags" ''; @@ -61,6 +65,6 @@ stdenv.mkDerivation rec { homepage = http://www.clifford.at/yosys/; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index cffc683f9e7b..44d1f7bfe4a2 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: stdenv.mkDerivation rec { - version = "0.1.1"; + version = "0.2.0"; name = "zig-${version}"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig"; rev = "${version}"; - sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; }; - buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; cmakeFlags = [ "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; - homepage = http://ziglang.org/; + homepage = https://ziglang.org/; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 23ae8ba06bb5..fb1798ab819c 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -4,11 +4,11 @@ , swingSupport ? true }: let - version = "8.21.0.1"; - openjdk = "8.0.131"; + version = "8.28.0.1"; + openjdk = "8.0.163"; - sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; - sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; + sha256_linux = "1z8s3a948nvv92wybnhkyr27ipibcy45k0zv5h5gp37ynd91df45"; + sha256_darwin = "0i0prjijsgg0yyycplpp9rlfl428126rqz7bb31pchrhi6jhk699"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 040af83ece20..908aa29e178f 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -4,11 +4,11 @@ , swingSupport ? true }: let - version = "9.0.0.15"; - openjdk = "9.0.0"; + version = "10.1+11"; + openjdk = "10"; - sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi"; - sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b"; + sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8"; + sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 45786c5a9550..474ce05c1d47 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, coq }: -let param = +let params = { "8.6" = { rev = "v8.6.0"; @@ -14,7 +14,8 @@ let param = rev = "V8.8+beta1"; sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; }; - }."${coq.coq-version}" + }; + param = params."${coq.coq-version}" ; in stdenv.mkDerivation rec { @@ -37,6 +38,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.hasAttr v params; }; } diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix deleted file mode 100644 index b6bee8aead02..000000000000 --- a/pkgs/development/eclipse/ecj/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, unzip, ant, jdk7, makeWrapper }: - -let - version = "3.7.2"; - date = "201202080800"; -in - -stdenv.mkDerivation rec { - name = "ecj-${version}"; - - src = fetchurl { - url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar"; - sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm"; - }; - - buildInputs = [ unzip ant jdk7 makeWrapper ]; - - unpackPhase = '' - mkdir "${name}" - cd "${name}" - unzip "$src" - ''; - - # Use whatever compiler Ant knows. - buildPhase = "ant build"; - - installPhase = '' - mkdir -pv $out/share/java - cp -v *.jar $out/share/java - - mkdir -pv $out/bin - makeWrapper ${jdk7.jre}/bin/java $out/bin/ecj \ - --add-flags "-cp $out/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main" - - # Add a setup hook that causes Ant to use the ECJ. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - export NIX_ANT_ARGS="-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter \$NIX_ANT_ARGS" - EOF - ''; - - meta = { - description = "The Eclipse Compiler for Java (ECJ)"; - - longDescription = '' - ECJ is an incremental Java compiler. Implemented as an Eclipse - builder, it is based on technology evolved from VisualAge for Java - compiler. In particular, it allows users to run and debug code which - still contains unresolved errors. - ''; - - homepage = http://www.eclipse.org/jdt/core/index.php; - - # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) - license = stdenv.lib.licenses.epl10; - - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; -} diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index a6d83fc770c7..77c2687e2911 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -98,7 +98,7 @@ go.stdenv.mkDerivation ( rmdir goPath '') + (lib.optionalString (extraSrcPaths != []) '' - ${rsync}/bin/rsync -a ${lib.concatMapStrings (p: "${p}/src") extraSrcPaths} go + ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go '') + '' export GOPATH=$NIX_BUILD_TOP/go:$GOPATH diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 5f82a93c513a..cfb56790221e 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -23,6 +23,6 @@ in stdenv.mkDerivation { homepage = https://github.com/wingo/fibers; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d85a26227ee..a3efc1e373b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -32,8 +32,10 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # hackage-security's test suite does not compile with Cabal 2.x. - # See https://github.com/haskell/hackage-security/issues/188. + # Use the latest version of the Cabal library. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + + # The test suite depends on old versions of tasty and QuickCheck. hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. @@ -80,7 +82,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0qi5wpsvw6g8xrri1pr0401370acs5sg75myr0h5mjad6pvqc667"; + sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); @@ -112,7 +114,13 @@ self: super: { # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo # see: https://github.com/psibi/shell-conduit/issues/12 doCheck = !pkgs.stdenv.isDarwin; - })); + })).overrideScope (self: super: { + # shell-conduit doesn't build with conduit 1.3 + # see https://github.com/psibi/shell-conduit/issues/15 + conduit = self.conduit_1_2_13_1; + conduit-extra = self.conduit-extra_1_2_3_2; + resourcet = self.resourcet_1_1_11; + }); # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; @@ -238,6 +246,8 @@ self: super: { # base bound digit = doJailbreak super.digit; + # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat + hnix = doJailbreak super.hnix; # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -498,7 +508,7 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; - # https://github.com/haskell-hvr/lzma/issues/8 + # https://github.com/haskell-hvr/lzma/pull/11 lzma = appendPatch super.lzma ./patches/lzma-tests.patch; # https://github.com/BNFC/bnfc/issues/140 @@ -872,9 +882,6 @@ self: super: { # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; - # Needs time<1.7 - taffybar = doJailbreak super.taffybar; - # Needs tasty-quickcheck ==0.8.*, which we don't have. cryptohash-sha256 = doJailbreak super.cryptohash-sha256; cryptohash-sha1 = doJailbreak super.cryptohash-sha1; @@ -914,17 +921,6 @@ self: super: { # https://github.com/bos/text-icu/issues/32 text-icu = dontCheck super.text-icu; - # https://github.com/strake/lenz.hs/issues/2 - lenz = - let patch = pkgs.fetchpatch - { url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch; - sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn"; - }; - in overrideCabal super.lenz (drv: - { patches = (drv.patches or []) ++ [ patch ]; - editedCabalFile = null; - }); - # https://github.com/haskell/cabal/issues/4969 haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4; haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; }; @@ -962,37 +958,37 @@ self: super: { hledger = overrideCabal super.hledger (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in embeddedfiles/*.$i; do mkdir -p $out/share/man/man$i - cp $j $out/share/man/man$i/ + cp -v $j $out/share/man/man$i/ done done mkdir -p $out/share/info - cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ + cp -v embeddedfiles/*.info* $out/share/info/ ''; }); hledger-ui = overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in *.$i; do mkdir -p $out/share/man/man$i - cp $j $out/share/man/man$i/ + cp -v $j $out/share/man/man$i/ done done mkdir -p $out/share/info - cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ + cp -v *.info* $out/share/info/ ''; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in *.$i; do mkdir -p $out/share/man/man$i - cp $j $out/share/man/man$i/ + cp -v $j $out/share/man/man$i/ done done mkdir -p $out/share/info - cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ + cp -v *.info* $out/share/info/ ''; }); @@ -1008,4 +1004,37 @@ self: super: { # https://github.com/GaloisInc/pure-zlib/issues/6 pure-zlib = doJailbreak super.pure-zlib; + # https://github.com/strake/lenz-template.hs/issues/1 + lenz-template = doJailbreak super.lenz-template; + + # https://github.com/haskell-hvr/resolv/issues/1 + resolv = dontCheck super.resolv; + + # spdx 0.2.2.0 needs older tasty + # was fixed in spdx master (4288df6e4b7840eb94d825dcd446b42fef25ef56) + spdx = dontCheck super.spdx; + + # The test suite does not know how to find the 'alex' binary. + alex = overrideCabal super.alex (drv: { + testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; + preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; + }); + } + +// + +(let + amazonkaOverrides = self: super: { + conduit = self.conduit_1_2_13_1; + conduit-extra = self.conduit-extra_1_2_3_2; + resourcet = self.resourcet_1_1_11; + xml-conduit = self.xml-conduit_1_7_1_2; + http-conduit = self.http-conduit_2_2_4; + }; + amazonka-core = super.amazonka-core.overrideScope amazonkaOverrides; + amazonka = super.amazonka.overrideScope amazonkaOverrides; + amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides; +in { + inherit amazonka amazonka-core amazonka-test; +}) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index a071a6aa866a..15220c24b4f2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -173,10 +173,6 @@ self: super: { # https://github.com/thoughtpolice/hs-ed25519/issues/13 ed25519 = dontCheck super.ed25519; - # https://github.com/well-typed/hackage-security/issues/157 - # https://github.com/well-typed/hackage-security/issues/158 - hackage-security = dontHaddock (dontCheck super.hackage-security); - # Breaks a dependency cycle between QuickCheck and semigroups hashable = dontCheck super.hashable; unordered-containers = dontCheck super.unordered-containers; @@ -223,4 +219,15 @@ self: super: { chr-pretty = doJailbreak super.chr-pretty; chr-parse = doJailbreak super.chr-parse; + # The autogenerated Nix expressions don't take into + # account `if impl(ghc >= x.y)`, which is a common method to depend + # on `semigroups` or `fail` when building with GHC < 8.0. + system-filepath = addBuildDepend super.system-filepath self.semigroups; + haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups; + free = addBuildDepend super.free self.fail; + + # Newer versions don't build without base-4.9 + resourcet = self.resourcet_1_1_11; + conduit = self.conduit_1_2_13_1; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 757c1d8c32d8..7924a39fa96d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -66,7 +66,15 @@ self: super: { inline-c = super.inline-c_0_5_6_1; inline-c-cpp = super.inline-c-cpp_0_1_0_0; + # test dep hedgehog pulls in concurrent-output, which does not build + # due to processing version mismatch + either = dontCheck super.either; + + # test dep tasty has a version mismatch + indents = dontCheck super.indents; + # Newer versions require GHC 8.2. + haddock-library = self.haddock-library_1_4_3; haddock-api = self.haddock-api_2_17_4; haddock = self.haddock_2_17_5; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index e37c7bb2d3e0..b6fdb75e5506 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -41,9 +41,6 @@ self: super: { prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal"; }); - # cabal-install can use the native Cabal library. - cabal-install = super.cabal-install.override { Cabal = null; }; - # jailbreak-cabal doesn't seem to work right with the native Cabal version. jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal; @@ -87,12 +84,12 @@ self: super: { purescript = doJailbreak (super.purescript); # These packages need Cabal 2.2.x, which is not the default. - distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; }); - hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; }); - cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; }); - cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; }); + distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: { - Cabal = self.Cabal_2_2_0_0; + Cabal = self.Cabal_2_2_0_1; haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index d953236784ee..7538c3697412 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -8,9 +8,6 @@ self: super: { inherit (pkgs) llvmPackages; # Disable GHC 8.4.x core libraries. - # - # Verify against: - # ls /nix/store/wnh3kxra586h9wvxrn62g4lmsri2akds-ghc-8.4.20180115/lib/ghc-8.4.20180115/ -1 | sort | grep -e '-' | grep -Ev '(txt|h|targets)$' array = null; base = null; binary = null; @@ -20,12 +17,11 @@ self: super: { deepseq = null; directory = null; filepath = null; - bin-package-db = null; ghc-boot = null; ghc-boot-th = null; ghc-compact = null; - ghci = null; ghc-prim = null; + ghci = null; haskeline = null; hpc = null; integer-gmp = null; @@ -33,6 +29,7 @@ self: super: { parsec = null; pretty = null; process = null; + rts = null; stm = null; template-haskell = null; terminfo = null; @@ -68,11 +65,6 @@ self: super: { ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: - ## free >=4.9 && <5 - either = super.either_5; - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: ## Cabal <2.2 ## Older versions don't compile. hackage-db = super.hackage-db_2_0_1; @@ -127,41 +119,6 @@ self: super: { ## On Hackage: ## Upstreamed, awaiting a Hackage release - cabal-install = overrideCabal super.cabal-install (drv: { - ## Setup: Encountered missing dependencies: - ## Cabal >=2.0.1.0 && <2.1, base >=4.5 && <4.11 - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "728ad1a1e066da453ae13ee479629c00d8c2f32d"; - sha256 = "0943xpva0fjlx8fanqvb6bg7myim2pki7q8hz3q0ijnf73bgzf7p"; - }; - prePatch = "cd cabal-install; "; - ## Setup: Encountered missing dependencies: - ## network >=2.4 && <2.6, resolv >=0.1.1 && <0.2 - libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ network resolv ]); - }); - - ## Upstreamed, awaiting a Hackage release - hackage-security = overrideCabal super.hackage-security (drv: { - ## Setup: Encountered missing dependencies: - ## Cabal >=1.14 && <1.26, - ## directory >=1.1.0.2 && <1.3, - ## time >=1.2 && <1.7 - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "hackage-security"; - rev = "21519f4f572b9547485285ebe44c152e1230fd76"; - sha256 = "1ijwmps4pzyhsxfhc8mrnc3ldjvpisnmr457vvhgymwhdrr95k0z"; - }; - prePatch = "cd hackage-security; "; - ## https://github.com/haskell/hackage-security/issues/211 - jailbreak = true; - ## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:217:22: - editedCabalFile = null; - }); - - ## Upstreamed, awaiting a Hackage release haskell-gi = overrideCabal super.haskell-gi (drv: { ## Setup: Encountered missing dependencies: ## haskell-gi-base ==0.20.* @@ -244,17 +201,7 @@ self: super: { }; }); - ## Upstreamed, awaiting a Hackage release - singletons = overrideCabal super.singletons (drv: { - ## Setup: Encountered missing dependencies: - ## th-desugar ==1.7.* - src = pkgs.fetchFromGitHub { - owner = "goldfirere"; - repo = "singletons"; - rev = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce"; - sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27"; - }; - }); + singletons = super.singletons_2_4_1; ## Upstreamed, awaiting a Hackage release tar = overrideCabal super.tar (drv: { @@ -269,18 +216,7 @@ self: super: { }; }); - ## Upstreamed, awaiting a Hackage release - th-desugar = overrideCabal super.th-desugar (drv: { - ## • Could not deduce (MonadIO (DsM q)) - ## arising from the 'deriving' clause of a data type declaration - ## from the context: Quasi q - src = pkgs.fetchFromGitHub { - owner = "goldfirere"; - repo = "th-desugar"; - rev = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837"; - sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw"; - }; - }); + th-desugar = super.th-desugar_1_8; ## Upstreamed, awaiting a Hackage release websockets = overrideCabal super.websockets (drv: { @@ -646,24 +582,9 @@ self: super: { jailbreak = true; }); - # Fix missing semigroup instance for Journal. - hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch - { url = https://github.com/simonmichael/hledger/pull/718.patch; - sha256 = "1gcs9j934wvk9hbn27zm42dnvf4x1gxr54li4kdw3zi3160y2l5c"; - stripLen = 1; - }); - - # Fix missing semigroup instance. - data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch - { url = https://github.com/luqui/data-inttrie/pull/5.patch; - sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a"; - }); - # Older versions don't compile. - brick = self.brick_0_35; - getopt-generics = self.getopt-generics_0_13_0_2; + brick = self.brick_0_36; HaTeX = self.HaTeX_3_19_0_0; - json = self.json_0_9_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_1_3; pandoc-types = self.pandoc-types_1_17_4_2; @@ -677,4 +598,16 @@ self: super: { # https://github.com/xmonad/xmonad-contrib/issues/235 xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch); + # Contributed by Bertram Felgenhauer <int-e@gmx.de>. + arrows = appendPatch super.arrows (pkgs.fetchpatch { + url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/arrows-0.4.4.1.patch; + sha256 = "0j859vclcfnz8n2mw466mv00kjsa9gdbrppjc1m3b68jbypdmfvr"; + }); + + # Contributed by Bertram Felgenhauer <int-e@gmx.de>. + flexible-defaults = appendPatch super.flexible-defaults (pkgs.fetchpatch { + url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/flexible-defaults-0.0.1.2.patch; + sha256 = "1bpsqq80h6nxm04wddgcgyzn0fjfsmhccmqb211jqswv5209znx8"; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index bd35c1cb3ae2..7a6416b9e13b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -53,19 +53,6 @@ self: super: terminfo = self.terminfo_0_4_0_2; xhtml = self.xhtml_3000_2_1; - # Cabal isn't part of the stage1 packages which form the default package-db - # that GHCJS provides. - # Almost all packages require Cabal to build their Setup.hs, - # but usually they don't declare it explicitly as they don't need to for normal GHC. - # To account for that we add Cabal by default. - mkDerivation = args: super.mkDerivation (args // { - setupHaskellDepends = (args.setupHaskellDepends or []) ++ - (if args.pname == "Cabal" then [ ] - # Break the dependency cycle between Cabal and hscolour - else if args.pname == "hscolour" then [ (dontHyperlinkSource self.Cabal) ] - else [ self.Cabal ]); - }); - ## OTHER PACKAGES # haddock throws the error: No input file(s). diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 00505f31b462..7b982cb7781b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,22 +38,22 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.1 + # LTS Haskell 11.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 - accelerate ==1.1.1.0 - - accelerate-arithmetic ==1.0 + - accelerate-arithmetic ==1.0.0.1 - accelerate-bignum ==0.1.0.0 - accelerate-blas ==0.1.0.1 - accelerate-fft ==1.1.0.0 - - accelerate-fftw ==1.0 - - accelerate-fourier ==1.0.0.4 + - accelerate-fftw ==1.0.0.1 + - accelerate-fourier ==1.0.0.5 - accelerate-io ==1.0.0.1 - accelerate-llvm ==1.1.0.0 - accelerate-llvm-native ==1.1.0.1 - accelerate-llvm-ptx ==1.1.0.1 - - accelerate-utility ==1.0 + - accelerate-utility ==1.0.0.1 - accuerr ==0.2.0.2 - ace ==0.6 - action-permutations ==0.0.0.1 @@ -81,7 +81,7 @@ default-package-overrides: - airship ==0.9.3 - alarmclock ==0.4.0.3 - alerts ==0.1.0.0 - - alex ==3.2.3 + - alex ==3.2.4 - algebra ==4.3.1 - algebraic-graphs ==0.0.5 - alsa-core ==0.5.0.1 @@ -140,8 +140,8 @@ default-package-overrides: - auto-update ==0.1.4 - avwx ==0.3.0.2 - axiom ==0.4.6 - - b9 ==0.5.41 - - backprop ==0.1.3.0 + - b9 ==0.5.43 + - backprop ==0.1.5.0 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 @@ -162,7 +162,7 @@ default-package-overrides: - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 - - bhoogle ==0.1.2.5 + - bhoogle ==0.1.2.6 - bibtex ==0.1.0.6 - bifunctors ==5.5.2 - bimap ==0.3.3 @@ -200,8 +200,8 @@ default-package-overrides: - bit-stream ==0.1.0.2 - bitx-bitcoin ==0.12.0.0 - blake2 ==0.2.0 - - blas-carray ==0.0.1 - - blas-ffi ==0.0.1 + - blas-carray ==0.0.1.1 + - blas-ffi ==0.0.1.1 - blas-hs ==0.1.1.0 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 @@ -214,12 +214,12 @@ default-package-overrides: - blosum ==0.1.1.4 - bmp ==1.2.6.3 - bno055-haskell ==0.1.0 - - boltzmann-samplers ==0.1.0.0 + - boltzmann-samplers ==0.1.1.0 - bookkeeping ==0.2.1.4 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - boolsimplifier ==0.1.8 - - boomerang ==1.4.5.3 + - boomerang ==1.4.5.5 - bordacount ==0.1.0.0 - both ==0.1.1.0 - bound ==2.0.1 @@ -235,7 +235,7 @@ default-package-overrides: - bson-lens ==0.1.1 - btrfs ==0.1.2.3 - buchhaltung ==0.0.7 - - buffer-builder ==0.2.4.4 + - buffer-builder ==0.2.4.5 - buffer-pipe ==0.0 - butcher ==1.3.0.0 - bv ==0.5 @@ -243,7 +243,7 @@ default-package-overrides: - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 - - bytes ==0.15.3 + - bytes ==0.15.4 - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.1.0 - bytestring-conversion ==0.3.1 @@ -252,14 +252,14 @@ default-package-overrides: - bytestring-tree-builder ==0.2.7.1 - bytestring-trie ==0.2.4.1 - bzlib ==0.5.0.5 - - bzlib-conduit ==0.3.0 + - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.3 - Cabal ==2.0.1.1 - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - - cabal-rpm ==0.12.1 + - cabal-rpm ==0.12.2 - cabal-toolkit ==0.0.5 - - cache ==0.1.0.1 + - cache ==0.1.1.0 - cairo ==0.13.4.2 - calendar-recycling ==0.0 - call-stack ==0.1.0 @@ -269,13 +269,13 @@ default-package-overrides: - cased ==0.1.0.0 - case-insensitive ==1.2.0.11 - cases ==0.1.3.2 - - casing ==0.1.2.1 + - casing ==0.1.4.0 - cassava ==0.5.1.0 - cassava-conduit ==0.4.0.2 - cassava-records ==0.1.0.4 - cassette ==0.1.0 - cast ==0.1.0.2 - - cayley-client ==0.4.4 + - cayley-client ==0.4.5 - cereal ==0.5.5.0 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -303,6 +303,7 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 + - cisco-spark-api ==0.1.0.2 - clang-compilation-database ==0.1.0.1 - classyplate ==0.3.0.2 - classy-prelude ==1.4.0 @@ -343,6 +344,7 @@ default-package-overrides: - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 + - composition-prelude ==1.3.0.8 - compressed ==3.11 - concise ==0.1.0.1 - concurrency ==1.4.0.2 @@ -351,7 +353,7 @@ default-package-overrides: - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.0.1 + - conduit ==1.3.0.2 - conduit-algorithms ==0.0.8.0 - conduit-combinators ==1.3.0 - conduit-connection ==0.1.0.4 @@ -377,7 +379,7 @@ default-package-overrides: - convertible ==1.1.1.0 - cookie ==0.4.4 - countable ==1.0 - - country ==0.1.4 + - country ==0.1.5 - courier ==0.1.1.5 - cpphs ==1.20.8 - cprng-aes ==0.6.1 @@ -429,12 +431,12 @@ default-package-overrides: - czipwith ==1.0.0.0 - data-accessor ==0.2.2.7 - data-accessor-mtl ==0.2.0.4 - - data-accessor-template ==0.2.1.14 + - data-accessor-template ==0.2.1.15 - data-accessor-transformers ==0.2.1.7 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 - - data-clist ==0.1.2.0 + - data-clist ==0.1.2.1 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - data-default-instances-containers ==0.0.1 @@ -442,13 +444,13 @@ default-package-overrides: - data-default-instances-old-locale ==0.0.1 - data-diverse ==2.0.1.0 - data-diverse-lens ==2.1.0.0 - - datadog ==0.2.0.0 + - datadog ==0.2.2.0 - data-dword ==0.3.1.2 - data-endian ==0.1.1 - data-fix ==0.2.0 - data-has ==0.3.0.0 - data-hash ==0.2.0.1 - - data-inttrie ==0.1.2 + - data-inttrie ==0.1.4 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 - data-msgpack ==0.0.11 @@ -467,17 +469,19 @@ default-package-overrides: - dbcleaner ==0.1.3 - dbus ==0.10.15 - debian-build ==0.10.1.0 - - debug ==0.1 + - debug ==0.1.1 - Decimal ==0.5.1 + - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - dejafu ==1.3.2.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - - deque ==0.2 + - deque ==0.2.1 - deriving-compat ==0.4.1 - descriptive ==0.9.4 - dhall ==1.11.1 + - dhall-json ==1.0.13 - dice ==0.1 - dictionaries ==0.2.0.4 - Diff ==0.3.4 @@ -487,7 +491,7 @@ default-package-overrides: - dimensional ==1.1 - directory-tree ==0.12.1 - direct-rocksdb ==0.0.3 - - direct-sqlite ==2.3.22 + - direct-sqlite ==2.3.23 - discount ==0.1.1 - discrimination ==0.3 - disk-free-space ==0.1.0.1 @@ -516,7 +520,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.13.0 - doctest-discover ==0.1.0.7 - - doctest-driver-gen ==0.2.0.0 + - doctest-driver-gen ==0.2.0.2 - do-list ==1.0.1 - dom-parser ==3.0.0 - dotenv ==0.5.2.4 @@ -544,7 +548,7 @@ default-package-overrides: - editor-open ==0.6.0.0 - either ==5 - either-unwrap ==1.1 - - ekg ==0.4.0.14 + - ekg ==0.4.0.15 - ekg-core ==0.1.1.4 - ekg-json ==0.1.0.6 - ekg-statsd ==0.2.2.0 @@ -558,7 +562,7 @@ default-package-overrides: - email-validate ==2.3.2.5 - enclosed-exceptions ==1.0.2 - entropy ==0.3.8 - - enummapset ==0.5.2.1 + - enummapset ==0.5.2.2 - enumset ==0.0.4.1 - envelope ==0.2.2.0 - envparse ==0.4 @@ -593,7 +597,7 @@ default-package-overrides: - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - exceptions ==0.8.3 - - exception-transformers ==0.4.0.5 + - exception-transformers ==0.4.0.6 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - exhaustive ==1.1.5 @@ -603,7 +607,7 @@ default-package-overrides: - extensible ==0.4.8 - extensible-effects ==2.4.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.4 + - extra ==1.6.5 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - fail ==4.9.0.0 @@ -620,7 +624,7 @@ default-package-overrides: - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.6.0.0 - - filecache ==0.3.1 + - filecache ==0.3.2 - file-embed ==0.0.10.1 - filelock ==0.1.1.2 - filemanip ==0.3.6.3 @@ -629,7 +633,7 @@ default-package-overrides: - filter-logger ==0.6.0.0 - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - - fingertree ==0.1.3.1 + - fingertree ==0.1.4.1 - fingertree-psqueue ==0.3 - finite-typelits ==0.1.3.0 - fitspec ==0.4.4 @@ -643,13 +647,13 @@ default-package-overrides: - flexible-defaults ==0.0.1.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.11 + - flow ==1.0.12 - fmlist ==0.9.2 - fmt ==0.5.0.0 - fn ==0.3.0.2 - focus ==0.1.5.2 - fold-debounce ==0.2.0.7 - - fold-debounce-conduit ==0.2.0.0 + - fold-debounce-conduit ==0.2.0.1 - foldl ==1.3.7 - folds ==0.7.4 - follow-file ==0.0.2 @@ -659,7 +663,7 @@ default-package-overrides: - ForestStructures ==0.0.0.2 - forma ==0.2.0 - format-numbers ==0.1.0.0 - - formatting ==6.3.1 + - formatting ==6.3.2 - foundation ==0.0.20 - FPretty ==1.1 - Frames ==0.3.0.2 @@ -714,7 +718,7 @@ default-package-overrides: - genvalidity-unordered-containers ==0.1.0.0 - genvalidity-uuid ==0.0.0.0 - genvalidity-vector ==0.1.0.0 - - getopt-generics ==0.13.0.1 + - getopt-generics ==0.13.0.2 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-events ==0.7.2 @@ -725,7 +729,7 @@ default-package-overrides: - ghcjs-perch ==0.3.3.2 - ghc-parser ==0.2.0.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.1 + - ghc-prof ==1.4.1.1 - ghc-syb-utils ==0.2.3.3 - ghc-tcplugins-extra ==0.2.4 - ghc-typelits-extra ==0.2.4 @@ -740,14 +744,14 @@ default-package-overrides: - ginger ==0.7.3.0 - git ==0.2.1 - github ==0.19 - - github-release ==1.1.5 + - github-release ==1.1.6 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 - github-webhooks ==0.9.1 - gitrev ==1.3.1 - gl ==0.8.0 - - glabrous ==0.3.4 + - glabrous ==0.3.5 - glaze ==0.3.0.1 - glazier ==0.11.0.1 - glazier-pipes ==0.1.5.1 @@ -756,13 +760,13 @@ default-package-overrides: - Glob ==0.9.2 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 - - gloss-accelerate ==2.0.0.0 + - gloss-accelerate ==2.0.0.1 - gloss-algorithms ==1.11.1.1 - gloss-raster ==1.11.1.1 - gloss-raster-accelerate ==2.0.0.0 - gloss-rendering ==1.11.1.1 - - GLURaw ==2.0.0.3 - - GLUT ==2.7.0.12 + - GLURaw ==2.0.0.4 + - GLUT ==2.7.0.13 - gluturtle ==0.0.58.1 - gnuplot ==0.5.5.1 - goggles ==0.3.2 @@ -789,17 +793,18 @@ default-package-overrides: - H ==0.9.0.1 - h2c ==1.0.0 - hackage-db ==2.0 - - hackage-security ==0.5.2.2 + - hackage-security ==0.5.3.0 - haddock-library ==1.4.5 - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 + - hakyll ==4.12.1.0 - half ==0.2.2.3 - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - hapistrano ==0.3.5.3 - happstack-jmacro ==7.0.12 - - happstack-server ==7.5.0.1 + - happstack-server ==7.5.1 - happstack-server-tls ==7.1.6.5 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -807,7 +812,7 @@ default-package-overrides: - hashable-time ==0.2.0.1 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.2.1 + - hashtables ==1.2.3.0 - haskeline ==0.7.4.2 - haskell-gi ==0.21.0 - haskell-gi-base ==0.21.0 @@ -830,13 +835,14 @@ default-package-overrides: - haskell-tools-refactor ==1.0.1.2 - haskell-tools-rewrite ==1.0.1.1 - haskintex ==0.8.0.0 - - hasmin ==1.0.1 + - hasmin ==1.0.2 - hasql ==1.1.1 - hasql-migration ==0.1.3 - hasql-optparse-applicative ==0.3 - hasql-pool ==0.4.3 - hasql-transaction ==0.6 - hastache ==0.6.1 + - hasty-hamiltonian ==1.3.2 - HaTeX ==3.18.0.0 - haxl ==0.5.1.0 - HaXml ==1.25.4 @@ -887,7 +893,7 @@ default-package-overrides: - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.6.1 - hmatrix ==0.18.2.0 - - hmatrix-backprop ==0.1.0.0 + - hmatrix-backprop ==0.1.2.0 - hmatrix-gsl ==0.18.2.0 - hmatrix-gsl-stats ==0.4.1.7 - hmatrix-morpheus ==0.1.1.1 @@ -908,9 +914,9 @@ default-package-overrides: - hpack ==0.27.0 - hpc-coveralls ==1.0.10 - HPDF ==1.4.10 - - hpio ==0.9.0.5 - - hpp ==0.5.1 - - hpqtypes ==1.5.1.1 + - hpio ==0.9.0.6 + - hpp ==0.5.2 + - hpqtypes ==1.5.2.0 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -922,8 +928,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -958,13 +964,13 @@ default-package-overrides: - hsshellscript ==3.4.5 - hstatistics ==0.3 - hstatsd ==0.1 - - HStringTemplate ==0.8.6 + - HStringTemplate ==0.8.7 - HSvm ==0.1.0.3.22 - hsx-jmacro ==7.3.8 - hsyslog ==5.0.1 - hsyslog-udp ==0.2.2 - htaglib ==1.1.1 - - HTF ==0.13.2.2 + - HTF ==0.13.2.4 - html ==1.0.1.2 - html-conduit ==1.3.0 - html-email-validate ==0.2.0.0 @@ -973,7 +979,7 @@ default-package-overrides: - HTTP ==4000.3.11 - http2 ==1.6.3 - http-api-data ==0.3.7.2 - - http-client ==0.5.11 + - http-client ==0.5.12 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 @@ -987,7 +993,7 @@ default-package-overrides: - human-readable-duration ==0.2.0.3 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==1.1.0.2 + - hunit-dejafu ==1.1.0.3 - hvect ==0.4.0.0 - hw-balancedparens ==0.2.0.1 - hw-bits ==0.7.0.2 @@ -995,10 +1001,10 @@ default-package-overrides: - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 - hw-excess ==0.2.0.0 - - hw-fingertree ==0.1.0.0 - - hw-fingertree-strict ==0.1.0.1 + - hw-fingertree ==0.1.0.1 + - hw-fingertree-strict ==0.1.0.3 - hw-hedgehog ==0.1.0.1 - - hw-hspec-hedgehog ==0.1.0.2 + - hw-hspec-hedgehog ==0.1.0.3 - hw-int ==0.0.0.3 - hw-json ==0.6.0.0 - hw-mquery ==0.1.0.1 @@ -1009,7 +1015,7 @@ default-package-overrides: - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - - hw-xml ==0.1.0.1 + - hw-xml ==0.1.0.3 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 @@ -1074,8 +1080,8 @@ default-package-overrides: - ip ==1.1.2 - ip6addr ==0.5.3 - iproute ==1.7.3 - - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.5 + - IPv6Addr ==1.0.2 + - IPv6DB ==0.2.6 - ipython-kernel ==0.9.0.2 - irc ==0.6.1.0 - irc-client ==1.1.0.2 @@ -1101,12 +1107,12 @@ default-package-overrides: - jose-jwt ==0.7.8 - js-flot ==0.8.3 - js-jquery ==3.3.1 - - json ==0.9.1 + - json ==0.9.2 - json-autotype ==1.0.18 - json-builder ==0.3 - json-rpc-generic ==0.2.1.3 - json-schema ==0.7.4.1 - - json-stream ==0.4.2.0 + - json-stream ==0.4.2.3 - JuicyPixels ==3.2.9.5 - JuicyPixels-extra ==0.3.0 - JuicyPixels-scale-dct ==0.1.1.2 @@ -1128,7 +1134,7 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.1 + - lackey ==1.0.2 - lambdabot-core ==5.1.0.1 - lambdabot-irc-plugins ==5.1.0.1 - lame ==0.1.1 @@ -1141,9 +1147,10 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - lapack-carray ==0.0.1 - - lapack-ffi ==0.0.1 - - lapack-ffi-tools ==0.1 + - language-puppet ==1.3.17 + - lapack-carray ==0.0.2 + - lapack-ffi ==0.0.2 + - lapack-ffi-tools ==0.1.0.1 - large-hashable ==0.1.0.4 - largeword ==1.2.5 - latex ==0.1.0.3 @@ -1152,7 +1159,7 @@ default-package-overrides: - lca ==0.3.1 - leancheck ==0.7.0 - leapseconds-announced ==2017.1.0.1 - - lens ==4.16 + - lens ==4.16.1 - lens-accelerate ==0.1.0.0 - lens-action ==0.2.3 - lens-aeson ==1.0.2 @@ -1164,7 +1171,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 - - lentil ==1.0.10.1 + - lentil ==1.0.11.3 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.1 - libffi ==0.1 @@ -1189,7 +1196,7 @@ default-package-overrides: - List ==0.6.2 - ListLike ==4.6 - listsafe ==0.1.0.1 - - list-t ==1.0.0.1 + - list-t ==1.0.1 - llvm-hs ==5.1.3 - llvm-hs-pure ==5.1.2 - lmdb ==0.2.5 @@ -1202,15 +1209,15 @@ default-package-overrides: - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.2.4 + - logging-effect ==1.2.5 - logging-effect-extra ==1.2.2 - logging-effect-extra-file ==1.1.2 - - logging-effect-extra-handler ==1.1.3 + - logging-effect-extra-handler ==1.1.4 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 - log-postgres ==0.7.0.2 - - log-warper ==1.8.10.1 + - log-warper ==1.8.11 - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.3 @@ -1229,12 +1236,12 @@ default-package-overrides: - mandrill ==0.5.3.3 - mapquest-api ==0.3.1 - map-syntax ==0.2.0.2 - - markdown ==0.1.17 + - markdown ==0.1.17.1 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - markup ==4.0.4 - marvin-interpolate ==1.1.2 - - massiv ==0.1.2.0 + - massiv ==0.1.4.0 - massiv-io ==0.1.1.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 @@ -1287,22 +1294,22 @@ default-package-overrides: - mmark ==0.0.5.6 - mmark-cli ==0.0.3.0 - mmark-ext ==0.2.0.0 - - mmorph ==1.1.1 + - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - model ==0.4.4 - modern-uri ==0.2.1.0 - - modify-fasta ==0.8.2.3 + - modify-fasta ==0.8.3.0 - moesocks ==1.0.0.44 - mole ==0.0.6 - monad-control ==1.0.2.3 - - monad-control-aligned ==0.0.1 + - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.28.2 + - monad-logger ==0.3.28.3 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.9 - monad-logger-syslog ==0.1.4.0 @@ -1319,7 +1326,7 @@ default-package-overrides: - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - MonadRandom ==0.5.1 - - monad-recorder ==0.1.0 + - monad-recorder ==0.1.1 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 @@ -1328,12 +1335,12 @@ default-package-overrides: - monad-unlift-ref ==0.2.1 - mongoDB ==2.3.0.5 - monoidal-containers ==0.3.1.0 - - monoid-extras ==0.4.2 + - monoid-extras ==0.4.3 - monoid-subclasses ==0.4.6 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.8.1 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.16 + - morte ==1.6.18 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.2 @@ -1350,11 +1357,11 @@ default-package-overrides: - mwc-probability ==2.0.2 - mwc-random ==0.13.6.0 - mwc-random-accelerate ==0.1.0.0 - - mysql ==0.1.4 + - mysql ==0.1.5 - mysql-haskell ==0.8.3.0 - mysql-haskell-nem ==0.1.0.0 - mysql-haskell-openssl ==0.8.3.0 - - mysql-simple ==0.4.4 + - mysql-simple ==0.4.5 - nagios-check ==0.3.2 - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 @@ -1365,21 +1372,21 @@ default-package-overrides: - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.1 - - netlib-carray ==0.0.1 + - netlib-carray ==0.0.1.1 - netlib-ffi ==0.0.1 - netpbm ==1.0.2 - nettle ==0.2.0 - - netwire ==5.0.2 + - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.8 - - network ==2.6.3.4 + - network ==2.6.3.5 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - network-carbon ==1.0.11 - network-conduit-tls ==1.3.0 - network-house ==0.1.0.2 - - network-info ==0.2.0.9 + - network-info ==0.2.0.10 - network-ip ==0.3.0.2 - network-multicast ==0.2.0 - Network-NineP ==0.4.2 @@ -1391,7 +1398,7 @@ default-package-overrides: - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - - newtype-generics ==0.5.2.2 + - newtype-generics ==0.5.3 - next-ref ==0.1.0.2 - nfc ==0.1.0 - nicify-lib ==1.0.1 @@ -1431,13 +1438,13 @@ default-package-overrides: - online ==0.2.1.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.0.0 + - opaleye ==0.6.1.0 - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.1 - - OpenGL ==3.0.2.0 + - OpenGL ==3.0.2.1 - OpenGLRaw ==3.2.7.0 - - openpgp-asciiarmor ==0.1 + - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.3 - open-witness ==0.4.0.1 @@ -1458,7 +1465,7 @@ default-package-overrides: - pagination ==0.2.1 - palette ==0.1.0.5 - pandoc ==2.1.2 - - pandoc-citeproc ==0.14.1.5 + - pandoc-citeproc ==0.14.3 - pandoc-types ==1.17.3.1 - pango ==0.13.4.0 - papillon ==0.1.0.5 @@ -1496,7 +1503,7 @@ default-package-overrides: - pem ==0.2.4 - perf ==0.3.1.1 - perfect-hash-generator ==0.2.0.6 - - persistable-record ==0.6.0.2 + - persistable-record ==0.6.0.3 - persistable-types-HDBC-pg ==0.0.1.5 - persistent ==2.8.1 - persistent-mongoDB ==2.8.0 @@ -1521,7 +1528,7 @@ default-package-overrides: - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.6 - pipes-category ==0.3.0.0 - - pipes-concurrency ==2.0.9 + - pipes-concurrency ==2.0.10 - pipes-csv ==1.4.3 - pipes-extras ==1.0.13 - pipes-fastx ==0.3.0.0 @@ -1550,16 +1557,16 @@ default-package-overrides: - pomaps ==0.0.0.3 - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - - posix-paths ==0.2.1.3 + - posix-paths ==0.2.1.5 - postgresql-binary ==0.12.1 - postgresql-libpq ==0.9.4.1 - postgresql-schema ==0.1.14 - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.11.0 - postgresql-simple-queue ==1.0.1 - - postgresql-simple-url ==0.2.0.0 + - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 - - postgresql-typed ==0.5.2 + - postgresql-typed ==0.5.3.0 - post-mess-age ==0.2.1.0 - pptable ==0.2.0.0 - pqueue ==1.4.1.1 @@ -1582,7 +1589,7 @@ default-package-overrides: - pretty-show ==1.6.16 - pretty-simple ==2.1.0.0 - pretty-types ==0.2.3.1 - - prim-array ==0.2.1 + - prim-array ==0.2.2 - primes ==0.2.1.0 - primitive ==0.6.3.0 - prim-uniq ==0.1.0.1 @@ -1607,8 +1614,8 @@ default-package-overrides: - proto-lens ==0.2.2.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-descriptors ==0.2.2.0 - - proto-lens-optparse ==0.1.0.4 - - protolude ==0.2.1 + - proto-lens-optparse ==0.1.1.0 + - protolude ==0.2.2 - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 @@ -1619,7 +1626,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.11.1.2 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.3 + - pusher-http-haskell ==1.5.1.4 - pwstore-fast ==2.4.4 - qchas ==1.1.0.0 - qm-interpolated-string ==0.3.0.0 @@ -1633,7 +1640,7 @@ default-package-overrides: - quickcheck-instances ==0.3.18 - quickcheck-io ==0.2.0 - quickcheck-properties ==0.1 - - quickcheck-simple ==0.1.0.2 + - quickcheck-simple ==0.1.0.3 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.3.1 - quickcheck-text ==0.1.2.1 @@ -1653,10 +1660,10 @@ default-package-overrides: - rank1dynamic ==0.4.0 - rank2classes ==1.0.2 - rank-product ==0.2.0.1 - - Rasterific ==0.7.2.3 + - Rasterific ==0.7.3 - rasterific-svg ==0.3.3.1 - - ratel ==1.0.2 - - ratel-wai ==1.0.1 + - ratel ==1.0.3 + - ratel-wai ==1.0.2 - ratio-int ==0.1.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1677,7 +1684,7 @@ default-package-overrides: - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - reflection ==2.1.3 - - reform ==0.2.7.1 + - reform ==0.2.7.2 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.2 @@ -1711,11 +1718,11 @@ default-package-overrides: - resourcet ==1.2.0 - rest-core ==0.39 - rest-snap ==0.3.0.0 - - rest-stringmap ==0.2.0.6 - - rest-types ==1.14.1.1 + - rest-stringmap ==0.2.0.7 + - rest-types ==1.14.1.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.6.1 + - retry ==0.7.6.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - riak ==1.1.2.4 @@ -1741,7 +1748,7 @@ default-package-overrides: - sampling ==0.3.2 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbp ==2.3.9 + - sbp ==2.3.13 - sbv ==7.5 - SCalendar ==1.1.0 - scalendar ==1.2.0 @@ -1750,7 +1757,7 @@ default-package-overrides: - scanner ==0.2 - schematic ==0.4.2.0 - scientific ==0.3.5.3 - - scotty ==0.11.0 + - scotty ==0.11.1 - scrypt ==0.5.0 - sdl2 ==2.4.0.1 - sdl2-gfx ==0.2 @@ -1782,9 +1789,9 @@ default-package-overrides: - servant-docs ==0.11.2 - servant-elm ==0.4.0.1 - servant-exceptions ==0.1.1 - - servant-foreign ==0.11 + - servant-foreign ==0.11.1 - servant-generic ==0.1.0.1 - - servant-github-webhook ==0.4.0.0 + - servant-github-webhook ==0.4.1.0 - servant-js ==0.9.3.2 - servant-JuicyPixels ==0.3.0.3 - servant-kotlin ==0.1.1.0 @@ -1812,11 +1819,11 @@ default-package-overrides: - set-monad ==0.2.0.0 - sets ==0.0.5.2 - SHA ==1.6.4.4 - - shake ==0.16.3 + - shake ==0.16.4 - shake-language-c ==0.11.0 - shakespeare ==2.0.15 - shelltestrunner ==1.9 - - shelly ==1.7.1 + - shelly ==1.7.2 - shikensu ==0.3.8 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 @@ -1830,14 +1837,14 @@ default-package-overrides: - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - - singleton-bool ==0.1.3 + - singleton-bool ==0.1.4 - singleton-nats ==0.4.0.4 - singletons ==2.3.1 - siphash ==1.0.3 - skein ==1.0.9.4 - skeletons ==0.4.0 - skylighting ==0.6 - - slack-web ==0.2.0.3 + - slack-web ==0.2.0.4 - slave-thread ==1.0.2 - slug ==0.1.7 - smallcheck ==1.1.3.1 @@ -1845,7 +1852,7 @@ default-package-overrides: - smtp-mail ==0.1.4.6 - snap ==1.1.0.0 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.3.1 + - snap-core ==1.0.3.2 - snap-server ==1.0.3.3 - snowflake ==0.1.1.1 - soap ==0.2.3.6 @@ -1878,10 +1885,10 @@ default-package-overrides: - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spreadsheet ==0.1.3.7 - - sqlite-simple ==0.4.14.0 + - sqlite-simple ==0.4.15.0 - sql-words ==0.1.5.1 - squeal-postgresql ==0.1.1.4 - - srcloc ==0.5.1.1 + - srcloc ==0.5.1.2 - stache ==1.2.1 - stack-type ==0.1.0.0 - starter ==0.2.1 @@ -1915,9 +1922,9 @@ default-package-overrides: - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.19.1 - streaming ==0.2.1.0 - - streaming-bytestring ==0.1.5 + - streaming-bytestring ==0.1.6 - streaming-commons ==0.1.19 - - streamly ==0.1.0 + - streamly ==0.1.2 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 @@ -1934,7 +1941,7 @@ default-package-overrides: - stringsearch ==0.3.6.6 - string-transform ==1.0.0 - stripe-core ==2.3.0 - - strive ==5.0.3 + - strive ==5.0.4 - structs ==0.1.1 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 @@ -1942,10 +1949,10 @@ default-package-overrides: - svg-builder ==0.1.0.2 - svg-tree ==0.6.2.2 - swagger ==0.3.0 - - swagger2 ==2.2 - - swish ==0.9.2.0 + - swagger2 ==2.2.1 + - swish ==0.9.2.1 - syb ==0.7 - - syb-with-class ==0.6.1.8 + - syb-with-class ==0.6.1.9 - symbol ==0.2.4 - symengine ==0.1.2.0 - sysinfo ==0.1.1 @@ -1966,12 +1973,12 @@ default-package-overrides: - tasty ==1.0.1.1 - tasty-ant-xml ==1.1.3 - tasty-auto ==0.2.0.0 - - tasty-dejafu ==1.1.0.1 + - tasty-dejafu ==1.1.0.2 - tasty-discover ==4.2.0 - tasty-expected-failure ==0.11.1.1 - tasty-golden ==2.3.1.3 - tasty-hedgehog ==0.1.0.2 - - tasty-hspec ==1.1.3.3 + - tasty-hspec ==1.1.4 - tasty-html ==0.4.1.1 - tasty-hunit ==0.10.0.1 - tasty-kat ==0.0.3 @@ -2037,7 +2044,7 @@ default-package-overrides: - threads ==0.5.1.6 - threads-extras ==0.1.0.2 - threepenny-editors ==0.5.6 - - threepenny-gui ==0.8.2.2 + - threepenny-gui ==0.8.2.3 - threepenny-gui-flexbox ==0.4.2 - th-reify-compat ==0.0.1.3 - th-reify-many ==0.1.8 @@ -2047,7 +2054,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-to-exp ==0.0.1.1 - th-utilities ==0.2.0.1 - - tibetan-utils ==0.1.1.4 + - tibetan-utils ==0.1.1.5 - tidal ==0.9.6 - tidal-midi ==0.9.5.2 - tile ==0.3.0.0 @@ -2055,15 +2062,15 @@ default-package-overrides: - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - - time-locale-compat ==0.1.1.3 + - time-locale-compat ==0.1.1.4 - time-locale-vietnamese ==1.0.0.0 - - timemap ==0.0.6 + - timemap ==0.0.7 - time-parsers ==0.1.2.0 - timerep ==2.0.0.2 - timespan ==0.3.0.0 - timezone-olson ==0.1.9 - timezone-series ==0.1.9 - - tinylog ==0.14.0 + - tinylog ==0.14.1 - tinytemplate ==0.1.2.0 - titlecase ==1.0.1 - tldr ==0.3.0 @@ -2095,24 +2102,24 @@ default-package-overrides: - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.6 + - turtle ==1.5.7 - turtle-options ==0.1.0.4 - type-assertions ==0.1.0.0 - type-combinators ==0.2.4.3 - type-combinators-singletons ==0.2.1.0 - TypeCompose ==0.9.12 - - typed-process ==0.2.1.0 + - typed-process ==0.2.2.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - - typelits-witnesses ==0.3.0.1 - - type-of-html ==1.3.3.0 + - typelits-witnesses ==0.3.0.2 + - type-of-html ==1.3.4.0 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 - - tz ==0.1.3.0 + - tz ==0.1.3.1 - tzdata ==0.1.20180122.0 - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 @@ -2125,7 +2132,7 @@ default-package-overrides: - unfoldable-restricted ==0.0.3 - unicode ==0.0.1 - unicode-show ==0.1.0.2 - - unicode-transforms ==0.3.3 + - unicode-transforms ==0.3.4 - unification-fd ==0.10.0.1 - union ==0.1.1.2 - union-find ==0.2 @@ -2145,7 +2152,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.0.1 - unix-time ==0.3.8 - - unliftio ==0.2.5.0 + - unliftio ==0.2.6.0 - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 @@ -2156,7 +2163,7 @@ default-package-overrides: - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 - urlpath ==8.0.1 - - userid ==0.1.3.1 + - userid ==0.1.3.2 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 - users-test ==0.5.0.1 @@ -2196,7 +2203,7 @@ default-package-overrides: - vector-th-unbox ==0.2.1.6 - vectortiles ==1.3.0 - verbosity ==0.2.3.0 - - versions ==3.3.1 + - versions ==3.3.2 - vhd ==0.2.2 - ViennaRNAParser ==1.3.3 - vinyl ==0.7.0 @@ -2205,10 +2212,10 @@ default-package-overrides: - vivid-supercollider ==0.3.0.0 - void ==0.7.2 - vty ==5.20 - - wai ==3.2.1.1 - - wai-app-static ==3.1.6.1 + - wai ==3.2.1.2 + - wai-app-static ==3.1.6.2 - wai-cli ==0.1.1 - - wai-conduit ==3.0.0.3 + - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - wai-extra ==3.0.22.0 @@ -2222,7 +2229,7 @@ default-package-overrides: - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - wai-middleware-rollbar ==0.10.0 - - wai-middleware-static ==0.8.1 + - wai-middleware-static ==0.8.2 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 - wai-route ==0.3.1.2 @@ -2231,8 +2238,8 @@ default-package-overrides: - wai-session-postgresql ==0.2.1.2 - wai-slack-middleware ==0.2.0 - wai-transformers ==0.0.7 - - wai-websockets ==3.0.1.1 - - warp ==3.2.18.1 + - wai-websockets ==3.0.1.2 + - warp ==3.2.18.2 - warp-tls ==3.2.4.2 - wave ==0.1.5 - wavefront ==0.7.1.2 @@ -2240,17 +2247,17 @@ default-package-overrides: - webdriver-angular ==0.1.11 - webpage ==0.0.5 - web-plugins ==0.2.9 - - web-routes ==0.27.14 + - web-routes ==0.27.14.2 - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.11 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.6.2 + - web-routes-th ==0.22.6.3 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.4.0 - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - - websockets-snap ==0.10.2.4 + - websockets-snap ==0.10.2.5 - weigh ==0.0.7 - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 @@ -2285,7 +2292,7 @@ default-package-overrides: - writer-cps-morph ==0.1.0.2 - writer-cps-mtl ==0.1.1.4 - writer-cps-transformers ==0.1.1.3 - - wuss ==1.1.6 + - wuss ==1.1.8 - X11 ==1.8 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2299,13 +2306,13 @@ default-package-overrides: - xenstore ==0.1.1 - xhtml ==3000.2.2 - xls ==0.1.1 - - xlsx ==0.7.1 + - xlsx ==0.7.2 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3 - xml-conduit ==1.8.0 - xml-conduit-writer ==0.1.1.2 - - xmlgen ==0.6.2.1 + - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0 - xmlhtml ==0.2.5.2 - xml-html-qq ==0.1.0.1 @@ -2323,7 +2330,7 @@ default-package-overrides: - xturtle ==0.2.0.0 - xxhash ==0.0.2 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.28 + - yaml ==0.8.29 - Yampa ==0.10.7 - YampaSynth ==0.2 - yeshql ==3.0.1.3 @@ -2340,6 +2347,7 @@ default-package-overrides: - yesod-form ==1.6.1 - yesod-form-bootstrap4 ==0.1.0.2 - yesod-gitrepo ==0.3.0 + - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==0.11.0 - yesod-persistent ==1.6.0 @@ -2377,7 +2385,7 @@ default-package-overrides: - zlib-lens ==0.1.2.1 - zot ==0.0.3 - zstd ==0.1.0.0 - - ztail ==1.2 + - ztail ==1.2.0.1 extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier @@ -2403,6 +2411,7 @@ extra-packages: - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-api == 2.17.* # required on GHC 8.0.x - haddock-library == 1.2.* # required for haddock-api-2.16.x + - haddock-library == 1.4.3 # required for haddock-api-2.17.x - haddock-library == 1.4.4 # required for haddock-api-2.18.x - happy <1.19.6 # newer versions break Agda - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support @@ -2474,7 +2483,6 @@ package-maintainers: - bson-lens - cased - elm-export-persistent - - pipes-csv - pipes-mongodb - skeletons - streaming-wai @@ -2492,9 +2500,6 @@ package-maintainers: - shakespeare abbradar: - Agda - alunduil: - - network-arbitrary - - network-uri-json dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -3040,6 +3045,7 @@ dont-distribute-packages: aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-ses-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3509,6 +3515,7 @@ dont-distribute-packages: clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] clash: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] + classy-miso: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3962,8 +3969,10 @@ dont-distribute-packages: dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-braille: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4741,6 +4750,7 @@ dont-distribute-packages: github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] github-data: [ i686-linux, x86_64-linux, x86_64-darwin ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + githud: [ i686-linux, x86_64-linux, x86_64-darwin ] gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4912,6 +4922,7 @@ dont-distribute-packages: google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] google-mail-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] google-maps-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-oauth2-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] google-search: [ i686-linux, x86_64-linux, x86_64-darwin ] google-server-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5922,6 +5933,8 @@ dont-distribute-packages: huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6386,6 +6399,7 @@ dont-distribute-packages: lens-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-toml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6505,6 +6519,7 @@ dont-distribute-packages: lmdb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + load-font: [ i686-linux, x86_64-linux, x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6556,6 +6571,7 @@ dont-distribute-packages: lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + ltext: [ i686-linux, x86_64-linux, x86_64-darwin ] ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6990,6 +7006,7 @@ dont-distribute-packages: network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bitcoin: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7008,6 +7025,7 @@ dont-distribute-packages: network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ] network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-uri-json: [ i686-linux, x86_64-linux, x86_64-darwin ] network-uri-static: [ i686-linux, x86_64-linux, x86_64-darwin ] network-voicetext: [ i686-linux, x86_64-linux, x86_64-darwin ] network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7107,6 +7125,7 @@ dont-distribute-packages: octohat: [ i686-linux, x86_64-linux, x86_64-darwin ] octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] + odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] OddWord: [ i686-linux, x86_64-linux, x86_64-darwin ] oden-go-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] odpic-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7372,6 +7391,7 @@ dont-distribute-packages: pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-core: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-fastx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7488,9 +7508,11 @@ dont-distribute-packages: potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] potrace-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + powerqueue-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] powerqueue-levelmem: [ i686-linux, x86_64-linux, x86_64-darwin ] powerqueue-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7928,6 +7950,7 @@ dont-distribute-packages: roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + roku-api: [ i686-linux, x86_64-linux, x86_64-darwin ] roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8170,6 +8193,7 @@ dont-distribute-packages: shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8523,6 +8547,7 @@ dont-distribute-packages: stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8867,6 +8892,7 @@ dont-distribute-packages: tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] traildb: [ i686-linux, x86_64-linux, x86_64-darwin ] trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] + transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] transf: [ i686-linux, x86_64-linux, x86_64-darwin ] transfer-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9175,6 +9201,7 @@ dont-distribute-packages: wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-verbs: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9224,6 +9251,7 @@ dont-distribute-packages: WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 199b9c176542..ef1ebe881f54 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -143,6 +143,8 @@ self: super: builtins.intersectAttrs super { gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; + gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; + taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; }; # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; @@ -202,7 +204,7 @@ self: super: builtins.intersectAttrs super { # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; - # Needs access to locale data, but looks for it in the wrong place. + # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; # Expect to find sendmail(1) in $PATH. @@ -497,4 +499,7 @@ self: super: builtins.intersectAttrs super { LDAP = dontCheck (overrideCabal super.LDAP (drv: { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; })); + + # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 + blank-canvas = dontCheck super.blank-canvas; } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index d528230b77cf..7b512e46da80 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -15,7 +15,7 @@ let haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - inherit stdenv haskellLib ghc buildHaskellPackages extensible-self; + inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; }; commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2f6f5e51c0e8..52d596da701a 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -138,7 +138,7 @@ let (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") - (optionalString (enableExecutableProfiling || enableLibraryProfiling) "--profiling-detail=${profilingDetail}") + (optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") (optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage")) @@ -352,6 +352,7 @@ stdenv.mkDerivation ({ for exeDir in "$out/bin/"*.jsexe; do exe="''${exeDir%.jsexe}" printWords '#!${nodejs}/bin/node' > "$exe" + echo >> "$exe" cat "$exeDir/all.js" >> "$exe" chmod +x "$exe" done diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ac04f2d7ceaa..a28a0b7674aa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -839,6 +839,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "AlgoRhythm" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, derive + , directory, Euterpea, HCodecs, HUnit, kmeans, lilypond, midi, mtl + , prettify, QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers + }: + mkDerivation { + pname = "AlgoRhythm"; + version = "0.1.0.0"; + sha256 = "03rmcafbnbb43fww1y6rfi8dpbl85yi71rjxmz7mqxh4zn5c9jwz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default derive Euterpea HCodecs kmeans + lilypond midi mtl prettify QuickCheck random template-haskell text + transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring derive directory Euterpea HCodecs HUnit lilypond + QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + homepage = "http://github.com/omelkonian/AlgoRhythm/"; + description = "Algorithmic music composition"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "AlgorithmW" = callPackage ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { @@ -2497,7 +2526,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_2_0_0" = callPackage + "Cabal_2_2_0_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, binary , bytestring, containers, deepseq, Diff, directory, filepath , integer-logarithms, mtl, optparse-applicative, parsec, pretty @@ -2507,10 +2536,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "2.2.0.0"; - sha256 = "0bq4zgfvwlqjgsnph61pllvwhfmn8z224ycplqziyxc3zmwb3a96"; - revision = "1"; - editedCabalFile = "1fa2lvwj1b0yj06k8pb3smdhdyl94dxy9ac9jqmmj9cdv8msrb8x"; + version = "2.2.0.1"; + sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty process text time transformers unix @@ -5217,6 +5244,8 @@ self: { pname = "FPretty"; version = "1.1"; sha256 = "0hpbm11z95wfh0i1dp2c35maksnz0zxpz9vbxq6f5c13x4i03b5q"; + revision = "1"; + editedCabalFile = "0d6mjr7b37f5bgjijjgx4x4fgfmkbhksphzkaf0p5jyzxp45fasc"; libraryHaskellDepends = [ base containers ]; homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html"; description = "Efficient simple pretty printing combinators"; @@ -6079,6 +6108,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GLFW-b_1_4_8_4" = callPackage + ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "GLFW-b"; + version = "1.4.8.4"; + sha256 = "1xww650q80ii9f80v9kpz56lwgd1cirvhqjdca1vq9xs8k30hfd0"; + libraryHaskellDepends = [ base bindings-GLFW deepseq ]; + testHaskellDepends = [ + base bindings-GLFW deepseq HUnit test-framework + test-framework-hunit + ]; + description = "Bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GLFW-b-demo" = callPackage ({ mkDerivation, base, GLFW-b, mtl, OpenGL, pretty, stm , transformers @@ -6169,8 +6216,8 @@ self: { ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; - version = "2.0.0.3"; - sha256 = "1vncyxaqyc7apw42wkpyxinyvzgzcnx6x858x4z15h5qq70ghb2q"; + version = "2.0.0.4"; + sha256 = "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq"; libraryHaskellDepends = [ base OpenGLRaw transformers ]; librarySystemDepends = [ libGL libGLU ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -6184,8 +6231,8 @@ self: { }: mkDerivation { pname = "GLUT"; - version = "2.7.0.12"; - sha256 = "1dgix79r8jdp0b2ncx14v6abaqcanr3y91h1zr954vl3kyyidxb6"; + version = "2.7.0.13"; + sha256 = "1j5sv95fy0fv1n57qxhkdqm20q0lj4h5x3r7php9jh70wl77q89x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6203,8 +6250,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.10.0"; - sha256 = "0n1yfcjl2akg53zjxlqm37k1ypbfd4p60kbc0wv1v4mq1yasf5m0"; + version = "0.10.1"; + sha256 = "08qsa22xhw4cdhdzc8ixlwjazi9s0n48395g4vf5qwfap9r8rdq3"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -8636,18 +8683,16 @@ self: { "HStringTemplate" = callPackage ({ mkDerivation, array, base, blaze-builder, bytestring, containers , deepseq, directory, filepath, mtl, old-locale, parsec, pretty - , syb, template-haskell, text, time, void + , semigroups, syb, template-haskell, text, time, void }: mkDerivation { pname = "HStringTemplate"; - version = "0.8.6"; - sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh"; - revision = "1"; - editedCabalFile = "05j23rsll9xxj92gk1qvaksd9z985fpdmbp8mv73ywwjl29kfwyb"; + version = "0.8.7"; + sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory - filepath mtl old-locale parsec pretty syb template-haskell text - time void + filepath mtl old-locale parsec pretty semigroups syb + template-haskell text time void ]; description = "StringTemplate implementation in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -8692,8 +8737,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.13.2.2"; - sha256 = "1fn3w53rylaqmkhwi801phiwlkl7yp9mnj79dbwfb6b6g5mrzd0x"; + version = "0.13.2.4"; + sha256 = "1xibrzs465hg9snwvl6gp6hll6g6c7m8s2ckk8vkfg386pywmi9n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8712,7 +8757,7 @@ self: { ]; homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; }) {}; "HTTP" = callPackage @@ -10384,25 +10429,6 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "1.0.1"; - sha256 = "01s2lml150mcb9qfaq0i19fx8ri19c0dba3rzl0q9w30kv8ykxyz"; - libraryHaskellDepends = [ - aeson attoparsec base iproute network network-info random text - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/MichelBoucey/IPv6Addr"; - description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "IPv6Addr_1_0_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network - , network-info, random, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "IPv6Addr"; version = "1.0.2"; sha256 = "09gb38m1fw0a1x8saldgsd5x58ycqirk8h6z8dqzpcd7vz23vayn"; libraryHaskellDepends = [ @@ -10414,7 +10440,6 @@ self: { homepage = "https://github.com/MichelBoucey/IPv6Addr"; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IPv6DB" = callPackage @@ -10425,36 +10450,6 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.5"; - sha256 = "0n8998fkdp6p1gr5j7kg0xfkh88cxmqiwxzh75q0xmkasphx4yfq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring fast-logger hedis http-types IPv6Addr mtl - optparse-applicative text unordered-containers vector wai - wai-logger warp - ]; - testHaskellDepends = [ - aeson base hspec http-client http-types vector - ]; - homepage = "http://ipv6db.cybervisible.com"; - description = "A RESTful Web Service for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "IPv6DB_0_2_6" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger - , hedis, hspec, http-client, http-types, IPv6Addr, mtl - , optparse-applicative, text, unordered-containers, vector, wai - , wai-logger, warp - }: - mkDerivation { - pname = "IPv6DB"; version = "0.2.6"; sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4"; isLibrary = true; @@ -10975,8 +10970,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.1.2"; sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; - revision = "2"; - editedCabalFile = "04g0yga3v0922aysqv2m2h7vxbaaxfdb7lafsakpzlp0w659f930"; + revision = "3"; + editedCabalFile = "0z1ks049q9jsc5ysh12idkqf3rz0bnvv74rhlaw24r5q2xj8lv8i"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -13670,6 +13665,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ONC-RPC" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cereal, containers + , filepath, haskell-src-exts, network, parsec, random, time, unix + , vector + }: + mkDerivation { + pname = "ONC-RPC"; + version = "0.1"; + sha256 = "19smd0rp0jx9i59jgjk149g4czpwjx173szhp1z9dvm5j0pdwyy5"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal cereal containers filepath haskell-src-exts + parsec vector + ]; + libraryHaskellDepends = [ + base bytestring Cabal cereal containers filepath haskell-src-exts + network parsec random time unix vector + ]; + executableHaskellDepends = [ base filepath ]; + description = "ONC RPC (aka Sun RPC) and XDR library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "OSM" = callPackage ({ mkDerivation, base, comonad-transformers, containers, data-lens , hxt, newtype @@ -13763,26 +13782,32 @@ self: { }) {}; "Octree" = callPackage - ({ mkDerivation, AC-Vector, base, QuickCheck }: + ({ mkDerivation, base, criterion, deepseq, ghc-prim, lens, linear + , QuickCheck + }: mkDerivation { pname = "Octree"; - version = "0.5.4.4"; - sha256 = "0a5mikif0pd2ps5na2wahbl4l0259sdgih34m417j6a24qr1skjs"; - libraryHaskellDepends = [ AC-Vector base QuickCheck ]; - testHaskellDepends = [ AC-Vector base QuickCheck ]; + version = "0.6.0.0"; + sha256 = "1inyjclxx856gxrxdph649s5kdy2xf0lwr8g57rkqnpqpmprj797"; + libraryHaskellDepends = [ base deepseq lens linear QuickCheck ]; + testHaskellDepends = [ base deepseq lens linear QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq ghc-prim lens linear QuickCheck + ]; homepage = "https://github.com/mgajda/octree"; description = "Simple unbalanced Octree for storing data about 3D points"; license = stdenv.lib.licenses.bsd3; }) {}; "OddWord" = callPackage - ({ mkDerivation, base, QuickCheck }: + ({ mkDerivation, base, criterion, QuickCheck }: mkDerivation { pname = "OddWord"; - version = "1.0.1.0"; - sha256 = "0aa3pp2ivbddn3632cnkxd3bj8373ns1nf4v2jvz7zcijiz4chx1"; + version = "1.0.1.1"; + sha256 = "0sb0hmvvp6cdxf8siqfp7wvcxq8rbiz7h9mxmbkcksscjp8m02mm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://www.gekkou.co.uk/"; description = "Provides a wrapper for deriving word types with fewer bits"; license = stdenv.lib.licenses.bsd3; @@ -13845,6 +13870,8 @@ self: { pname = "OneTuple"; version = "0.2.1"; sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; + revision = "1"; + editedCabalFile = "1kb7f21n9vwwrk4kipqdwdqs94k34zai6yy0kgdn22zi442yicjh"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -13968,8 +13995,8 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "3.0.2.0"; - sha256 = "1yqf8li6h2cwd7s3n99afmqyx628v9xkrf6jy8n4sqadf9cr9ags"; + version = "3.0.2.1"; + sha256 = "1gsrlp2if5zwq0icjmsmva3cj719qpwagsmg6dlvps0xj4dqkjvs"; libraryHaskellDepends = [ base bytestring containers GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -14289,6 +14316,8 @@ self: { pname = "PSQueue"; version = "1.1"; sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58"; + revision = "1"; + editedCabalFile = "0gpx33bkhpwya7prnqzwpbnylm4v4nm4x8m02ggmj7d6rkklb2qq"; libraryHaskellDepends = [ base ]; description = "Priority Search Queue"; license = stdenv.lib.licenses.bsd3; @@ -15768,8 +15797,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.2.3"; - sha256 = "1imsk1dv5dksicnhmnzz5ldq84plbcg4qlwccsqvb6jg9j5vf6v6"; + version = "0.7.3"; + sha256 = "0y92h3mjsr1vjcxc06lh1lvszicf53l1bzdaci5mjb5gmiq8f2px"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -16581,10 +16610,8 @@ self: { }: mkDerivation { pname = "SciFlow"; - version = "0.6.0"; - sha256 = "1b57sa2gx3jj00239sq62qmywjykc80lkk587lwzrdp9w5ycl4sb"; - revision = "1"; - editedCabalFile = "1nsakdi9y5nnwm8x9f2a1cvf55k0wnva3wkd9nmz9my8mlk2jfi3"; + version = "0.6.1"; + sha256 = "0axwf7rdwhl3ppq6qlxrffzbzbwvb8q0ygpnlzc2yvksiqzp9h2g"; libraryHaskellDepends = [ aeson base bytestring cereal cereal-text containers data-default-class directory exceptions executable-path fgl @@ -19868,17 +19895,18 @@ self: { }) {}; "YamlReference" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, dlist - , hashmap, HUnit, mtl, regex-compat + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , dlist, hashmap, HUnit, mtl, regex-compat }: mkDerivation { pname = "YamlReference"; version = "0.10.0"; sha256 = "01cjddbg98vs1bd66n0v58i415kqn7cfi6cslk384p7j2ivwv2ad"; - revision = "1"; - editedCabalFile = "1pcrd8ww4fm9big1bcafkmsl9kifixkyny9b3z172w8yhamk2wwq"; + revision = "2"; + editedCabalFile = "023997365188qvgrfg8wshmmlrjr7z435329pxcsvmfcywnc739a"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers dlist regex-compat ]; @@ -19909,6 +19937,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Yampa_0_11" = callPackage + ({ mkDerivation, base, deepseq, random }: + mkDerivation { + pname = "Yampa"; + version = "0.11"; + sha256 = "0frybgsj73r57rd6ckv9pgd9ff1g72qrlad90plb13cf2s6jdp3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq random ]; + testHaskellDepends = [ base ]; + homepage = "http://www.haskell.org/haskellwiki/Yampa"; + description = "Library for programming hybrid systems"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Yampa-core" = callPackage ({ mkDerivation, base, deepseq, random, vector-space }: mkDerivation { @@ -20347,26 +20391,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "accelerate-arithmetic" = callPackage - ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck - , utility-ht + "accelerate_1_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans + , bytestring, Cabal, cabal-doctest, constraints, containers + , cryptonite, deepseq, directory, doctest, exceptions, filepath + , ghc-prim, half, hashable, hashtables, hedgehog, lens, mtl, tasty + , tasty-expected-failure, tasty-hedgehog, tasty-hunit + , template-haskell, terminal-size, transformers, unique, unix + , unordered-containers, vector }: mkDerivation { - pname = "accelerate-arithmetic"; - version = "1.0"; - sha256 = "0gqclqxsa3vbv34h3sgbmhfnx646ipanhnf8xhq160w5ha0ng932"; + pname = "accelerate"; + version = "1.2.0.0"; + sha256 = "0y8wx09smrcxkyyklrf4lrilqasbmaw1w1ga9y110bqgywkw4pmj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - accelerate accelerate-utility base QuickCheck utility-ht - ]; - testHaskellDepends = [ - accelerate accelerate-utility base QuickCheck + ansi-terminal ansi-wl-pprint base base-orphans bytestring + constraints containers cryptonite deepseq directory exceptions + filepath ghc-prim half hashable hashtables hedgehog lens mtl tasty + tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell + terminal-size transformers unique unix unordered-containers vector ]; - homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/"; - description = "Linear algebra and interpolation using the Accelerate framework"; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/AccelerateHS/accelerate/"; + description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "accelerate-arithmetic_1_0_0_1" = callPackage + "accelerate-arithmetic" = callPackage ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck , utility-ht }: @@ -20383,7 +20436,6 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/"; description = "Linear algebra and interpolation using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-bignum" = callPackage @@ -20396,8 +20448,8 @@ self: { pname = "accelerate-bignum"; version = "0.1.0.0"; sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w"; - revision = "1"; - editedCabalFile = "0gwfw6bzy00spi0nm82p63fjc7sigk733ysnla64znqilca8nrmv"; + revision = "2"; + editedCabalFile = "00s0n5jqahn15m8x81chavv8blzjjb8z6368pl3diaadd8bi8hsv"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell @@ -20416,6 +20468,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-bignum_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion + , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty + , tasty-hedgehog, template-haskell, vector, vector-th-unbox + , wide-word + }: + mkDerivation { + pname = "accelerate-bignum"; + version = "0.2.0.0"; + sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx + base criterion mwc-random vector vector-th-unbox wide-word + ]; + homepage = "https://github.com/tmcdonell/accelerate-bignum"; + description = "Fixed-length large integer arithmetic for Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-blas" = callPackage ({ mkDerivation, accelerate, accelerate-llvm , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs @@ -20446,6 +20527,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-blas_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs + , bytestring, containers, criterion, cublas, cuda, deepseq + , file-embed, hedgehog, hmatrix, llvm-hs-pure, mtl, mwc-random + , mwc-random-accelerate, tasty, tasty-hedgehog + }: + mkDerivation { + pname = "accelerate-blas"; + version = "0.2.0.0"; + sha256 = "0y77wsdw0i7b5bzlfrrn9q4d8q95r8z71g8qy77n24db1pwmjqy9"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda + file-embed llvm-hs-pure mtl + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base + criterion deepseq hmatrix mwc-random mwc-random-accelerate + ]; + description = "Numeric Linear Algebra in Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-cublas" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda , accelerate-io, accelerate-utility, base, cublas, cuda, hmatrix @@ -20523,22 +20633,20 @@ self: { "accelerate-examples" = callPackage ({ mkDerivation, accelerate, accelerate-fft, accelerate-io - , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint - , array, base, binary, bmp, bytestring, bytestring-lexing, cereal + , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base + , binary, bmp, bytestring, bytestring-lexing, cereal , colour-accelerate, containers, criterion, directory, fclabels , filepath, gloss, gloss-accelerate, gloss-raster-accelerate , gloss-rendering, HUnit, lens-accelerate, linear , linear-accelerate, matrix-market-attoparsec, mwc-random - , normaldistribution, pipes, QuickCheck, random, repa, repa-io - , scientific, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector, vector-algorithms + , normaldistribution, QuickCheck, random, repa, repa-io, scientific + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.1.0.0"; - sha256 = "0zpjmk6v314jfda7fy22xghfqlqfh8vyf938qwyp6xjf1mpq1r1x"; - revision = "3"; - editedCabalFile = "1ir5i8skpyzpvwa17yw02j9rn9c5qjjincwrnjdwaixcdc7lsy4b"; + version = "1.2.0.0"; + sha256 = "1gb4m1ri461f78x913ipxh14ybwl9wzbv81w8943whiwrmb3p5pc"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; @@ -20549,14 +20657,13 @@ self: { test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-fft accelerate-io array base binary bmp - bytestring bytestring-lexing cereal colour-accelerate containers - criterion directory fclabels filepath gloss gloss-accelerate - gloss-raster-accelerate gloss-rendering HUnit lens-accelerate + accelerate accelerate-fft accelerate-io base binary bmp bytestring + bytestring-lexing cereal colour-accelerate containers criterion + directory fclabels filepath gloss gloss-accelerate + gloss-raster-accelerate gloss-rendering lens-accelerate linear-accelerate matrix-market-attoparsec mwc-random - normaldistribution pipes QuickCheck random repa repa-io scientific - test-framework test-framework-hunit test-framework-quickcheck2 - vector vector-algorithms + normaldistribution random repa repa-io scientific vector + vector-algorithms ]; homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; @@ -20584,23 +20691,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "accelerate-fftw" = callPackage - ({ mkDerivation, accelerate, accelerate-io, base, carray, fft - , storable-complex + "accelerate-fft_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, bytestring + , carray, containers, cuda, cufft, fft, file-embed, hashable + , hedgehog, lens-accelerate, mtl, tasty, tasty-hedgehog + , unordered-containers }: mkDerivation { - pname = "accelerate-fftw"; - version = "1.0"; - sha256 = "0b4jr7v3jllvlis0f554l9289zm07ddjgp5q2rp5l47rmsmaak7z"; + pname = "accelerate-fft"; + version = "1.2.0.0"; + sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp"; libraryHaskellDepends = [ - accelerate accelerate-io base carray fft storable-complex + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base bytestring carray containers cuda cufft + fft file-embed hashable lens-accelerate mtl unordered-containers ]; - homepage = "http://hub.darcs.net/thielema/accelerate-fftw/"; - description = "Accelerate frontend to the FFTW library (Fourier transform)"; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + homepage = "https://github.com/AccelerateHS/accelerate-fft"; + description = "FFT using the Accelerate library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "accelerate-fftw_1_0_0_1" = callPackage + "accelerate-fftw" = callPackage ({ mkDerivation, accelerate, accelerate-io, base, carray, fft , storable-complex }: @@ -20614,7 +20731,6 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-fftw/"; description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier" = callPackage @@ -20624,32 +20740,6 @@ self: { }: mkDerivation { pname = "accelerate-fourier"; - version = "1.0.0.4"; - sha256 = "1263ximbciszb6cij232vxsxfj5rj7n77l88fd7vh6ayx7rrr45m"; - libraryHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-utility base containers - QuickCheck transformers utility-ht - ]; - testHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-utility base QuickCheck - utility-ht - ]; - benchmarkHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-llvm-native - accelerate-utility base criterion utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; - description = "Fast Fourier transform and convolution using the Accelerate framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "accelerate-fourier_1_0_0_5" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic - , accelerate-llvm-native, accelerate-utility, base, containers - , criterion, QuickCheck, transformers, utility-ht - }: - mkDerivation { - pname = "accelerate-fourier"; version = "1.0.0.5"; sha256 = "03bbs6k6mn76nsgjhi823mzmhl3fsgyqjqix9wsslj8jh2vg3kr8"; libraryHaskellDepends = [ @@ -20667,7 +20757,6 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; description = "Fast Fourier transform and convolution using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier-benchmark" = callPackage @@ -20698,6 +20787,8 @@ self: { pname = "accelerate-io"; version = "1.0.0.1"; sha256 = "1q3l4k4h6p8y9w6qzxjanm5ww3ncz236fna2kqdqndyv18b8v9pm"; + revision = "1"; + editedCabalFile = "1qf7f1swy5h1fqaciw1swvwrvmqrcmi03v0vqsx6ccxf2zxcjlal"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; @@ -20706,6 +20797,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate-io_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog + , primitive, repa, tasty, tasty-hedgehog, vector + }: + mkDerivation { + pname = "accelerate-io"; + version = "1.2.0.0"; + sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; + libraryHaskellDepends = [ + accelerate array base bmp bytestring primitive repa vector + ]; + testHaskellDepends = [ + accelerate array base hedgehog tasty tasty-hedgehog vector + ]; + homepage = "https://github.com/AccelerateHS/accelerate-io"; + description = "Read and write Accelerate arrays in various formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-llvm" = callPackage ({ mkDerivation, abstract-deque, accelerate, base, bytestring , chaselev-deque, containers, data-default-class, deepseq @@ -20729,6 +20840,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate-llvm_1_2_0_0" = callPackage + ({ mkDerivation, abstract-deque, accelerate, base, bytestring + , chaselev-deque, containers, data-default-class, deepseq + , directory, dlist, exceptions, filepath, llvm-hs, llvm-hs-pure + , mtl, mwc-random, primitive, template-haskell + , unordered-containers, vector + }: + mkDerivation { + pname = "accelerate-llvm"; + version = "1.2.0.0"; + sha256 = "110zfxqi0lkhg7pk42qvd87qn442r6z264zj7q46jf8ia60l2cdq"; + libraryHaskellDepends = [ + abstract-deque accelerate base bytestring chaselev-deque containers + data-default-class deepseq directory dlist exceptions filepath + llvm-hs llvm-hs-pure mtl mwc-random primitive template-haskell + unordered-containers vector + ]; + description = "Accelerate backend component generating LLVM IR"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , c2hs, Cabal, cereal, containers, directory, dlist, fclabels @@ -20751,6 +20884,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate-llvm-native_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc + , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, mtl + , template-haskell, time, unique, unix, vector + }: + mkDerivation { + pname = "accelerate-llvm-native"; + version = "1.2.0.0"; + sha256 = "089j8ic6ns6656a55byiilrj9jvs535jvx4f2m8x1qhgz9q968vb"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring Cabal cereal containers + directory dlist filepath ghc ghc-prim hashable libffi llvm-hs + llvm-hs-pure mtl template-haskell time unique unix vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ accelerate base ]; + description = "Accelerate backend for multicore CPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-llvm-ptx" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , containers, cuda, deepseq, directory, dlist, fclabels, file-embed @@ -20772,6 +20927,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-llvm-ptx_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , containers, cuda, deepseq, directory, dlist, file-embed, filepath + , hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty, process + , template-haskell, time, unordered-containers + }: + mkDerivation { + pname = "accelerate-llvm-ptx"; + version = "1.2.0.0"; + sha256 = "1rh0kq10mwn4zd8f5sp19pah2hmmcansaqqssz79183znzfiviz5"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring containers cuda deepseq + directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure + mtl nvvm pretty process template-haskell time unordered-containers + ]; + testHaskellDepends = [ accelerate base ]; + description = "Accelerate backend for NVIDIA GPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-random" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -20811,25 +20987,12 @@ self: { ({ mkDerivation, accelerate, base, utility-ht }: mkDerivation { pname = "accelerate-utility"; - version = "1.0"; - sha256 = "16ir7ra99dhk04sg7ap7wwsbazdnadsnkd0ggq60j5cr2jp7x6lk"; - libraryHaskellDepends = [ accelerate base utility-ht ]; - homepage = "http://hub.darcs.net/thielema/accelerate-utility/"; - description = "Utility functions for the Accelerate framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "accelerate-utility_1_0_0_1" = callPackage - ({ mkDerivation, accelerate, base, utility-ht }: - mkDerivation { - pname = "accelerate-utility"; version = "1.0.0.1"; sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh"; libraryHaskellDepends = [ accelerate base utility-ht ]; homepage = "http://hub.darcs.net/thielema/accelerate-utility/"; description = "Utility functions for the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accentuateus" = callPackage @@ -21983,7 +22146,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_3_0_0" = callPackage + "aeson_1_3_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable @@ -21995,8 +22158,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.3.0.0"; - sha256 = "1glrwccp5hi9zn8d34761zinvpmbd4dsbgzqg2qxk6glp928phna"; + version = "1.3.1.0"; + sha256 = "0ljndkgibz3qbddz2451v1r9w8i440kpslg3al3m7gc82mxz2xrr"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text @@ -22117,8 +22280,8 @@ self: { pname = "aeson-compat"; version = "0.3.7.1"; sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r"; - revision = "2"; - editedCabalFile = "0pwa5r0nkc9c80ky3iqki6hvcd5ifw2rd6yj27h66r3jyk2h2qhz"; + revision = "3"; + editedCabalFile = "1smql0v6b9f4pb3jnrm8kspyq2ygvznk1wkhzp0x7bjd7psrnmy9"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -22164,6 +22327,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-diff-generic" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring + , containers, dlist, hashable, scientific, tagged, template-haskell + , text, th-abstraction, time, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "aeson-diff-generic"; + version = "0.0.2"; + sha256 = "0dm2rzww9rc6l3ql42px96fpsfjvw9g0w13j0y02dq33qb0w7a1v"; + libraryHaskellDepends = [ + aeson aeson-diff base base-compat bytestring containers dlist + hashable scientific tagged template-haskell text th-abstraction + time unordered-containers uuid-types vector + ]; + description = "Apply a json-patch to any haskell datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-extra" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec , attoparsec-iso8601, base, base-compat, bytestring, containers @@ -22468,6 +22650,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-pretty_0_8_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , cmdargs, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-pretty"; + version = "0.8.7"; + sha256 = "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring scientific text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring cmdargs + ]; + homepage = "http://github.com/informatikr/aeson-pretty"; + description = "JSON pretty-printing library and command-line tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-qq" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim , haskell-src-meta, hspec, parsec, scientific, template-haskell @@ -22676,8 +22881,8 @@ self: { pname = "aeson-utils"; version = "0.3.0.2"; sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi"; - revision = "5"; - editedCabalFile = "0v6p99nb8s61lc07a93xv94lfb4ybmv8aiqjq77lncs6qgpp97xf"; + revision = "6"; + editedCabalFile = "06jpkp95sicqv9kjasgwwd89kfrnz37402ppvgg5567sbg1wm9zh"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -23095,14 +23300,15 @@ self: { "aivika" = callPackage ({ mkDerivation, array, base, binary, containers, deepseq, mtl - , mwc-random, random, vector + , mwc-random, random, semigroups, vector }: mkDerivation { pname = "aivika"; - version = "5.5"; - sha256 = "0phzdgdxcdzdvgllp7c3b8bffdr8xhpid0yify7yrpnxc4y4rw5s"; + version = "5.6"; + sha256 = "0gri5kwzw2a9fjcr7924kdaxgs9zl4j8brgknwyxrky0p93a8zry"; libraryHaskellDepends = [ - array base binary containers deepseq mtl mwc-random random vector + array base binary containers deepseq mtl mwc-random random + semigroups vector ]; homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; @@ -23132,8 +23338,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "1.1.2"; - sha256 = "15ixv4zzb03wiijx5g7l9csawfihklsh1jnphnwb6j8d1kpmmh5v"; + version = "1.2"; + sha256 = "092jril2vfi90bbi9wc2ir4gidqzq0w84mgbgz72icx63nni1ah0"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -23266,14 +23472,15 @@ self: { "aivika-transformers" = callPackage ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random - , random, vector + , random, semigroups, vector }: mkDerivation { pname = "aivika-transformers"; - version = "5.5"; - sha256 = "09q221ayhfx5h51cc0h8lsx4b1cnzk3bssr5bf28xixaf3j4faj5"; + version = "5.6"; + sha256 = "0vy3d4vldifiwc12j6746axhb1k3ir703wzgycvk4xn60qhjp4g9"; libraryHaskellDepends = [ - aivika array base containers mtl mwc-random random vector + aivika array base containers mtl mwc-random random semigroups + vector ]; homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; @@ -23389,17 +23596,15 @@ self: { "alex" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process - , QuickCheck }: mkDerivation { pname = "alex"; - version = "3.2.3"; - sha256 = "0bi1cs9b8ir33h1fl6x2xw4ymygapqbr713ridpf7rmk2wa7jqqs"; + version = "3.2.4"; + sha256 = "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - array base containers directory QuickCheck - ]; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers directory ]; executableToolDepends = [ happy ]; testHaskellDepends = [ base process ]; homepage = "http://www.haskell.org/alex/"; @@ -23611,6 +23816,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs_0_1_1" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, containers + , criterion, deepseq, extra, QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.1.1"; + sha256 = "085yb222gh5chlpa4xylvf1wfnsdhrm1fha4jvj5bsjlx9kyr4ah"; + libraryHaskellDepends = [ + array base base-compat containers deepseq + ]; + testHaskellDepends = [ + base base-compat base-orphans containers extra QuickCheck + ]; + benchmarkHaskellDepends = [ + base base-compat containers criterion + ]; + homepage = "https://github.com/snowleopard/alga"; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -24062,6 +24290,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "alto" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, cryptohash-sha256, directory, exceptions, filepath + , lens, list-tries, MonadRandom, mtl, random, random-string, scrypt + , servant-server, text, warp + }: + mkDerivation { + pname = "alto"; + version = "0"; + sha256 = "0515cghmkrw5szbnafwp3mqglrg5c44cbly8jnvk9z9gf9kdr26k"; + revision = "1"; + editedCabalFile = "0vxcy55zx70ibws59d1n5p86awrhb83xb06yw6iz0hkp7cwk52i2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers + cryptohash-sha256 directory exceptions filepath lens list-tries + MonadRandom mtl random random-string scrypt servant-server text + ]; + executableHaskellDepends = [ base warp ]; + homepage = "https://oss.xkcd.com/"; + description = "Implement a menu experience fit for web users"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alure" = callPackage ({ mkDerivation, alure, base, OpenAL }: mkDerivation { @@ -27949,6 +28202,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apply-refact_0_5_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.5.0.0"; + sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apportionment" = callPackage ({ mkDerivation, base, containers, utility-ht }: mkDerivation { @@ -28089,24 +28374,23 @@ self: { "arbtt" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , bytestring-progress, conduit, conduit-extra, containers, deepseq - , directory, exceptions, filepath, mtl, parsec, pcre-light - , process-extras, strict, tasty, tasty-golden, tasty-hunit - , terminal-progress-bar, time, transformers, unix, utf8-string, X11 + , bytestring-progress, conduit, containers, deepseq, directory + , exceptions, filepath, mtl, parsec, pcre-light, process-extras + , resourcet, strict, tasty, tasty-golden, tasty-hunit + , terminal-progress-bar, text, time, transformers, unix + , unliftio-core, utf8-string, X11 }: mkDerivation { pname = "arbtt"; - version = "0.10"; - sha256 = "0klxsxyq4yij11c9z11jgrarmz1fya2rpx0zax7kqpvc26xbc24n"; - revision = "1"; - editedCabalFile = "13a0qvaqlaw6pcg4dizvs6p2g2kjabgznkl6789dw21nry2xqynb"; + version = "0.10.0.1"; + sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson array attoparsec base binary bytestring bytestring-progress - conduit conduit-extra containers deepseq directory exceptions - filepath mtl parsec pcre-light strict terminal-progress-bar time - transformers unix utf8-string X11 + conduit containers deepseq directory exceptions filepath mtl parsec + pcre-light resourcet strict terminal-progress-bar text time + transformers unix unliftio-core utf8-string X11 ]; testHaskellDepends = [ base binary bytestring containers deepseq directory mtl parsec @@ -28115,7 +28399,7 @@ self: { ]; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28340,19 +28624,18 @@ self: { }) {}; "argon2" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, tasty - , tasty-quickcheck, text, transformers + ({ mkDerivation, base, bytestring, deepseq, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text-short }: mkDerivation { pname = "argon2"; - version = "1.2.0"; - sha256 = "1zzwlhb47ykqi6psgnpzmf4nlk5rwr4adpl7sz7x7iacy9xmayd5"; - libraryHaskellDepends = [ base bytestring text transformers ]; + version = "1.3.0.1"; + sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry"; + libraryHaskellDepends = [ base bytestring deepseq text-short ]; testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck text + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/ocharles/argon2.git"; - description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function"; + description = "Memory-hard password hash and proof-of-work function"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28804,8 +29087,8 @@ self: { ({ mkDerivation, base, Stream }: mkDerivation { pname = "arrows"; - version = "0.4.4.1"; - sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v"; + version = "0.4.4.2"; + sha256 = "02db4byzz8xb4c36y0v867g9kd3a9p04r4cj1np717k20qrwjnpn"; libraryHaskellDepends = [ base Stream ]; homepage = "http://www.haskell.org/arrows/"; description = "Arrow classes and transformers"; @@ -29266,8 +29549,8 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; - revision = "2"; - editedCabalFile = "1l5adjj7bianjclqzgvi4qhlb6lvb7v67qfqx2ghk3arq8ifghwj"; + revision = "3"; + editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/mouri111/ast-monad#readme"; @@ -29281,8 +29564,8 @@ self: { pname = "ast-monad-json"; version = "0.1.0.1"; sha256 = "0a0pzcma574rrx6klfgk16y6ng22glwj1l5c3rz5w32a22ildfz6"; - revision = "1"; - editedCabalFile = "05gavjyjxfmw8q8l4dvx2p5vxaszg4kbivknn3pg5495bgd8br9s"; + revision = "2"; + editedCabalFile = "0cbayikyr96vcn10253gkwgk0mvx6inymrldv0bhzp8qiv94sm3n"; libraryHaskellDepends = [ ast-monad base text ]; testHaskellDepends = [ ast-monad base hspec text ]; homepage = "https://github.com/mouri111/ast-monad-json#readme"; @@ -30066,11 +30349,10 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.22"; - sha256 = "19x2pa6fb1k343b4c07xwyc879kfwya1kll0bp59paza1bqhhnnk"; + version = "0.2.0.25"; + sha256 = "0p5pg2ix0ppan0cz4b0pk16ihfcnvqwb8g93k4bh7d304ca5xdk4"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cli-setup ]; executableHaskellDepends = [ ansi-wl-pprint base directory file-embed htoml-megaparsec @@ -30085,27 +30367,27 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, dependency , dhall, directory, file-embed, filemanip, hashable, http-client - , http-client-tls, lens, lzma, mtl, optparse-applicative - , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary - , text, unix, zip-archive, zlib + , http-client-tls, lzma, microlens, microlens-th, mtl + , optparse-applicative, parallel-io, process, shake, shake-ats + , shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.7.1.0"; - sha256 = "0lpyvcj5cki19fs9022yb1wzwis6a89f3i4s03rcll0lvshmxd2q"; + version = "2.10.0.2"; + sha256 = "1rafsa2xc47hgkn6hwyr5bph21xl16i8ajl14pkckwhrs21bk255"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filemanip hashable http-client http-client-tls lens lzma - mtl parallel-io process shake shake-ats shake-ext tar text unix - zip-archive zlib + file-embed filemanip hashable http-client http-client-tls lzma + microlens microlens-th mtl parallel-io process shake shake-ats + shake-ext tar text unix zip-archive zlib ]; executableHaskellDepends = [ - base composition-prelude directory lens optparse-applicative shake - shake-ats temporary text + base composition-prelude directory microlens optparse-applicative + shake shake-ats temporary text ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; @@ -30376,6 +30658,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.0.0.0"; sha256 = "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a"; + revision = "1"; + editedCabalFile = "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"; libraryHaskellDepends = [ attoparsec base base-compat text time ]; homepage = "https://github.com/bos/aeson"; description = "Parsing of ISO 8601 dates, originally from aeson"; @@ -31121,8 +31405,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.2.1.0"; - sha256 = "07gqi33aadb9c94b19z1166ayyi0s95ykda77l53vc2al43sa3bl"; + version = "0.2.1.1"; + sha256 = "1y70ir44kg5awgf3x1sl584ag9ddw0mhgqniwar6lgry2ag4vz9f"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -31134,7 +31418,7 @@ self: { QuickCheck scientific semigroups tagged template-haskell text transformers unordered-containers vector ]; - homepage = "https://github.com/haskell-works/hw-haskell-avro.git"; + homepage = "https://github.com/GaloisInc/avro.git"; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31291,6 +31575,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-cloudfront-signed-cookies" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, base + , base64-bytestring, bytestring, cookie, cryptonite + , optparse-applicative, pem, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "aws-cloudfront-signed-cookies"; + version = "0.1.0.1"; + sha256 = "0321c5pjd6bhvnnn8zzqk23fb14jl89vj1frvikb65iw9f60v7dl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson asn1-encoding asn1-types base base64-bytestring bytestring + cookie cryptonite optparse-applicative pem text time + unordered-containers vector + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/typeclasses/aws-cloudfront-signed-cookies"; + description = "Generate signed cookies for AWS CloudFront"; + license = stdenv.lib.licenses.mit; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -31371,22 +31678,25 @@ self: { }) {}; "aws-easy" = callPackage - ({ mkDerivation, amazonka, amazonka-core, base, bytestring, lens - , resourcet, template-haskell, text + ({ mkDerivation, amazonka, amazonka-dynamodb, amazonka-s3, base + , bytestring, lens, resourcet, split, template-haskell, text + , unordered-containers }: mkDerivation { pname = "aws-easy"; - version = "0.1.0.0"; - sha256 = "0lchj79l606a2wxh72g837ys3nb1628ps03wxm61s5fl49229c0w"; + version = "0.1.0.1"; + sha256 = "0sl3whg7x02c3cph5p72rlkycsr2m3ni0kad5rs0q644wgvhqvm5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - amazonka amazonka-core base bytestring lens resourcet - template-haskell text + amazonka base bytestring lens resourcet template-haskell + ]; + executableHaskellDepends = [ + amazonka amazonka-dynamodb amazonka-s3 base lens split text + unordered-containers ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/rcook/aws-easy#readme"; - description = "AWS Easy: Helper functions for working with amazonka"; + description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -31753,6 +32063,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-ses-easy" = callPackage + ({ mkDerivation, amazonka, amazonka-ses, base, criterion + , exceptions, lens, lucid, mtl, tasty, tasty-hspec, text + , text-conversions + }: + mkDerivation { + pname = "aws-ses-easy"; + version = "0.1.0"; + sha256 = "0wlwff18k1qf6n6q2bhd1n2w58nsdmqx5c1yhhfqxkjyxz9flccn"; + libraryHaskellDepends = [ + amazonka amazonka-ses base exceptions lens lucid mtl text + text-conversions + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/jxv/aws-ses-easy#readme"; + description = "Wrapper over Amazonka's SES"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-sign4" = callPackage ({ mkDerivation, attempt, aws, base, blaze-builder, byteable , bytestring, bytestring-lexing, Cabal, case-insensitive @@ -31996,25 +32327,26 @@ self: { "b9" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory - , filepath, free, hashable, hspec, hspec-expectations, mtl + , filepath, free, hashable, hspec, hspec-expectations, lens, mtl , optparse-applicative, parallel, parsec, pretty, pretty-show - , process, QuickCheck, random, syb, template, text, time + , process, QuickCheck, random, shake, syb, template, text, time , transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "0.5.41"; - sha256 = "1m9fj1x30gl7agzcpklyi6sql8fs7qzpamkp16yihaxas54216ga"; + version = "0.5.43"; + sha256 = "168rgqqnxi8f39dg510nxlh813ch4dkdxxd4rymf09dkn87w1snk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bifunctors binary boxes bytestring conduit - conduit-extra ConfigFile directory filepath free hashable mtl - parallel parsec pretty pretty-show process QuickCheck random syb - template text time transformers unordered-containers vector yaml + conduit-extra ConfigFile directory filepath free hashable lens mtl + parallel parsec pretty pretty-show process QuickCheck random shake + syb template text time transformers unordered-containers vector + yaml ]; executableHaskellDepends = [ - base bytestring directory optparse-applicative + base bytestring directory lens optparse-applicative ]; testHaskellDepends = [ aeson base bytestring hspec hspec-expectations QuickCheck text @@ -32081,8 +32413,8 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.1.3.0"; - sha256 = "0x1vp48dl0dlq1bwaq0fy9k472rpx571i7klrhnwnqf6nb52mh1w"; + version = "0.1.5.0"; + sha256 = "0b99krw1l574bcqxck1bqj5sb0slbm24hd85finv3v725ddy8k7f"; libraryHaskellDepends = [ base deepseq microlens primitive reflection transformers type-combinators vector @@ -32096,6 +32428,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_1_5_1" = callPackage + ({ mkDerivation, base, bifunctors, binary, criterion, deepseq + , directory, hmatrix, lens, microlens, mnist-idx, mwc-random + , primitive, reflection, time, transformers, type-combinators + , vector + }: + mkDerivation { + pname = "backprop"; + version = "0.1.5.1"; + sha256 = "1jii5nwnkh44jxxyfkgm14695ah7p3rpbydcgj84g5ijmhdnmks0"; + libraryHaskellDepends = [ + base binary deepseq microlens primitive reflection transformers + type-combinators vector + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector + ]; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -32560,6 +32916,48 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat_0_10_1" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.10.1"; + sha256 = "0vdv28qylnpqhq6jnhiqvnc0rmbrb0dvnsfdvp094sm7sj9j3v5j"; + libraryHaskellDepends = [ base unix ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "base-compat-batteries" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.10.1"; + sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = stdenv.lib.licenses.mit; + }) {}; + + "base-encoding" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, text + }: + mkDerivation { + pname = "base-encoding"; + version = "0.1.0.0"; + sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring text + ]; + description = "Binary-to-text encodings (e.g. base64)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "base-feature-macros" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -32773,8 +33171,8 @@ self: { pname = "base64-bytestring-type"; version = "1"; sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; - revision = "1"; - editedCabalFile = "06glza5pqw1s3xpk8va36q1b1bfcirkkrcq9pfd8x12lhjjnsxxr"; + revision = "2"; + editedCabalFile = "02ywscryrrh6xwfi0gl4qvxy36jzy7i8y2jsv6mma2av2abr9ms7"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable QuickCheck text @@ -32855,6 +33253,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basen-bytestring" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck }: + mkDerivation { + pname = "basen-bytestring"; + version = "0.1.0.1"; + sha256 = "131aamd4kq7jdmpl4ammgqgykbh81mkziaf0kpic5c20al4a73lp"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + homepage = "https://github.com/FilWisher/basen-bytestring#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { @@ -33055,8 +33465,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.0"; - sha256 = "1p3dxz8a752wc6fmj6kip4gcwj77c96ic5wzlhgv670xsh4ac1qg"; + version = "0.1.0.1"; + sha256 = "1zjjmz36lxxrxgx449212q878mzavjpwx5jad0lk9ninpas16h5v"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -33069,8 +33479,8 @@ self: { ({ mkDerivation, base, battleplace, servant, servant-client }: mkDerivation { pname = "battleplace-api"; - version = "0.1.0.0"; - sha256 = "0hy1y5n064i7g2zknvj7yl7zw3bljqjrfr2sg68cmk9gkd854rlw"; + version = "0.1.0.1"; + sha256 = "1pi1vcniyrpq1xfrizhvgw7xbrc332649zg4jl1fjbqn4l4xqrlg"; libraryHaskellDepends = [ base battleplace servant servant-client ]; @@ -33213,8 +33623,8 @@ self: { }: mkDerivation { pname = "bdcs"; - version = "0.2.1"; - sha256 = "0zlzxh6ps655zryifyzz7pbypv32w6a475ighbc840awkw59qvvy"; + version = "0.3.0"; + sha256 = "1sx5kcb85gyd59lkyjn0wq6nakz68mkwi33n4hwizzw9n9ijllv0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33232,8 +33642,8 @@ self: { libraryPkgconfigDepends = [ ostree ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cond conduit content-store - directory filepath monad-loops mtl network-uri persistent-sqlite - process regex-pcre text time + directory filepath monad-logger monad-loops mtl network-uri + persistent-sqlite process regex-pcre text time ]; testHaskellDepends = [ aeson base bytestring codec-rpm cond conduit conduit-combinators @@ -33243,7 +33653,7 @@ self: { ]; homepage = "https://github.com/weldr/bdcs"; description = "Tools for managing a content store of software packages"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ostree;}; @@ -33315,16 +33725,16 @@ self: { "beam-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist, free - , ghc-prim, hashable, microlens, mtl, network-uri, tasty + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty , tasty-hunit, text, time, vector-sized }: mkDerivation { pname = "beam-core"; - version = "0.6.0.0"; - sha256 = "1pnxmy5xv84fng0391cckizwdrwzh0p0v3g0vc29z5vpksqr24kg"; + version = "0.7.1.0"; + sha256 = "1k4b8a1p9ky6w5b8iwlx7pm57sdy9mj5mxinsazawc0ss3760bjh"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable - microlens mtl network-uri text time vector-sized + microlens mtl network-uri tagged text time vector-sized ]; testHaskellDepends = [ base bytestring tasty tasty-hunit text time @@ -33339,16 +33749,16 @@ self: { ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text - , time, unordered-containers, vector + , time, unordered-containers, uuid, vector }: mkDerivation { pname = "beam-migrate"; - version = "0.2.0.0"; - sha256 = "17c1wh2ygbjlr8hrm0vnk2130kmzy795sswp7wyqkjjhfp4rzyzb"; + version = "0.3.0.0"; + sha256 = "05j051l8zpyzdzm8w9087wj5c6yxv6mmy05asvlw2jhcjxx3j23b"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel - pqueue pretty scientific text time unordered-containers vector + pqueue pretty scientific text time unordered-containers uuid vector ]; homepage = "https://travis.athougies.net/projects/beam.html"; description = "SQL DDL support and migrations support library for Beam"; @@ -33356,22 +33766,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-postgres" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring + , case-insensitive, conduit, free, hashable, haskell-src-exts + , lifted-base, monad-control, mtl, network-uri, postgresql-libpq + , postgresql-simple, scientific, text, time, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "beam-postgres"; + version = "0.3.1.0"; + sha256 = "1nv7r50b4khx1ski5c64dywphzbn1x9xx9hp8b8zfh88i05b5jf6"; + libraryHaskellDepends = [ + aeson base beam-core beam-migrate bytestring case-insensitive + conduit free hashable haskell-src-exts lifted-base monad-control + mtl network-uri postgresql-libpq postgresql-simple scientific text + time unordered-containers uuid vector + ]; + homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres"; + description = "Connection layer between beam and postgres"; + license = stdenv.lib.licenses.mit; + }) {}; + "beam-sqlite" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate , bytestring, dlist, free, hashable, mtl, network-uri, scientific - , sqlite-simple, text, time + , sqlite-simple, text, time, unix }: mkDerivation { pname = "beam-sqlite"; - version = "0.2.0.0"; - sha256 = "0a0z5nrgrc3m7c4b81avjnkf2y5i30z5yws0jrsw5gg2b682v0ry"; + version = "0.3.1.0"; + sha256 = "1frbic90nwxk8mr8s1agvx5s1v5aqfnr7sijb602spdz4hhsqsvy"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free - hashable mtl network-uri scientific sqlite-simple text time + hashable mtl network-uri scientific sqlite-simple text time unix ]; homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-sqlite/"; description = "Beam driver for SQLite"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -33765,6 +34197,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "betris" = callPackage + ({ mkDerivation, base, containers, lens, linear, random, stm + , stm-chans, vty + }: + mkDerivation { + pname = "betris"; + version = "0.1.0.0"; + sha256 = "1qn326s4xydvvgmrhqi48cc2pl9b3mp7swc82qk59gj7cx4dx222"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers lens linear random stm stm-chans vty + ]; + executableHaskellDepends = [ + base containers lens linear random stm stm-chans vty + ]; + homepage = "https://github.com/mlang/betris#readme"; + description = "Braille friendly vertical version of tetris"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "between" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33854,8 +34307,8 @@ self: { }: mkDerivation { pname = "bhoogle"; - version = "0.1.2.5"; - sha256 = "16i5gf8iv0l10zira8wi9lgbz0q1f7lxp35ml9yz4j8cihn7z7ji"; + version = "0.1.2.6"; + sha256 = "0p6zh1rh80hzrm36w6d5hr6qjkfc71cr96dk9shrndnxlp8vlxsn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34838,6 +35291,32 @@ self: { inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; + "bindings-GLFW_3_2_1_0" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 + , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr + , libXxf86vm, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.2.1.0"; + sha256 = "1sbbms17yyrv5cmf584bc5k4bh8l2vrrhkz2693nyhkadvjxiavb"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ + libGL libX11 libXcursor libXext libXfixes libXi libXinerama + libXrandr libXxf86vm + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXxf86vm;}; + "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: mkDerivation { @@ -35555,10 +36034,8 @@ self: { ({ mkDerivation, base, binary, bytestring, rank1dynamic }: mkDerivation { pname = "bindynamic"; - version = "1.0.0.0"; - sha256 = "0vi4wyxx4qvfrhir8p66h5laqq2m1q3dh3i0syjfd6vaxa9c7sgi"; - revision = "1"; - editedCabalFile = "1rd7l106zka0hndbixmr3wzdj8gx6vwhlaaxkn170kprf4xs3p6j"; + version = "1.0.0.1"; + sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; homepage = "https://github.com/lspitzner/bindynamic"; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; @@ -35743,22 +36220,22 @@ self: { , bytestring-lexing, case-insensitive, clustering, conduit , conduit-combinators, containers, criterion, data-default-class , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit - , IntervalMap, math-functions, matrices, mtl, parallel, primitive - , random, split, statistics, tasty, tasty-golden, tasty-hunit, text - , transformers, unordered-containers, vector, vector-algorithms - , word8 + , IntervalMap, lens, math-functions, matrices, mtl, parallel + , primitive, random, split, statistics, tasty, tasty-golden + , tasty-hunit, text, transformers, unordered-containers, vector + , vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.4.1"; - sha256 = "0kqj88g1fx17xbdy6h56xl4qpgk6xvyfqwnvjvi4ha4rw7dhddxr"; + version = "0.5.0"; + sha256 = "1nb549w2rzc9psdnz8xbma0qgm2hj4svrlm3x8vc2i1dklmljmvr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring bytestring-lexing case-insensitive clustering conduit containers data-default-class data-ordlist double-conversion hexpat HsHTSLib http-conduit - IntervalMap math-functions matrices mtl parallel primitive split - statistics text transformers unordered-containers vector + IntervalMap lens math-functions matrices mtl parallel primitive + split statistics text transformers unordered-containers vector vector-algorithms word8 ]; testHaskellDepends = [ @@ -36358,10 +36835,8 @@ self: { }: mkDerivation { pname = "bits-extra"; - version = "0.0.0.1"; - sha256 = "1yggdh8j2hqhyskyqq4gci4hg1kdglzw7sfd7gdf4fsw9l6g8rq0"; - revision = "1"; - editedCabalFile = "13rmw51xqbz0zjn2g0135m2f5qqsba3l5w02pb16dkfq4gbhmblx"; + version = "0.0.0.2"; + sha256 = "067k2kczi56454mgv86x9r0fpzdc0v3m8z4rc0jb93bqd33knq7r"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog @@ -36780,27 +37255,26 @@ self: { }) {}; "blank-canvas" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, colour, containers, data-default-class, directory - , http-types, kansas-comet, mime-types, process, scotty, semigroups - , shake, stm, text, text-show, time, transformers, unix, vector - , wai, wai-extra, warp + ({ mkDerivation, aeson, base, base-compat-batteries + , base64-bytestring, bytestring, colour, containers + , data-default-class, directory, http-types, kansas-comet + , mime-types, process, scotty, semigroups, shake, stm, text + , text-show, time, transformers, unix, vector, wai, wai-extra, warp }: mkDerivation { pname = "blank-canvas"; - version = "0.6.2"; - sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; - revision = "3"; - editedCabalFile = "0fanap927iszy3vkymkjcmzd74gripbbp222zcmzl5gkn3l4g931"; + version = "0.6.3"; + sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring colour - containers data-default-class http-types kansas-comet mime-types - scotty semigroups stm text text-show transformers vector wai - wai-extra warp + aeson base base-compat-batteries base64-bytestring bytestring + colour containers data-default-class http-types kansas-comet + mime-types scotty semigroups stm text text-show transformers vector + wai wai-extra warp ]; testHaskellDepends = [ - base containers directory process shake stm text time unix vector + base base-compat-batteries containers directory process shake stm + text time unix vector ]; homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; @@ -36827,8 +37301,8 @@ self: { }: mkDerivation { pname = "blas-carray"; - version = "0.0.1"; - sha256 = "02gljz0bmjrq6fwi4jikzqmqiydkyxvlk429y3my67zfkcvzr0sg"; + version = "0.0.1.1"; + sha256 = "0ijzcdrbfb9w3vs4g96p30h7ilh9s05ij8n0prinmr1ngmvipbdx"; libraryHaskellDepends = [ base blas-ffi carray netlib-carray netlib-ffi storable-complex transformers @@ -36843,8 +37317,8 @@ self: { ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { pname = "blas-ffi"; - version = "0.0.1"; - sha256 = "09glhrs7q2wpm0sm66vkdr28nhsz41js8ziny578db2ys2dpwbxz"; + version = "0.0.1.1"; + sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf"; libraryHaskellDepends = [ base netlib-ffi ]; libraryPkgconfigDepends = [ blas ]; homepage = "http://hub.darcs.net/thielema/blas-ffi/"; @@ -37119,6 +37593,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_2_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.2.1"; + sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -37757,10 +38250,8 @@ self: { }: mkDerivation { pname = "boltzmann-samplers"; - version = "0.1.0.0"; - sha256 = "0gw8d4xrwr9xs9k7dflm12xpkn6k0yn41myvzqzj4c6bhdd0c1sp"; - revision = "1"; - editedCabalFile = "00va7bagszricicai4jckyka8azgw6gly9ps5kabnsyv5znylfr0"; + version = "0.1.1.0"; + sha256 = "13l7ml35hm0i2rgw419n7xp2zp58pafm6gmmik3jgbmhfwgkwz6y"; libraryHaskellDepends = [ ad base containers hashable hmatrix ieee754 MonadRandom mtl QuickCheck transformers unordered-containers vector @@ -37909,13 +38400,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "bookkeeping_0_3_3_0" = callPackage - ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }: + "bookkeeping_0_4_0_1" = callPackage + ({ mkDerivation, base, doctest, Glob, mono-traversable, text, time + , transaction + }: mkDerivation { pname = "bookkeeping"; - version = "0.3.3.0"; - sha256 = "040ivbr9slbsxghrgys2ym9mxfmc5jh579f2x8cl7yqr851gq1g6"; - libraryHaskellDepends = [ base dlist mtl text time ]; + version = "0.4.0.1"; + sha256 = "0afa4g5c9csjn747732qqbs3ghp8c4jyxhfb9k09igfaladrvzfl"; + libraryHaskellDepends = [ + base mono-traversable text time transaction + ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; description = "A module for bookkeeping by double entry"; @@ -37929,8 +38424,8 @@ self: { }: mkDerivation { pname = "bookkeeping-jp"; - version = "0.1.1.2"; - sha256 = "0i0il5h6zf8hps8i3y4s6s80sqpvv0xgld1g3pm752v91r3z3dgv"; + version = "0.1.1.3"; + sha256 = "06zfq2153p6dnrmrp3vdq27xij38l5cnx46y3qpzifrpsady6lgd"; libraryHaskellDepends = [ base bookkeeping mono-traversable text time ]; @@ -38078,12 +38573,14 @@ self: { }) {}; "boomerang" = callPackage - ({ mkDerivation, base, mtl, template-haskell, text }: + ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.3"; - sha256 = "124k13x5wzjy2qlbdgixncgr5l7cxw4glq1hjb8hyk8vfvgs6qfl"; - libraryHaskellDepends = [ base mtl template-haskell text ]; + version = "1.4.5.5"; + sha256 = "0i2svn3bs57hhwgplkydvvpznl178dlm3byi0j4y2ckd9gqpzz4d"; + libraryHaskellDepends = [ + base mtl semigroups template-haskell text + ]; description = "Library for invertible parsing and printing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -38179,12 +38676,18 @@ self: { }) {}; "boring" = callPackage - ({ mkDerivation, adjunctions, base, tagged, transformers }: + ({ mkDerivation, adjunctions, base, base-compat, constraints, fin + , generics-sop, streams, tagged, transformers, transformers-compat + , vec + }: mkDerivation { pname = "boring"; - version = "0"; - sha256 = "11m8dfjwl9xyhvdblr6rhv7d9vrgayznzvaksdsq0qc8s30f1m0j"; - libraryHaskellDepends = [ adjunctions base tagged transformers ]; + version = "0.1"; + sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk"; + libraryHaskellDepends = [ + adjunctions base base-compat constraints fin generics-sop streams + tagged transformers transformers-compat vec + ]; homepage = "https://github.com/phadej/boring"; description = "Boring and Absurd types"; license = stdenv.lib.licenses.bsd3; @@ -38477,8 +38980,8 @@ self: { }: mkDerivation { pname = "brainheck"; - version = "0.1.0.6"; - sha256 = "0dldvr0k0pglw6c6jwafkd2d9afx0626kgiia1v5wblrfgf438w1"; + version = "0.1.0.7"; + sha256 = "17x5jyamc4863glxxdp7qdpnma7kinc67230snyplz2xzifpxq7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38581,16 +39084,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_35" = callPackage + "brick_0_36" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl - , microlens-th, stm, template-haskell, text, text-zipper - , transformers, vector, vty, word-wrap + , microlens-th, QuickCheck, stm, template-haskell, text + , text-zipper, transformers, vector, vty, word-wrap }: mkDerivation { pname = "brick"; - version = "0.35"; - sha256 = "16vfm60nz2zx819nv4s83108w1bhiyqx99zmacrlc371nlpdiyby"; + version = "0.36"; + sha256 = "1i1np31hncgz5cvygraxcv9x6l7yn9y3f8f92jih1im38drhp65z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38598,6 +39101,7 @@ self: { microlens microlens-mtl microlens-th stm template-haskell text text-zipper transformers vector vty word-wrap ]; + testHaskellDepends = [ base containers QuickCheck ]; homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; @@ -38605,15 +39109,17 @@ self: { }) {}; "brick-skylighting" = callPackage - ({ mkDerivation, base, brick, containers, skylighting, text, vty }: + ({ mkDerivation, base, brick, containers, skylighting-core, text + , vty + }: mkDerivation { pname = "brick-skylighting"; - version = "0.1"; - sha256 = "189qpq2cg45binlb9nq43h05g97ch56855xlz2givxw8psb0kb1i"; + version = "0.2"; + sha256 = "1x4kfjj4sa5gbxnbvh76b4isrmc6jr11py9b50jsyvs720plq778"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base brick containers skylighting text vty + base brick containers skylighting-core text vty ]; homepage = "https://github.com/jtdaugherty/brick-skylighting/"; description = "Show syntax-highlighted text in your Brick UI"; @@ -38780,6 +39286,8 @@ self: { pname = "brittany"; version = "0.9.0.1"; sha256 = "1ndmnakzq6kiyxlxmgrjmzzpknrn4ib5ck5vxxr90qw8rw6yqi88"; + revision = "1"; + editedCabalFile = "1ac9g160kaaz78xk6xdfpkm0qadgkanjghi8g0b9fy17983fiw7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38808,6 +39316,49 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "brittany_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs + , containers, czipwith, data-tree-print, deepseq, directory, extra + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec + , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty + , safe, semigroups, strict, syb, text, transformers, uniplate + , unsafe, yaml + }: + mkDerivation { + pname = "brittany"; + version = "0.10.0.0"; + sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1"; + revision = "1"; + editedCabalFile = "1mq1hgakxwzk4k4d8gwfbngprcprjagnvkvq389z1m1vda3w80i8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation parsec pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + homepage = "https://github.com/lspitzner/brittany/"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "broadcast-chan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39123,31 +39674,6 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.4.4"; - sha256 = "1n1dvd1xqxi6aklrhnsmymmj7qxf7sfcigqs0j6a1137fzxvmh01"; - libraryHaskellDepends = [ - base bytestring mtl text unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base bytestring criterion deepseq HTF - quickcheck-instances text vector - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion deepseq http-types json-builder - text vector - ]; - homepage = "https://github.com/chadaustin/buffer-builder"; - description = "Library for efficiently building up buffers, one piece at a time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "buffer-builder_0_2_4_5" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances - , text, unordered-containers, vector - }: - mkDerivation { - pname = "buffer-builder"; version = "0.2.4.5"; sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc"; libraryHaskellDepends = [ @@ -39164,7 +39690,6 @@ self: { homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer-builder-aeson" = callPackage @@ -39215,8 +39740,8 @@ self: { }: mkDerivation { pname = "buffon"; - version = "0.1.0.0"; - sha256 = "073a2gzazihqyki175xhb97szqyvv2ijjrh7byik25z1xlkn599d"; + version = "0.1.0.1"; + sha256 = "1v9kxm3yrw871567j8qza7gayllhsb77pxqriin4akvg77llz7l9"; libraryHaskellDepends = [ base monad-primitive mwc-random mwc-random-monad primitive transformers @@ -39637,17 +40162,18 @@ self: { "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, parameterized-utils - , QuickCheck, random + , prettyclass, QuickCheck, random }: mkDerivation { pname = "bv-sized"; - version = "0.2.0"; - sha256 = "0v0wrr4pf8krya5az91yqvivjg72p08x2nmsp335c66rpmg6ph1i"; + version = "0.3.0"; + sha256 = "04y99mgcgaqpzryc921nqlggfamk0jnrqv482r0hpcdf9in533bc"; libraryHaskellDepends = [ - base containers lens parameterized-utils QuickCheck random + base containers lens parameterized-utils prettyclass QuickCheck + random ]; testHaskellDepends = [ - base lens parameterized-utils QuickCheck random + base lens parameterized-utils prettyclass QuickCheck random ]; homepage = "https://github.com/benjaminselfridge/bv-sized"; description = "a BitVector datatype that is parameterized by the vector width"; @@ -39747,10 +40273,8 @@ self: { }: mkDerivation { pname = "bytes"; - version = "0.15.3"; - sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q"; - revision = "4"; - editedCabalFile = "1w0hmrlxbki1cd5685y40w4jhjbrk6if7jgikxxvl4dzlbl5ksaq"; + version = "0.15.4"; + sha256 = "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -40152,6 +40676,8 @@ self: { pname = "bytestring-trie"; version = "0.2.4.1"; sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; + revision = "1"; + editedCabalFile = "0f56pb1k1va7bs9rpn0b8hclxhn5pcjln857k50myhyzrwz8qg7r"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "An efficient finite map from (byte)strings to values"; @@ -40239,31 +40765,6 @@ self: { "bzlib-conduit" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit - , data-default, hspec, mtl, random, resourcet - }: - mkDerivation { - pname = "bzlib-conduit"; - version = "0.3.0"; - sha256 = "11nz2lkrv39rb7ayhnqlpjrxsprnv92ygwwvgmp3i32l9fakwhpw"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bindings-DSL bytestring conduit data-default mtl resourcet - ]; - librarySystemDepends = [ bzip2 ]; - testHaskellDepends = [ - base bindings-DSL bytestring conduit data-default hspec mtl random - resourcet - ]; - benchmarkHaskellDepends = [ - base bindings-DSL bytestring conduit data-default mtl resourcet - ]; - homepage = "https://github.com/snoyberg/bzlib-conduit#readme"; - description = "Streaming compression/decompression via conduits"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) bzip2;}; - - "bzlib-conduit_0_3_0_1" = callPackage - ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit , data-default-class, hspec, mtl, random, resourcet }: mkDerivation { @@ -40287,7 +40788,6 @@ self: { homepage = "https://github.com/snoyberg/bzlib-conduit#readme"; description = "Streaming compression/decompression via conduits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) bzip2;}; "c-dsl" = callPackage @@ -40851,31 +41351,23 @@ self: { ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, mtl, network, network-uri, pretty, pretty-show - , process, QuickCheck, random, stm, tagged, tar, tasty, tasty-hunit - , tasty-quickcheck, time, unix, zlib + , hashable, HTTP, mtl, network, network-uri, pretty, process + , random, resolv, stm, tar, time, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "2.0.0.1"; - sha256 = "16ax1lx89jdgf9pqka423h2bf8dblkra48n4y3icg8fs79py74gr"; - revision = "3"; - editedCabalFile = "148rq7hcbl8rq7pkywn1hk3l7lv442flf6b0wamfixxzxk74fwlj"; - isLibrary = false; + version = "2.2.0.0"; + sha256 = "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8"; + revision = "1"; + editedCabalFile = "0f1svlhh4cpj3p5fs9bcjpv15qp291lnvlaxxcw7aib8a1gn3wim"; + isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance filepath hackage-security hashable HTTP mtl network network-uri - pretty process random stm tar time unix zlib - ]; - testHaskellDepends = [ - array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 deepseq directory edit-distance - filepath hackage-security hashable HTTP mtl network network-uri - pretty pretty-show process QuickCheck random stm tagged tar tasty - tasty-hunit tasty-quickcheck time unix zlib + pretty process random resolv stm tar time unix zlib ]; doCheck = false; postInstall = '' @@ -41118,8 +41610,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.1"; - sha256 = "0avp7prkzp522mpqnn60xmsqqp10zhp1phhlj14qzp4162772fss"; + version = "0.12.2"; + sha256 = "00i3v62ys6fhq2rnw9q2hhc2h54v8my14ll746vpma2gfdy90y1c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41604,13 +42096,13 @@ self: { }: mkDerivation { pname = "cache"; - version = "0.1.0.1"; - sha256 = "0bv7s9lffhggh0z5ad03ryqzq6bcqga1zg4c6f57i7hh9q8161qd"; + version = "0.1.1.0"; + sha256 = "1zvq5dwckkngf6kzh04pa59kgxf44fx9kli0c7zaz4g9hf1nyx8l"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; testHaskellDepends = [ base clock hspec stm transformers ]; - homepage = "https://github.com/hverr/haskell-cache"; + homepage = "https://github.com/hverr/haskell-cache#readme"; description = "An in-memory key/value store with expiration support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42770,12 +43262,13 @@ self: { }) {}; "casing" = callPackage - ({ mkDerivation, base, split }: + ({ mkDerivation, base, split, tasty, tasty-hunit }: mkDerivation { pname = "casing"; - version = "0.1.2.1"; - sha256 = "0f56060n78jy7f6mm14h2g9w48cgsxrjixm65x3mm4a2xpkg5gx8"; + version = "0.1.4.0"; + sha256 = "1mznhlbg8qd2yrjg23rq7s77bijn92nrfx7bvx9sw8sqxwqkd2lf"; libraryHaskellDepends = [ base split ]; + testHaskellDepends = [ base tasty tasty-hunit ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; }) {}; @@ -43220,14 +43713,15 @@ self: { }) {}; "catamorphism" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.6.0.0"; - sha256 = "0y1p6xayf4n6y41hmcrxg1zc0xm07vgirvipcm5zj7d5bphddn07"; + version = "0.6.1.1"; + sha256 = "1bpmi4k7dfwjkg9qr70gj4y6z87jaa0q11v91wgffdmw84r341vp"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/frerich/catamorphism"; - description = "A package exposing a helper function for generating catamorphisms"; + description = "Exposes a Template Haskell function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -43374,27 +43868,6 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.4"; - sha256 = "17463g65cylkjxpih414wfg0vqvxj81ylzp2hg04sa1h75zhdjkv"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_5" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; version = "0.4.5"; sha256 = "12gmav4bwf3i44wbwc68vgrnal7j6q3428d6wl5zq078pv2c3x7w"; libraryHaskellDepends = [ @@ -44327,28 +44800,29 @@ self: { ({ mkDerivation, base, colour, data-default, diagrams-lib , diagrams-svg, doctest, foldl, formatting, generic-lens , generic-lens-labels, lens, linear, mwc-probability, mwc-random - , numhask, numhask-histogram, numhask-range, palette, primitive - , protolude, scientific, svg-builder, SVGFonts, tasty, tasty-hspec - , text, time + , numhask, numhask-histogram, numhask-prelude, numhask-range + , palette, primitive, protolude, scientific, svg-builder, SVGFonts + , tasty, tasty-hspec, text, time }: mkDerivation { pname = "chart-unit"; - version = "0.6.1.0"; - sha256 = "07aiw8n7b23k9n1g4inpmdbkmmahl7vdvqr575rc7n0bnwwfyvi0"; + version = "0.6.2.0"; + sha256 = "0y6xha20ckj0n0yih1zwwhyp55q1jcdmq06caid9biji8nkahzb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour data-default diagrams-lib diagrams-svg foldl formatting - generic-lens lens linear numhask numhask-range palette protolude - scientific svg-builder SVGFonts text time + generic-lens lens linear numhask numhask-prelude numhask-range + palette protolude scientific svg-builder SVGFonts text time ]; executableHaskellDepends = [ base diagrams-lib formatting generic-lens-labels lens - mwc-probability mwc-random numhask numhask-histogram numhask-range - primitive protolude text time + mwc-probability mwc-random numhask numhask-histogram + numhask-prelude numhask-range primitive protolude text time ]; testHaskellDepends = [ - base doctest numhask numhask-range tasty tasty-hspec + base doctest numhask numhask-prelude numhask-range tasty + tasty-hspec ]; homepage = "https://github.com/tonyday567/chart-unit#readme"; description = "Native haskell charts"; @@ -45814,27 +46288,25 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl - , containers, deepseq, directory, filepath, ghc, ghc-boot - , ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, ghci, hashable, haskeline, lens, mtl - , process, text, time, transformers, unbound-generics, uniplate - , unix, unordered-containers + , clash-prelude, concurrent-supply, containers, deepseq, directory + , filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable + , haskeline, integer-gmp, lens, mtl, process, reflection, text + , time, transformers, unbound-generics, uniplate, unix + , unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.7.2"; - sha256 = "1fjimvj07mc8d8z6i9sl9ifyvcil262p53bz6gap833jrirqd3yh"; - revision = "1"; - editedCabalFile = "1np4zs8bqdvzlls8c8zpiwqq91bvx2aiz7qpvza0fzdvc0df2cmj"; + version = "0.99"; + sha256 = "19s6h0ly0pz1wi1zs5ln9wai6kp9f49xdcjyc3z6mskcabv5b8q2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bifunctors bytestring clash-lib clash-prelude - clash-systemverilog clash-verilog clash-vhdl containers deepseq - directory filepath ghc ghc-boot ghc-typelits-extra - ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable - haskeline lens mtl process text time transformers unbound-generics + concurrent-supply containers deepseq directory filepath ghc + ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens + mtl process reflection text time transformers unbound-generics uniplate unix unordered-containers ]; executableHaskellDepends = [ base ]; @@ -45845,25 +46317,24 @@ self: { }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, data-binary-ieee754, deepseq - , directory, errors, fgl, filepath, ghc, hashable, integer-gmp - , lens, mtl, pretty, process, template-haskell, text, time - , transformers, unbound-generics, unordered-containers - , uu-parsinglib, wl-pprint-text + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , bytestring, clash-prelude, concurrent-supply, containers + , data-binary-ieee754, deepseq, directory, errors, fgl, filepath + , ghc, hashable, integer-gmp, lens, mtl, parsers, prettyprinter + , process, reducers, template-haskell, text, time, transformers + , trifecta, unbound-generics, unordered-containers }: mkDerivation { pname = "clash-lib"; - version = "0.7.1"; - sha256 = "1mml3f10mdirlihjnbzjh3jjnmvgcqfqs16k22a13m8pd4whcw88"; - revision = "2"; - editedCabalFile = "1b8d63wisrizirkyrl58840bfnknjy049sm43zhhr9nbw6fn2c51"; + version = "0.99"; + sha256 = "1dl9pwv9fc5byimdxsl4xa4401nz74bgzrxmgk6hcbyvh7i4b17i"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers data-binary-ieee754 deepseq directory errors fgl - filepath ghc hashable integer-gmp lens mtl pretty process - template-haskell text time transformers unbound-generics - unordered-containers uu-parsinglib wl-pprint-text + aeson ansi-wl-pprint attoparsec base bytestring clash-prelude + concurrent-supply containers data-binary-ieee754 deepseq directory + errors fgl filepath ghc hashable integer-gmp lens mtl parsers + prettyprinter process reducers template-haskell text time + transformers trifecta unbound-generics unordered-containers ]; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; @@ -45888,23 +46359,21 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, constraints, criterion + ({ mkDerivation, array, base, bifunctors, constraints, criterion , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, half, integer-gmp, lens, QuickCheck - , reflection, singletons, template-haskell, vector + , reflection, singletons, template-haskell, transformers, vector }: mkDerivation { pname = "clash-prelude"; - version = "0.11.2"; - sha256 = "1ccbcqkqcq5kyfjfvpkis2z40ishc4yqjjjswfsg92qrklk38wcl"; - revision = "2"; - editedCabalFile = "16ak462j0722lvy8ajn2yv400z9jgv8c3l151pmfwh893q6b0i3l"; + version = "0.99"; + sha256 = "13qclvisklwy4syc5hgr5dvcz7wm4nwasgky3xvjhnhjg05wjd6l"; libraryHaskellDepends = [ - array base constraints data-binary-ieee754 data-default deepseq - ghc-prim ghc-typelits-extra ghc-typelits-knownnat + array base bifunctors constraints data-binary-ieee754 data-default + deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise half integer-gmp lens QuickCheck - reflection singletons template-haskell vector + reflection singletons template-haskell transformers vector ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ @@ -46014,6 +46483,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "classy-miso" = callPackage + ({ mkDerivation, base, containers, data-default, lens, megaparsec + , miso, network-uri, rfc, transformers, url + }: + mkDerivation { + pname = "classy-miso"; + version = "0.0.0.2"; + sha256 = "12qz2s5qhmjryp5x06jcv2gl3ipjhw0knsn1qawl1kn278hpyvp9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default lens megaparsec miso network-uri rfc + transformers url + ]; + executableHaskellDepends = [ base miso rfc ]; + testHaskellDepends = [ base miso rfc ]; + homepage = "https://github.com/RobertFischer/Classy-Miso#README.md"; + description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-parallel" = callPackage ({ mkDerivation, base, lifted-base, monad-control, parallel , resourcet, transformers @@ -46139,8 +46630,8 @@ self: { "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, cereal, containers, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-jmacro + , blaze-html, bytestring, Cabal, cereal, containers, directory + , filepath, happstack-authenticate, happstack-hsp, happstack-jmacro , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs , ixset, jmacro, lens, mtl, network, network-uri, old-locale , openssl, process, random, reform, reform-happstack, reform-hsp @@ -46151,9 +46642,10 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.6"; - sha256 = "0yswcldqwrpk7z5ww95nyvsb6qdpl2171zxy4fkpnqscma3sf54r"; + version = "0.24.0.7"; + sha256 = "1czalrr7y3526jb4cgi8bghxghqwsjwkfhm5vb4q19xzqg3kjqwy"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -46313,17 +46805,19 @@ self: { }) {}; "clckwrks-plugin-page" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks - , containers, directory, filepath, happstack-hsp, happstack-server - , hsp, hsx2hs, ixset, mtl, old-locale, random, reform - , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins - , web-routes, web-routes-happstack, web-routes-th + ({ mkDerivation, acid-state, aeson, attoparsec, base, Cabal + , clckwrks, containers, directory, filepath, happstack-hsp + , happstack-server, hsp, hsx2hs, ixset, mtl, old-locale, random + , reform, reform-happstack, reform-hsp, safecopy, tagsoup + , template-haskell, text, time, time-locale-compat, uuid + , uuid-orphans, web-plugins, web-routes, web-routes-happstack + , web-routes-th }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.11"; - sha256 = "1xqlpdg511m5wif9cz01v0fgam1lsvl50sqigxrcjc9n6fivn61x"; + version = "0.4.3.12"; + sha256 = "0xndx7843laiha1n8xscq13dv6x6fv098v1cdmmzx7qnvfvhhlxj"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -46519,8 +47013,8 @@ self: { }: mkDerivation { pname = "cli-setup"; - version = "0.2.0.1"; - sha256 = "056y5sphj2zn455wyhjxcr0c6hb502bhrazhd7nij9mg8d8761dk"; + version = "0.2.0.3"; + sha256 = "1macadfh1dqd6n2cc5rlyn74fz450livy1bg0qns3kcijqilk0p4"; libraryHaskellDepends = [ base bytestring directory file-embed process ]; @@ -46580,11 +47074,11 @@ self: { }: mkDerivation { pname = "clif"; - version = "0.1.0.0"; - sha256 = "1inrhmrajl9y9vbbv5fh1m72a985j9k82vxmz9948k37hwvx6faw"; + version = "0.1.1.0"; + sha256 = "08mamsaycd2k2sjz08sg808yd153hhw9gfi4170448xl8icadkx5"; libraryHaskellDepends = [ base containers QuickCheck ]; testHaskellDepends = [ - base containers QuickCheck tasty tasty-quickcheck tasty-th + base containers tasty tasty-quickcheck tasty-th ]; benchmarkHaskellDepends = [ base time ]; description = "A Clifford algebra number type for Haskell"; @@ -46838,18 +47332,18 @@ self: { "closed" = callPackage ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec - , markdown-unlit, QuickCheck, vector + , markdown-unlit, persistent, QuickCheck, text, vector }: mkDerivation { pname = "closed"; - version = "0.1.0"; - sha256 = "0x87s852xfsyxnwj88kw38wmpzrj52hd7r87xx73r4ffv0lp6kh4"; + version = "0.2.0"; + sha256 = "0762acn2dik98hp4bvlyvwfy1jfzb4i6ri9pnxa07risain1qc3s"; libraryHaskellDepends = [ - aeson base cassava deepseq hashable QuickCheck + aeson base cassava deepseq hashable persistent QuickCheck text ]; testHaskellDepends = [ - aeson base cassava deepseq hashable hspec markdown-unlit QuickCheck - vector + aeson base cassava deepseq hashable hspec markdown-unlit persistent + QuickCheck text vector ]; homepage = "https://github.com/frontrowed/closed#readme"; description = "Integers bounded by a closed interval"; @@ -47643,8 +48137,8 @@ self: { }: mkDerivation { pname = "codec-beam"; - version = "0.1.0"; - sha256 = "0c5l4ss3pf55s8mwk01ncl5nnry9c1ha5drfmax53z40hyrxhmy8"; + version = "0.1.1"; + sha256 = "1d6dsa4di4wil6wqc2jpfqvf09vk4zw9c2905py5vygl87q1y9jq"; libraryHaskellDepends = [ base bytestring containers text zlib ]; testHaskellDepends = [ base bytestring filepath process text ]; homepage = "https://github.com/hkgumbs/codec-beam#readme"; @@ -48327,6 +48821,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "colour-accelerate_0_3_0_0" = callPackage + ({ mkDerivation, accelerate, base }: + mkDerivation { + pname = "colour-accelerate"; + version = "0.3.0.0"; + sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; + libraryHaskellDepends = [ accelerate base ]; + homepage = "https://github.com/tmcdonell/colour-accelerate"; + description = "Working with colours in Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colour-space" = callPackage ({ mkDerivation, base, colour, constrained-categories, JuicyPixels , linear, linearmap-category, manifolds, semigroups, vector-space @@ -48494,6 +49001,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "combinat-compat" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, random + , test-framework, test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "combinat-compat"; + version = "0.2.8.2"; + sha256 = "0mh5f8vmbwnib1qv9vvp45gwwj6942l1jhxnglq9i4za40k1r8ff"; + libraryHaskellDepends = [ + array base containers random transformers + ]; + testHaskellDepends = [ + array base containers QuickCheck random test-framework + test-framework-quickcheck2 transformers + ]; + homepage = "http://code.haskell.org/~bkomuves/"; + description = "Generate and manipulate various combinatorial objects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "combinat-diagrams" = callPackage ({ mkDerivation, array, base, colour, combinat, containers , diagrams-core, diagrams-lib, linear, transformers @@ -48606,8 +49133,8 @@ self: { ({ mkDerivation, base, utility-ht }: mkDerivation { pname = "comfort-array"; - version = "0.0"; - sha256 = "0mkfw2f56idh1nnmgamgazwzip6c4pmxsiaijs8k69ggzi2fb8bx"; + version = "0.0.1"; + sha256 = "1nbnnhmfbsiq31damx998sm7hz127mdqbnzzybz00962bmlmvp72"; libraryHaskellDepends = [ base utility-ht ]; homepage = "http://hub.darcs.net/thielema/comfort-array/"; description = "Arrays where the index type is a function of the shape type"; @@ -49252,8 +49779,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.5.3.0"; - sha256 = "0pmgrdlrk4l7bmbfvsbvysa3n2h14ca919fl7cr1bg9yk2mb2s7s"; + version = "0.5.4.0"; + sha256 = "08rmv82v5ipkcb46pcadx1s8c1v532l8ma2qlgiflq6jnxf7y0zn"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -49278,8 +49805,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.5.3.0"; - sha256 = "07ps031qnkhd5yb7w0c9y69n22npa5y9rzxy934p6x32ni5v0mvz"; + version = "0.5.4.0"; + sha256 = "1x5vkxzj0afar4w2djx9s7h3vy9aa5my9wfks8n4ajlv92fch1zm"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -49296,8 +49823,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.5.3.0"; - sha256 = "0xz264i115nj2b6k74s1csi29lrszambbhy7ibz7nwqr2qs56yzw"; + version = "0.5.4.0"; + sha256 = "0brycxdwf4051qvad4b4ak47dl27qn3izv1bcqlpva01jvb6h21j"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -49312,15 +49839,14 @@ self: { }) {}; "composite-ekg" = callPackage - ({ mkDerivation, base, composite-base, ekg, ekg-core, lens, text - , vinyl + ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl }: mkDerivation { pname = "composite-ekg"; - version = "0.5.3.0"; - sha256 = "0fw6rsz7arndmp9d6xgvkx9vqqrv6kvhgchl0hqv4jfaxhwdv3gc"; + version = "0.5.4.0"; + sha256 = "051dw8ncpsk2k05ipvlnkwv2gy6719w69v1hhwrryy3dad0f4wc3"; libraryHaskellDepends = [ - base composite-base ekg ekg-core lens text vinyl + base composite-base ekg-core lens text vinyl ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "EKG Metrics for Vinyl/Frames records"; @@ -49334,8 +49860,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.5.3.0"; - sha256 = "09sjvs7bxca789pfrhgbsy2v08060mraciwl867byq3s8aq5c971"; + version = "0.5.4.0"; + sha256 = "1k71v4dz4vl70ignjp6hgw6j4c9hdgafd9x973dk7w332m2vjdpn"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -49351,6 +49877,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "composite-swagger" = callPackage + ({ mkDerivation, base, composite-aeson, composite-base, hspec + , insert-ordered-containers, lens, QuickCheck, swagger2 + , template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-swagger"; + version = "0.5.4.0"; + sha256 = "0i2jfchl88mrk9kmf8yv7cbv006ghilqsnbic7ddsbkzrjy1vdw0"; + libraryHaskellDepends = [ + base composite-base insert-ordered-containers lens swagger2 + template-haskell text vinyl + ]; + testHaskellDepends = [ + base composite-aeson composite-base hspec insert-ordered-containers + lens QuickCheck swagger2 template-haskell text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Swagger for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composition" = callPackage ({ mkDerivation }: mkDerivation { @@ -49373,12 +49921,13 @@ self: { }) {}; "composition-prelude" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "1.3.0.4"; - sha256 = "0dsd67ffhwfbq7y9f8c6q9nd05ayyxi85mzvc8kgj7f21cpvclmg"; + version = "1.3.0.8"; + sha256 = "17ihwvkv7plwnwnk7ny81cj4xy2v776yk85gssgix92yc65p47b2"; libraryHaskellDepends = [ base ]; + libraryToolDepends = [ cpphs ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -49803,6 +50352,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "concurrency_1_5_0_0" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.5.0.0"; + sha256 = "0c07jkhsi9fy3ssjs19511dxsqq62yqbh9qd90r666wdhs0v86qh"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50154,35 +50721,6 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.0.1"; - sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec kan-extensions mwc-random - transformers vector - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_3_0_2" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, kan-extensions - , mono-traversable, mtl, mwc-random, primitive, QuickCheck - , resourcet, safe, silently, split, text, transformers, unix - , unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; version = "1.3.0.2"; sha256 = "0nqy9bffg2p2ij8isz99r7i5zm7sib0m9fqwisknakjh8b99kw60"; libraryHaskellDepends = [ @@ -50201,7 +50739,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -51282,8 +51819,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "constrictor"; - version = "0.1.0.1"; - sha256 = "05km6cxk5c9k2m22x6379jnlvcxr9j6m52y3xqvjjvxkps2ppc9c"; + version = "0.1.0.2"; + sha256 = "13g8cks2bzwb0ndbak91b5k1n22i0hgza4l8i52fqhzs4addaxs3"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/chessai/constrictor.git"; description = "strict versions of many things in base"; @@ -51497,8 +52034,8 @@ self: { pname = "containers-verified"; version = "0.5.11.0"; sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07"; - revision = "1"; - editedCabalFile = "12jw1aq053wbbam8n2vvfdl00yha551bbk4xnwxk9rwfday45m4j"; + revision = "3"; + editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3"; libraryHaskellDepends = [ containers ]; homepage = "https://github.com/nomeata/containers-verified"; description = "Formally verified drop-in replacement of containers"; @@ -51592,12 +52129,11 @@ self: { ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.7"; - sha256 = "04cg0xb634c915mx83vx1vh3l898i27pz309nz6h4jikp99skcs9"; + version = "0.1.0.8"; + sha256 = "1izjdvm65zj960dcgg8xamg6ysfhn04qjxb9q7mpgzg8yi6f326c"; libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://hub.darcs.net/vmchale/continued-fraction#readme"; description = "Types and functions for working with continued fractions in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52007,18 +52543,18 @@ self: { }) {}; "convert" = callPackage - ({ mkDerivation, base, bytestring, containers, either, lens, mtl - , old-locale, old-time, template-haskell, text, time + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , data-default, lens, template-haskell, text, utf8-string }: mkDerivation { pname = "convert"; - version = "1.0.2"; - sha256 = "0vwy2j2b0jw435mxmi95q61zmldjqlahhlbf4x9x28qm6kmh519q"; + version = "1.4.2"; + sha256 = "0lmbshg6nx0ifnc6qmhvacr5lr5nlay3sjkjg2n5624qm7aiq806"; libraryHaskellDepends = [ - base bytestring containers either lens mtl old-locale old-time - template-haskell text time + ansi-wl-pprint base bytestring containers data-default lens + template-haskell text utf8-string ]; - homepage = "https://github.com/wdanilo/convert"; + homepage = "https://github.com/luna/convert"; description = "Safe and unsafe data conversion utilities with strong type-level operation. checking."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -52138,18 +52674,14 @@ self: { }) {}; "coordinate" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell, transformers - }: + ({ mkDerivation, base, HUnit, lens, papa, transformers }: mkDerivation { pname = "coordinate"; - version = "0.1.2"; - sha256 = "0lphvgjs9nkrp37hirhi88d285rqbgk7qjz23rbl94v6qrk3x8nv"; - libraryHaskellDepends = [ base lens transformers ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/coordinate"; + version = "0.2"; + sha256 = "1sph59d8008amhb4pi4gk8ymwjf2r6iy378phriqb42zy01bn0vb"; + libraryHaskellDepends = [ base lens papa transformers ]; + testHaskellDepends = [ base HUnit lens ]; + homepage = "https://github.com/qfpl/coordinate"; description = "A representation of latitude and longitude"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52406,8 +52938,8 @@ self: { }: mkDerivation { pname = "corenlp-parser"; - version = "0.3.0.1"; - sha256 = "14xjfcnk58mwgxywdlzdl53xdzf91scx0hmx8arhxkn6vr04akwp"; + version = "0.4.0.0"; + sha256 = "0li43xmig52npq9dc1nm5sv876nw7n1g4r3djy5saw3h38sz1zdz"; libraryHaskellDepends = [ aeson async base cryptonite data-default directory process raw-strings-qq rocksdb-haskell safe-exceptions split store @@ -52629,10 +53161,8 @@ self: { }: mkDerivation { pname = "country"; - version = "0.1.4"; - sha256 = "027i4ncnsyii41wfndn369xmlbkp4vvcrx7m7cdb07n4wlcpz0bl"; - revision = "1"; - editedCabalFile = "0sjzrld5qa2wn66zgf25w5h41179mcmsjvndn1j8kl20bfsiwhvh"; + version = "0.1.5"; + sha256 = "0shp4kq8bibfwrjldz8akghgm3n2lq00dybxnq4grmbl5phj3a9s"; libraryHaskellDepends = [ aeson attoparsec base bytestring ghc-prim hashable primitive scientific text unordered-containers @@ -53620,8 +54150,8 @@ self: { pname = "criterion"; version = "1.3.0.0"; sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q"; - revision = "2"; - editedCabalFile = "1yyv34f9yk8d67x18l1al5csd383ypmdwnz73gq0agmw4k2f9c54"; + revision = "3"; + editedCabalFile = "0bdz45r1mf6ydcs7l333xn7da9p583g9y7n3dzvnry4by0fkcqw6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -53644,37 +54174,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_4_0_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary - , bytestring, cassava, code-page, containers, deepseq, directory - , exceptions, filepath, Glob, HUnit, js-flot, js-jquery - , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, semigroups, statistics, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, transformers-compat - , vector, vector-algorithms + "criterion_1_4_1_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, bytestring, cassava, code-page + , containers, deepseq, directory, exceptions, filepath, Glob, HUnit + , js-flot, js-jquery, microstache, mtl, mwc-random + , optparse-applicative, parsec, QuickCheck, semigroups, statistics + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.4.0.0"; - sha256 = "0shsqq36z1q8ckic3nfb3rdbxhlb0faxl5d7ly5a4wlka4fcfrfc"; - revision = "1"; - editedCabalFile = "056p7d95ynrpsm5jr479r9xk7ksniqkz4bza0zdn9a8vmrx591qh"; + version = "1.4.1.0"; + sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat binary bytestring cassava - code-page containers deepseq directory exceptions filepath Glob - js-flot js-jquery microstache mtl mwc-random optparse-applicative - parsec semigroups statistics text time transformers - transformers-compat vector vector-algorithms + aeson ansi-wl-pprint base base-compat-batteries binary bytestring + cassava code-page containers deepseq directory exceptions filepath + Glob js-flot js-jquery microstache mtl mwc-random + optparse-applicative parsec semigroups statistics text time + transformers transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ - base base-compat optparse-applicative semigroups + base base-compat-batteries optparse-applicative semigroups ]; testHaskellDepends = [ - aeson base base-compat bytestring deepseq directory HUnit - QuickCheck statistics tasty tasty-hunit tasty-quickcheck vector + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector ]; homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; @@ -54389,8 +54918,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.100.1"; sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; - revision = "1"; - editedCabalFile = "1drxjsn5chi9zj3djj85s1d6xqlc28ji70zpyicxl5fals10n5w3"; + revision = "2"; + editedCabalFile = "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -54410,8 +54939,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "1"; - editedCabalFile = "167i2mjyr18949xckzv6f782n763f6w9k114p6kq74gbmxqjvmqb"; + revision = "2"; + editedCabalFile = "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -54454,8 +54983,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.100.1"; sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; - revision = "1"; - editedCabalFile = "0aj9ryzdpxz79n5bs5wx56s9rjxm25dm7agxbyzqdr93wi2rj8ny"; + revision = "2"; + editedCabalFile = "1xy1j3bn2w8my0q04s7z460rddmnqfdh43l95m86rpk75xpiryil"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -54616,6 +55145,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "cryptonite-openssl_0_7" = callPackage + ({ mkDerivation, base, basement, bytestring, cryptonite, memory + , openssl, tasty, tasty-hunit, tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite-openssl"; + version = "0.7"; + sha256 = "1xj41354dx24rfh6i7av7qamvin34z4g6m1hxw1fc9jg4q41qkly"; + libraryHaskellDepends = [ + base basement bytestring cryptonite memory + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ + base bytestring cryptonite tasty tasty-hunit tasty-kat + tasty-quickcheck + ]; + homepage = "https://github.com/haskell-crypto/cryptonite-openssl"; + description = "Crypto stuff using OpenSSL cryptographic library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -55213,8 +55764,8 @@ self: { pname = "cue-sheet"; version = "1.0.1"; sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; - revision = "1"; - editedCabalFile = "05f1w3jhwk09jaknq2ipfsfdlh95rg614m1c1diwi2z9s6hwi3cx"; + revision = "2"; + editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec @@ -55723,6 +56274,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_0" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.0"; + sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + homepage = "https://github.com/lspitzner/czipwith/"; + description = "CZipWith class and deriving via TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -55942,32 +56507,32 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring - , binary, bytestring, cmdargs, containers, cryptohash, curl + , binary, bytestring, Cabal, cmdargs, containers, cryptohash, curl , data-ordlist, directory, fgl, filepath, FindBin, graphviz , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network , network-uri, old-time, parsec, process, QuickCheck, random - , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar - , terminfo, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, unix, unix-compat, utf8-string, vector - , zip-archive, zlib + , regex-applicative, regex-compat-tdfa, sandi, shelly, split, stm + , tar, temporary, terminfo, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, unix + , unix-compat, utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.12.5"; - sha256 = "0lrm0sal5pl453mkqn8b9fc9l7lwinc140iqihya9g17bk408nrm"; + version = "2.14.0"; + sha256 = "00r8g27sgwlw5r8gx89q99n2hawcacfz1mjj0nmh6ps8l610iyhr"; revision = "1"; - editedCabalFile = "0if3ww0xhi8k5c8a9yb687gjjdp2k4q2896qn7vgwwzg360slx8n"; + editedCabalFile = "0kxvr0rv5936x460k5ydyy85lgjhmrlkrm60zhbqkqks304abs1h"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist directory fgl filepath graphviz hashable haskeline html HTTP mmap mtl network network-uri old-time - parsec process random regex-applicative regex-compat-tdfa sandi tar - terminfo text time transformers transformers-compat unix - unix-compat utf8-string vector zip-archive zlib + parsec process random regex-applicative regex-compat-tdfa sandi stm + tar temporary terminfo text time transformers unix unix-compat + utf8-string vector zip-archive zlib ]; librarySystemDepends = [ curl ]; executableHaskellDepends = [ base ]; @@ -55983,7 +56548,7 @@ self: { ''; homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; @@ -56418,21 +56983,6 @@ self: { }: mkDerivation { pname = "data-accessor-template"; - version = "0.2.1.14"; - sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4"; - libraryHaskellDepends = [ - base data-accessor template-haskell utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Record_access"; - description = "Utilities for accessing and manipulating fields of records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-accessor-template_0_2_1_15" = callPackage - ({ mkDerivation, base, data-accessor, template-haskell, utility-ht - }: - mkDerivation { - pname = "data-accessor-template"; version = "0.2.1.15"; sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0"; libraryHaskellDepends = [ @@ -56441,7 +56991,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-accessor-transformers" = callPackage @@ -56596,25 +57145,12 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.2.0"; - sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f"; - libraryHaskellDepends = [ base deepseq QuickCheck ]; - homepage = "https://github.com/sw17ch/data-clist"; - description = "Simple functional ring type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-clist_0_1_2_1" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: - mkDerivation { - pname = "data-clist"; version = "0.1.2.1"; sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-concurrent-queue" = callPackage @@ -57295,11 +57831,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-inttrie"; - version = "0.1.2"; - sha256 = "1y8xbwy1cdfrswlbr029hlyj3cbsfvayxh4kklsdzbrwgnnygnld"; + version = "0.1.4"; + sha256 = "0m5xww8zvsa0whxl89wndpbdz9p5n03q3h3a904nqrxh966psfkb"; libraryHaskellDepends = [ base ]; - homepage = "http://github.com/luqui/data-inttrie"; - description = "A lazy, infinite trie of integers"; + homepage = "https://github.com/luqui/data-inttrie"; + description = "A simple lazy, infinite trie from integers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58113,34 +58649,6 @@ self: { }: mkDerivation { pname = "datadog"; - version = "0.2.0.0"; - sha256 = "0zk4dkd6q2rv0fbylp2fprizahfx2imczhrj08n0qd5h3mnck3c9"; - libraryHaskellDepends = [ - aeson auto-update base buffer-builder bytestring dlist http-client - http-client-tls http-types lens lifted-base monad-control network - old-locale text time transformers-base unordered-containers vector - ]; - testHaskellDepends = [ - aeson auto-update base buffer-builder bytestring Cabal dlist - exceptions hspec http-client http-client-tls http-types lens - lifted-base monad-control network old-locale random text time - transformers-base unordered-containers vector - ]; - homepage = "https://github.com/iand675/datadog"; - description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "datadog_0_2_2_0" = callPackage - ({ mkDerivation, aeson, auto-update, base, buffer-builder - , bytestring, Cabal, dlist, exceptions, hspec, http-client - , http-client-tls, http-types, lens, lifted-base, monad-control - , network, old-locale, random, text, time, transformers-base - , unordered-containers, vector - }: - mkDerivation { - pname = "datadog"; version = "0.2.2.0"; sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5"; libraryHaskellDepends = [ @@ -58251,8 +58759,8 @@ self: { }: mkDerivation { pname = "datarobot"; - version = "1.0.0"; - sha256 = "0ia74i013drj1mwgpq2dv2ayscs2z4hd7amcbzgxrp1b1j2mkhvj"; + version = "1.0.1"; + sha256 = "0arxjghmx50ci9hng6jmcm3jmx7c5k8vycn76d5paw6bjpd1n3mf"; libraryHaskellDepends = [ aeson base bytestring exceptions microlens network-uri safe scientific string-conversions text unordered-containers vector wreq @@ -58612,6 +59120,36 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "dbus_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, directory, extra, filepath, lens, libxml-sax, network + , parsec, process, QuickCheck, random, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift + , transformers, unix, vector, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.0.1"; + sha256 = "1xg8wzs7xnh3455v3bbw9nd8inzr06n5939pzlq3nd4ajp3ba9d3"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq filepath lens libxml-sax + network parsec random split template-haskell text th-lift + transformers unix vector xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath + libxml-sax network parsec process QuickCheck random resourcet tasty + tasty-hunit tasty-quickcheck text transformers unix vector + xml-types + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + homepage = "https://github.com/rblaze/haskell-dbus#readme"; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -58671,8 +59209,8 @@ self: { }: mkDerivation { pname = "dbus-th"; - version = "0.1.2.0"; - sha256 = "02a9xv5kgn9x95aqbqb6kg2snra6nw55mq1jssv8cmr1wy50nmjq"; + version = "0.1.3.0"; + sha256 = "0b1ansjk6j7fzfi2s26dqvka7s85bflw7cl665vplm1sq0is2a0j"; libraryHaskellDepends = [ base containers dbus syb template-haskell text ]; @@ -58686,8 +59224,8 @@ self: { }: mkDerivation { pname = "dbus-th-introspection"; - version = "0.1.0.2"; - sha256 = "1f6lv7jag9mbl8lkk9m4fnggfhbc301g142adk533sx6pwm6zn8x"; + version = "0.1.2.0"; + sha256 = "1d8hqra3sfpvscc3jpgcyllq3gaha24jj0n4y17y4wkhz437ni4f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59080,8 +59618,8 @@ self: { }: mkDerivation { pname = "dde"; - version = "0.1.0"; - sha256 = "0kqcs758rdv186mqk17i66lmzzb34a4fd125669sh9gx255lbwya"; + version = "0.2.0"; + sha256 = "0c0mhyvipn7g1sfjgw8r0qybzcvxm3lzmr1ips2xbr8vv2mxmpm4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59210,37 +59748,6 @@ self: { "debug" = callPackage ({ mkDerivation, aeson, base, bytestring, clock, containers , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed - , js-jquery, libgraph, monoidal-containers, open-browser - , prettyprinter, prettyprinter-compat-ansi-wl-pprint - , template-haskell, text, uniplate, unordered-containers, vector - , yaml - }: - mkDerivation { - pname = "debug"; - version = "0.1"; - sha256 = "05wnaz5p5szba0r6sqz5c0db63wpscmip635v1x35nv3crb2j1r0"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring clock containers deepseq directory extra - ghc-prim hashable Hoed js-jquery libgraph monoidal-containers - open-browser prettyprinter prettyprinter-compat-ansi-wl-pprint - template-haskell text uniplate unordered-containers vector - ]; - executableHaskellDepends = [ aeson base directory filepath yaml ]; - testHaskellDepends = [ - aeson base bytestring containers directory extra filepath text - ]; - homepage = "https://github.com/ndmitchell/debug"; - description = "Simple trace-based debugger"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "debug_0_1_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, clock, containers - , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed , libgraph, open-browser, prettyprinter , prettyprinter-compat-ansi-wl-pprint, template-haskell, text , uniplate, unordered-containers, vector, yaml @@ -59808,14 +60315,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_4_0_0" = callPackage + "dejafu_1_5_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.4.0.0"; - sha256 = "0ydfhgl8011lx5yp3nxhaz1418y7p1d1yfsj9fg1c59djsfrnd45"; + version = "1.5.0.0"; + sha256 = "1d32y12mzd9vfj2ww2cqn4jsvkc4yysnada6wijk5hm6ax7in822"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck profunctors random transformers @@ -60062,8 +60569,8 @@ self: { }: mkDerivation { pname = "dependency"; - version = "0.1.0.9"; - sha256 = "02xlq32xpww584ng5wzzlxmh8d15dqc342mlnfiysh2lfdwqydzk"; + version = "0.1.0.10"; + sha256 = "1cr1h8c127sgbgjg1qy9c17aj3mfp1bh35ypv00sz19k0d6wvmly"; libraryHaskellDepends = [ ansi-wl-pprint base binary containers deepseq microlens recursion-schemes tardis transformers @@ -60173,8 +60680,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "deque"; - version = "0.2"; - sha256 = "0miy1m3lmifrmlsnnmx6djcwq5nb4ar951f2i1bb6n1c94i8sxl6"; + version = "0.2.1"; + sha256 = "0r1jabz5jamm79nrbwjnajzzn77fkhqbjfnmkahg293761z1k781"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/deque"; description = "Double-ended queue"; @@ -60682,26 +61189,65 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall_1_12_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base + , base16-bytestring, bytestring, case-insensitive, containers + , contravariant, cryptonite, deepseq, directory, exceptions + , filepath, formatting, haskeline, http-client, http-client-tls + , insert-ordered-containers, lens-family-core, memory, mtl + , optparse-generic, parsers, prettyprinter + , prettyprinter-ansi-terminal, repline, scientific, tasty + , tasty-hunit, text, transformers, trifecta, unordered-containers + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.12.0"; + sha256 = "065cs20v5ps91mygvha5k5348n62vkhacqyv6fdl4m5b2hs0bkab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base base16-bytestring bytestring case-insensitive + containers contravariant cryptonite directory exceptions filepath + formatting http-client http-client-tls insert-ordered-containers + lens-family-core memory parsers prettyprinter + prettyprinter-ansi-terminal scientific text transformers trifecta + unordered-containers vector + ]; + executableHaskellDepends = [ + ansi-terminal base haskeline mtl optparse-generic prettyprinter + prettyprinter-ansi-terminal repline text trifecta + ]; + testHaskellDepends = [ + base deepseq insert-ordered-containers prettyprinter tasty + tasty-hunit text vector + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-bash" = callPackage - ({ mkDerivation, base, bytestring, containers, dhall + ({ mkDerivation, base, bytestring, containers, dhall, formatting , insert-ordered-containers, neat-interpolation, optparse-generic - , shell-escape, text, text-format, trifecta + , shell-escape, text, trifecta }: mkDerivation { pname = "dhall-bash"; - version = "1.0.10"; - sha256 = "0phi5z7rmbxjj83mps0lcpmcv320k8mrfpigls46smv7srmhsla1"; + version = "1.0.11"; + sha256 = "17jgzb43ga8ddmxjp2mliv0zx6zpy0p7m5dihijpya66g7dkm91g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dhall insert-ordered-containers - neat-interpolation shell-escape text text-format + base bytestring containers dhall formatting + insert-ordered-containers neat-interpolation shell-escape text ]; executableHaskellDepends = [ base bytestring dhall optparse-generic text trifecta ]; description = "Compile Dhall to Bash"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-check" = callPackage @@ -60725,37 +61271,57 @@ self: { "dhall-json" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , optparse-generic, text, trifecta, yaml + , optparse-generic, text, trifecta, unordered-containers, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.12"; - sha256 = "174ssff7fcxgr13w8mcls7w4fy5xzywh8qb55zj9qragj4bkyjab"; + version = "1.0.13"; + sha256 = "03spz9csxgamj970ha9l5swcpbkrvzbjy9w028c1kswzs806699s"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ aeson base dhall text ]; + libraryHaskellDepends = [ + aeson base bytestring dhall text trifecta unordered-containers + ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall optparse-generic text - trifecta yaml + aeson aeson-pretty base bytestring dhall optparse-generic text yaml ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-lex" = callPackage + ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq + , hspec, hspec-dirstream, scientific + }: + mkDerivation { + pname = "dhall-lex"; + version = "0.2.0.0"; + sha256 = "0yxffkmpkab7apvxj5i8a3x233smb5wps5j39h38d91v6kqf5yy2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring deepseq scientific + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ base bytestring hspec hspec-dirstream ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Lexer for the Dhall language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dhall-nix" = callPackage - ({ mkDerivation, base, containers, data-fix, dhall, hnix - , insert-ordered-containers, neat-interpolation, optparse-generic - , scientific, text, text-format, trifecta + ({ mkDerivation, base, containers, data-fix, dhall, formatting + , hnix, insert-ordered-containers, neat-interpolation + , optparse-generic, scientific, text, trifecta }: mkDerivation { pname = "dhall-nix"; - version = "1.1.1"; - sha256 = "01cdz8kjmm0ncdyq616mg6hjq7cwq5648cnrp6ggps5zc1d71176"; + version = "1.1.2"; + sha256 = "0ssb2ncycx6ayislqggf3ljnvk5xzq65g63fj658jkpmv2vh2wyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix insert-ordered-containers - neat-interpolation scientific text text-format + base containers data-fix dhall formatting hnix + insert-ordered-containers neat-interpolation scientific text ]; executableHaskellDepends = [ base dhall hnix optparse-generic text trifecta @@ -60769,8 +61335,8 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.7"; - sha256 = "11jp5yz11f701phzz74zf3spqhgmrdiq8ldbi96xmfjqhwnc9kmj"; + version = "1.0.8"; + sha256 = "05h534bsggz4jysdc4n62l3a0asqr7ba9mpsminisc76f6k5y54d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -60778,6 +61344,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-to-cabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, contravariant + , dhall, Diff, filepath, formatting, hashable + , insert-ordered-containers, optparse-applicative, prettyprinter + , tasty, tasty-golden, text, transformers, trifecta, vector + }: + mkDerivation { + pname = "dhall-to-cabal"; + version = "1.0.0.1"; + sha256 = "0qs00xhsk09azm7sqfihnwmapilmkybmcim1wzlw3h6y4jj6nmq9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers dhall formatting hashable + insert-ordered-containers text transformers trifecta vector + ]; + executableHaskellDepends = [ + base Cabal contravariant dhall hashable insert-ordered-containers + optparse-applicative prettyprinter text + ]; + testHaskellDepends = [ + base bytestring Cabal Diff filepath tasty tasty-golden text + ]; + homepage = "https://github.com/ocharles/dhall-to-cabal"; + description = "Compile Dhall expressions to Cabal files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -61015,8 +61610,8 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.4.0.1"; - sha256 = "0k951bi3b2n33lbjym87l0hcm8v2ww5w2cwfgdmjy8yl4gz1jyff"; + version = "1.4.1"; + sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -62282,13 +62877,13 @@ self: { "direct-sqlite" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, temporary, text + , HUnit, semigroups, temporary, text }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.22"; - sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a"; - libraryHaskellDepends = [ base bytestring text ]; + version = "2.3.23"; + sha256 = "0ywkah9gmjnx0zdlvinc2i898jsbdrw4ba315zkpijaaldp6znqz"; + libraryHaskellDepends = [ base bytestring semigroups text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; @@ -62314,12 +62909,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_2_1" = callPackage + "directory_1_3_2_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.2.1"; - sha256 = "1hr5hvpycjkzl8cwn29xwcggf6xfgz189a57i7aahbdb8bbxzwk5"; + version = "1.3.2.2"; + sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -63572,8 +64167,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "1"; - editedCabalFile = "0dcqfyp38f792nzsv4977dcv4zr4xdrg780lz6bpf2hn7ikdglz9"; + revision = "2"; + editedCabalFile = "1968b6i0azv0bi3x6cw85ga89md1dh1wdmly3ivvvyb6i9mgwrn6"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -64083,14 +64678,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "doctest-discover_0_1_0_8" = callPackage + "doctest-discover_0_1_0_9" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath }: mkDerivation { pname = "doctest-discover"; - version = "0.1.0.8"; - sha256 = "1ilmrc173d5xr7yphrbgg4kmkilyj1a89c67q4zrs4b6xfd5pa2x"; + version = "0.1.0.9"; + sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64137,25 +64732,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.2.0.0"; - sha256 = "02irp8bwr8172m5ix6jgpbhz3nks5khq31v03b5xlrh58nk5hqaf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base doctest ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; - description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "doctest-driver-gen_0_2_0_1" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; - version = "0.2.0.1"; - sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld"; + version = "0.2.0.2"; + sha256 = "0yil9va8l4q1wp6zz6w699103ym54fw03vsigzj12iql6y06cxxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base doctest ]; @@ -65000,8 +65578,8 @@ self: { }: mkDerivation { pname = "drinkery"; - version = "0.2.2"; - sha256 = "1cw8jq1j2yirrk80rk2n1m17avxf3xqln96gnih8xzip248q9bjj"; + version = "0.3"; + sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4"; libraryHaskellDepends = [ base exceptions mtl transformers ]; benchmarkHaskellDepends = [ base conduit conduit-combinators exceptions gauge list-t ListT @@ -65337,14 +65915,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dual-game" = callPackage + ({ mkDerivation, base, bifunctors, cereal, gloss, network + , websockets + }: + mkDerivation { + pname = "dual-game"; + version = "0.1.0.1"; + sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bifunctors cereal gloss network websockets + ]; + homepage = "https://github.com/fgaz/dual"; + description = "Network multiplayer 2D shooting game"; + license = stdenv.lib.licenses.mit; + }) {}; + "dual-tree" = callPackage ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck , semigroups, testing-feat }: mkDerivation { pname = "dual-tree"; - version = "0.2.1"; - sha256 = "06azc2lwli9aw81a23g82yxiann2qjc3bk7cdyh9kiwimdyj8r94"; + version = "0.2.1.1"; + sha256 = "1wzv6rrhz2kz0v1wirgs28fdlr0r4nwxlix9xda4fphzpp922gzr"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -66170,13 +66766,15 @@ self: { }) {}; "easytest" = callPackage - ({ mkDerivation, async, base, containers, mtl, random, stm, text }: + ({ mkDerivation, async, base, call-stack, containers, mtl, random + , stm, text, transformers + }: mkDerivation { pname = "easytest"; - version = "0.1"; - sha256 = "0wjimph83n5fvqgh85ng255qgw3yvagvv7ky1a9lz2blhzb02hh7"; + version = "0.2"; + sha256 = "1sd9w5p6z9mmvxid6svmnh7h43r32mrcqilb8k7kiy36ln3n8j0b"; libraryHaskellDepends = [ - async base containers mtl random stm text + async base call-stack containers mtl random stm text transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/joelburget/easytest"; @@ -66967,27 +67565,6 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.0.14"; - sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd"; - revision = "3"; - editedCabalFile = "1llpsbki0v9p0c820qwv6m4433wfrxfhv8yxrg2xyrrxr8g0p42a"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring ekg-core ekg-json filepath network snap-core - snap-server text time transformers unordered-containers - ]; - homepage = "https://github.com/tibbe/ekg"; - description = "Remote monitoring of processes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ekg_0_4_0_15" = callPackage - ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json - , filepath, network, snap-core, snap-server, text, time - , transformers, unordered-containers - }: - mkDerivation { - pname = "ekg"; version = "0.4.0.15"; sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; revision = "1"; @@ -67000,7 +67577,6 @@ self: { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-bosun" = callPackage @@ -67243,6 +67819,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-statsd_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, network, text, time + , unordered-containers + }: + mkDerivation { + pname = "ekg-statsd"; + version = "0.2.3.0"; + sha256 = "05lakyb0sp6g8nziy6jzk2l19v2371cdnih6pp6myyj6iflx9smf"; + libraryHaskellDepends = [ + base bytestring ekg-core network text time unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-statsd"; + description = "Push metrics to statsd"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-wai" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, http-types, network, text, time, transformers @@ -67262,6 +67855,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-wai_0_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, http-types, network, text, time, transformers + , unordered-containers, wai, wai-app-static, warp + }: + mkDerivation { + pname = "ekg-wai"; + version = "0.1.0.3"; + sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring ekg-core ekg-json filepath http-types network + text time transformers unordered-containers wai wai-app-static warp + ]; + homepage = "https://github.com/tvh/ekg-wai"; + description = "Remote monitoring of processes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "electrum-mnemonic" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck }: mkDerivation { @@ -68541,18 +69154,6 @@ self: { }) {}; "enummapset" = callPackage - ({ mkDerivation, base, containers, deepseq }: - mkDerivation { - pname = "enummapset"; - version = "0.5.2.1"; - sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg"; - libraryHaskellDepends = [ base containers deepseq ]; - homepage = "https://github.com/michalt/enummapset"; - description = "IntMap and IntSet with Enum keys/elements"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "enummapset_0_5_2_2" = callPackage ({ mkDerivation, base, containers, deepseq, semigroups }: mkDerivation { pname = "enummapset"; @@ -68562,7 +69163,6 @@ self: { homepage = "https://github.com/michalt/enummapset"; description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enummapset-th" = callPackage @@ -69031,6 +69631,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "error-context" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, katip + , monad-logger, mtl, resourcet, safe-exceptions, tasty, tasty-hunit + , text, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "error-context"; + version = "0.2.0.1"; + sha256 = "033z3niag5hf9dynjxdrg6v9s6f05hpndknfs7xlgkwrrgq3gmnb"; + libraryHaskellDepends = [ + aeson base bytestring exceptions katip monad-logger mtl resourcet + safe-exceptions text unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring exceptions katip monad-logger mtl resourcet + safe-exceptions tasty tasty-hunit text unliftio-core + unordered-containers + ]; + homepage = "https://github.com/mtesseract/error-context#readme"; + description = "Provides API for enriching errors with contexts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "error-continuations" = callPackage ({ mkDerivation, base, either, mtl, transformers }: mkDerivation { @@ -69193,6 +69816,8 @@ self: { pname = "ersatz"; version = "0.4.2"; sha256 = "1rr46awz0rbzg0i6424rnrykcwkgwxfzgx5d5qmva4y41l62vkxf"; + revision = "1"; + editedCabalFile = "098i7593rlc81618y1cz6bmsp2y0vlimz8hnqlzja4m8mclfsbx2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -69272,6 +69897,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "escoger" = callPackage + ({ mkDerivation, base, bytestring, criterion, HUnit, mtl + , test-framework, test-framework-hunit, unix, vector + , vector-algorithms, vty + }: + mkDerivation { + pname = "escoger"; + version = "0.1.0.0"; + sha256 = "0xcs1wg5d6dphnx255pcvvcszkpib0v8gy79w25grrrda5gyplvx"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring mtl unix vector vector-algorithms vty + ]; + executableHaskellDepends = [ base bytestring mtl unix vector vty ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion unix vector vty + ]; + doHaddock = false; + description = "Terminal fuzzy selector"; + license = stdenv.lib.licenses.mit; + }) {}; + "esotericbot" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , directory, fgl, mtl, network, stm, stream-fusion, tuple, unix @@ -69386,23 +70037,18 @@ self: { }) {}; "etc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, hashable, rio, tasty, tasty-hunit + , text, typed-process, unliftio }: mkDerivation { pname = "etc"; - version = "0.2.0.0"; - sha256 = "16l5ap8ag2l3ks6pjwr49wk4njgap44kbxsqb69yr9lr81wrj9fv"; + version = "0.3.1.0"; + sha256 = "0l938jhlx1jgb46b9ykdc741r0v7wkklrc1ga5v81r3b52civb1c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers directory exceptions hashable - protolude text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers protolude tasty tasty-hunit - tasty-rerun text unordered-containers vector + aeson base hashable rio text typed-process unliftio ]; + testHaskellDepends = [ aeson base rio tasty tasty-hunit ]; homepage = "https://github.com/roman/Haskell-etc"; description = "Declarative configuration spec for Haskell projects"; license = stdenv.lib.licenses.mit; @@ -69825,6 +70471,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eve-cli" = callPackage + ({ mkDerivation, base, bytestring, eve, lens, mtl, text, vty }: + mkDerivation { + pname = "eve-cli"; + version = "0.2.0.0"; + sha256 = "0l9c7mpmw7i9kgmirnkb84q6lfw0ry5z5j2049sv47klczdv285a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring eve lens mtl text vty ]; + executableHaskellDepends = [ + base bytestring eve lens mtl text vty + ]; + testHaskellDepends = [ base bytestring eve lens mtl text vty ]; + homepage = "https://github.com/ChrisPenner/eve-cli#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "event" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { @@ -70361,6 +71024,8 @@ self: { pname = "except-exceptions"; version = "0.1"; sha256 = "03d94arrq8ynkbchv8w2vp4q3wka81hkrmkll6bd9p5kwhq28nzs"; + revision = "1"; + editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk"; libraryHaskellDepends = [ base exceptions transformers ]; homepage = "https://github.com/thumphries/except-exceptions"; description = "Safely deal with exceptions in ExceptT"; @@ -70445,8 +71110,8 @@ self: { }: mkDerivation { pname = "exception-transformers"; - version = "0.4.0.5"; - sha256 = "12q8c64kg2ksz90ld32m6n811c54syhwihnj2fd7blf2qsmalk2n"; + version = "0.4.0.6"; + sha256 = "0abxwkq28wasy06njhaibf8cki9hifk5rjck6r3izbnswjcdn65m"; libraryHaskellDepends = [ base stm transformers transformers-compat ]; @@ -71247,6 +71912,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "extensible-effects_2_5_2_0" = callPackage + ({ mkDerivation, base, criterion, HUnit, monad-control, mtl + , QuickCheck, silently, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, transformers-base + }: + mkDerivation { + pname = "extensible-effects"; + version = "2.5.2.0"; + sha256 = "12rj2b1zn3lqk5anv01lf95mmadazripa6731jf3m2m5di00i4sc"; + libraryHaskellDepends = [ base monad-control transformers-base ]; + testHaskellDepends = [ + base HUnit monad-control QuickCheck silently test-framework + test-framework-hunit test-framework-quickcheck2 test-framework-th + ]; + benchmarkHaskellDepends = [ + base criterion HUnit mtl test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th + ]; + homepage = "https://github.com/suhailshergill/extensible-effects"; + description = "An Alternative to Monad Transformers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -71289,8 +71978,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.4"; - sha256 = "02i4wjp9wgnp2f89d7fj3jnc2pkkcnw068qh85sim3pfabz0a9hw"; + version = "1.6.5"; + sha256 = "05x89gclm8vw1rx4945p3asmsa28055y81nwzvgq91yr5qc4lbgi"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -71721,19 +72410,23 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat + ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat-compat , composition-prelude, criterion, gmpint, hspec, numbertheory , QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.3.2"; - sha256 = "08szj3rli8vnzl34j4x6xcydhk3k1nm12ziwqrxffbnsrvzjslvi"; + version = "0.3.3.7"; + sha256 = "13kcqs7z5vwafvs5d1h14brry0dmijld0c8vz2wmaqr6ijjx86a6"; setupHaskellDepends = [ ats-pkg base Cabal ]; libraryHaskellDepends = [ base composition-prelude gmpint ]; librarySystemDepends = [ numbertheory ]; - testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; - benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; + testHaskellDepends = [ + arithmoi base combinat-compat hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + arithmoi base combinat-compat criterion + ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; @@ -72078,6 +72771,8 @@ self: { pname = "fay"; version = "0.24.0.0"; sha256 = "1my71a3cmd637ch5jwsdpyvfx6vsi2vnvshbrwmcx9ya1xm6x7z2"; + revision = "1"; + editedCabalFile = "1bx1dyxir8h0c1qybkfdra36rmdhk7gpgz071v9spl9lplqvpw9s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72271,6 +72966,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fb_1_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, bytestring, cereal, conduit, conduit-extra + , containers, crypto-api, cryptohash, cryptohash-cryptoapi + , data-default, hspec, http-client, http-conduit, http-types, HUnit + , monad-logger, old-locale, QuickCheck, resourcet, text, time + , transformers, transformers-base, unliftio, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "fb"; + version = "1.2.1"; + sha256 = "05ax0pd9j6c64n48r9q03k5pg2axkmv11cz6azjg7k72cfkp1mm9"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + bytestring cereal conduit conduit-extra crypto-api cryptohash + cryptohash-cryptoapi data-default http-client http-conduit + http-types monad-logger old-locale resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers data-default hspec + http-conduit HUnit QuickCheck resourcet text time transformers + unliftio + ]; + homepage = "https://github.com/psibi/fb"; + description = "Bindings to Facebook's API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fb-persistent" = callPackage ({ mkDerivation, base, cereal, fb, persistent, text, time }: mkDerivation { @@ -72593,8 +73319,8 @@ self: { pname = "feed"; version = "1.0.0.0"; sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck"; - revision = "2"; - editedCabalFile = "1xrx0r63qr14vxqrsw9xmwnhna3p4gqngv46ysyv2r49raq6bz3q"; + revision = "3"; + editedCabalFile = "1v1kx8s1fgw0wkqbpxq9q9ky1akvvpgim2rp1s7w8vmjnxm9lwbx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -73272,6 +73998,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed-lzma" = callPackage + ({ mkDerivation, base, base-compat, bytestring, directory, filepath + , lzma, template-haskell, text, th-lift-instances, transformers + }: + mkDerivation { + pname = "file-embed-lzma"; + version = "0"; + sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; + revision = "1"; + editedCabalFile = "18q9dgfdsr7r5mlqzhhgbx0bp4bv2xkpcsrihl655pwaj1lz1v2s"; + libraryHaskellDepends = [ + base base-compat bytestring directory filepath lzma + template-haskell text th-lift-instances transformers + ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/phadej/file-embed-lzma"; + description = "Use Template Haskell to embed (LZMA compressed) data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "file-embed-poly" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath , hspec, template-haskell @@ -73358,8 +74104,8 @@ self: { }: mkDerivation { pname = "filecache"; - version = "0.3.1"; - sha256 = "199npfbnnbf01ygwj559ikz51bfz23pggnvgdmj2azscbd80mbq7"; + version = "0.3.2"; + sha256 = "1ddpji3293hrhw7rgl7b41prhffjsb7rgf5x2ijjbiblnzwazr42"; libraryHaskellDepends = [ base containers directory exceptions filepath fsnotify mtl stm strict-base-types time @@ -73521,8 +74267,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.3.1"; - sha256 = "1pnqb816syl8j03wfk1p96vqlb64xkl45cxlkmqsriwi4ar0svw1"; + version = "0.6.3.2"; + sha256 = "0nx16b6nvzvzwrwrbyzjm7dh2ilk3vbrwr6r9m2c62ll1k99100v"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale @@ -73770,8 +74516,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.3.1"; - sha256 = "08wqzrjdndd7svkil1wr964w4d7zay04nlg7dyzw7wm4d3d3ak4p"; + version = "0.1.4.1"; + sha256 = "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -74373,6 +75119,8 @@ self: { pname = "fixplate"; version = "0.1.7"; sha256 = "0brll5vkb3341l5iblrc1r50jzg8q6ycvbqvrc9jnj2nc86mslay"; + revision = "1"; + editedCabalFile = "0ynmm06iblqsyzfc068sdvmlpll8zwyccwkdlji3nf535biv56hb"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck @@ -74868,21 +75616,6 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.11"; - sha256 = "11cgab1wyqdjzyx6ygh91yl03w70aivspmlavl4if6p9yr5z9rw7"; - revision = "2"; - editedCabalFile = "13gyzkk29qkq8pnfnxvq2ymag2r3f6h1hpxk7yhy1r3k9hmp5469"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - homepage = "https://github.com/tfausak/flow#readme"; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_12" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; version = "1.0.12"; sha256 = "0c9mg6d8krv7c0sxlkgcpvhcspb8g65hp0h7pgjql4644ivqpn3p"; libraryHaskellDepends = [ base ]; @@ -74890,7 +75623,6 @@ self: { homepage = "https://github.com/tfausak/flow#readme"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -75072,8 +75804,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.4"; - sha256 = "1bv7djak2ilirk7ajm8w6100bk6vx14znf3699blih72kyql6rgh"; + version = "0.5.4.5"; + sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -75224,24 +75956,24 @@ self: { }) {}; "fluid-idl" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, errors - , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl - , random, safe-exceptions, scientific, text, text-conversions - , unordered-containers, vector + ({ mkDerivation, aeson, base, blaze-markup, bytestring, containers + , errors, exceptions, hspec, lifted-async, monad-control + , monad-logger, mtl, random, safe-exceptions, scientific, text + , text-conversions, unordered-containers, vector }: mkDerivation { pname = "fluid-idl"; - version = "0.0.5"; - sha256 = "1yv4qslqa335r6bwjpll45lz8y6pj3m8cvjzlc2xadg05m2yy89w"; + version = "0.0.6"; + sha256 = "06zdwvjdgv401h5gf3zagvxd01r20pldv327ag3d8clwvg51sgnr"; libraryHaskellDepends = [ - aeson base bytestring containers errors exceptions lifted-async - monad-control monad-logger mtl random safe-exceptions scientific - text text-conversions unordered-containers vector + aeson base blaze-markup bytestring containers errors exceptions + lifted-async monad-control monad-logger mtl random safe-exceptions + scientific text text-conversions unordered-containers vector ]; testHaskellDepends = [ aeson base containers hspec scientific text vector ]; - description = "Fluid | The Programmatic IDL"; + description = "Code-generated, Auto-versioned, & Smart Web APIs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -75427,8 +76159,8 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.2.0.0"; - sha256 = "0ba42cxcjr7llsx42qmzg6kc497c35rkm4ndm114p0nf1mijn8nr"; + version = "0.2.0.1"; + sha256 = "02shx123yd9g9y8n9aj6ai6yrlcb7zjqyhvw530kw68ailnl762z"; libraryHaskellDepends = [ base conduit fold-debounce resourcet stm transformers transformers-base @@ -76035,23 +76767,6 @@ self: { "formatting" = callPackage ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec - , integer-gmp, old-locale, scientific, text, time, transformers - }: - mkDerivation { - pname = "formatting"; - version = "6.3.1"; - sha256 = "0yfl3xb0dyig8imzxxaq2lh6gy3rn07c6zxncvmzjzlpzy6kqc2n"; - libraryHaskellDepends = [ - array base bytestring clock ghc-prim integer-gmp old-locale - scientific text time transformers - ]; - testHaskellDepends = [ base hspec ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "formatting_6_3_2" = callPackage - ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec , integer-gmp, old-locale, scientific, semigroups, text, time , transformers }: @@ -76066,7 +76781,6 @@ self: { testHaskellDepends = [ base hspec semigroups ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forml" = callPackage @@ -77279,8 +77993,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "frp-arduino"; - version = "0.1.0.3"; - sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5"; + version = "0.1.1.0"; + sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://github.com/frp-arduino/frp-arduino"; description = "Arduino programming without the hassle of C"; @@ -77439,6 +78153,8 @@ self: { pname = "fsnotify"; version = "0.2.1.1"; sha256 = "146wsblhfwnbclzffxk6m43bqap3sgw332gs67030z6h5ab7anhp"; + revision = "1"; + editedCabalFile = "0kag32lqkjmv03bycf6ip2vd6vzpcpq4iqs6ivyjh93v40252xxp"; libraryHaskellDepends = [ async base containers directory filepath hinotify text time unix-compat @@ -77853,22 +78569,25 @@ self: { }) {}; "funcons-tools" = callPackage - ({ mkDerivation, base, bv, containers, directory, mtl, multiset - , parsec, split, text, vector + ({ mkDerivation, base, bv, containers, directory, funcons-values + , gll, mtl, multiset, random-strings, regex-applicative, split + , text, TypeCompose, vector }: mkDerivation { pname = "funcons-tools"; - version = "0.1.0.0"; - sha256 = "1vwnznj92cm2g1m2xlvj8b5qzaspl3zrygr5z7b8593qylm6bwlr"; - revision = "2"; - editedCabalFile = "0530f406ykmb4xxmh7knmaxgcpym7n2wl6d2ylvrn3azqfdsvsgy"; + version = "0.2.0.1"; + sha256 = "1a27xhzakvrc29kli293ivkzmqfma71s942a9bsyvss15g1881fn"; + revision = "1"; + editedCabalFile = "1lfqgrrc814j0zyx2z8v0nx367bgifr93gb86dd4hshz2vvq5b49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bv containers directory mtl multiset parsec split text vector + base bv containers directory funcons-values gll mtl multiset + random-strings regex-applicative split text TypeCompose vector ]; executableHaskellDepends = [ - base bv containers directory mtl multiset parsec split text vector + base bv containers directory funcons-values gll mtl multiset + random-strings regex-applicative split text TypeCompose vector ]; homepage = "http://plancomps.org"; description = "A modular interpreter for executing funcons"; @@ -77876,6 +78595,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "funcons-values" = callPackage + ({ mkDerivation, base, bv, containers, multiset, random-strings + , text, vector + }: + mkDerivation { + pname = "funcons-values"; + version = "0.1.0.2"; + sha256 = "0pywpqnjhwny1l1kz6hn135rbmgdglzpvfvq4ffjllzdj2w9ciy2"; + libraryHaskellDepends = [ + base bv containers multiset random-strings text vector + ]; + homepage = "http://plancomps.org"; + description = "Library providing values and operations on values"; + license = stdenv.lib.licenses.mit; + }) {}; + "function-combine" = callPackage ({ mkDerivation, base, data-type }: mkDerivation { @@ -78023,13 +78758,13 @@ self: { }) {}; "functor-utils" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { pname = "functor-utils"; - version = "1.1"; - sha256 = "1finmjwpw4sjzwifjmcpb90wmy7abhdnrhz2p5s7fxw68vccnm50"; - libraryHaskellDepends = [ base ghc-prim ]; - homepage = "https://github.com/wdanilo/functor-utils"; + version = "1.17.1"; + sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld"; + libraryHaskellDepends = [ base ghc-prim lens ]; + homepage = "https://github.com/luna/functor-utils"; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -79223,8 +79958,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.9"; sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; - revision = "2"; - editedCabalFile = "05hn4bjqrx1fimlwwbv9358806m4q1dkbfw886lpkkhbflr7jmn9"; + revision = "3"; + editedCabalFile = "0dlxl7p1nf8d4yh6r5yfdnrsn4wb5wl7bj9ymln744b498frlfln"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -79272,6 +80007,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "generic-data" = callPackage + ({ mkDerivation, base, contravariant, show-combinators, tasty + , tasty-hunit + }: + mkDerivation { + pname = "generic-data"; + version = "0.1.0.0"; + sha256 = "1fc2q8wzs67ww0dy00wsyyqnhb5igrpqsvi1hwxxsq5z00icvk6z"; + libraryHaskellDepends = [ base contravariant show-combinators ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/Lysxia/generic-data#readme"; + description = "Utilities for GHC.Generics"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-deepseq" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -79351,6 +80101,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-lens_1_0_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, HUnit + , inspection-testing, lens, profunctors, QuickCheck, tagged + }: + mkDerivation { + pname = "generic-lens"; + version = "1.0.0.1"; + sha256 = "0j83ynggqfaxp9g36lkjl9af57qixid9j1x1ljglny1zxqkgm888"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; + homepage = "https://github.com/kcsongor/generic-lens"; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -79483,8 +80254,10 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "generic-trie"; - version = "0.3.0.2"; - sha256 = "1sgqmc81m7fivla96lx2a8qqm8vg5jczqsaajblf0ygdjmg9lc9q"; + version = "0.3.1"; + sha256 = "1x7f5bp7d13g737198l43y2mf9mzngg9vmhyh1yaxg8xfpzc3anh"; + revision = "1"; + editedCabalFile = "0rr6fncm17ff7z9jdb90gvd03smd8vlhmhzf5b9hzms7s2scnvh6"; libraryHaskellDepends = [ base containers transformers ]; homepage = "http://github.com/glguy/tries"; description = "A map, where the keys may be complex structured data"; @@ -79515,8 +80288,8 @@ self: { pname = "generic-xmlpickler"; version = "0.1.0.5"; sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; - revision = "6"; - editedCabalFile = "0jc2rnh8kyzay8ny59ahqb9q6vmp7si4aps1a42la79735078x51"; + revision = "7"; + editedCabalFile = "0v4sqm0m8vr2i6hinx0mpax3mz73mvf21bdbga0vdgx7dac2nvkb"; libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt hxt-pickle-utils tasty tasty-hunit tasty-th @@ -79546,12 +80319,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generics-eot_0_4" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, hspec + , interpolate, markdown-unlit, mockery, QuickCheck, shake, silently + }: + mkDerivation { + pname = "generics-eot"; + version = "0.4"; + sha256 = "16yfzv9aqyizm57r5m5ddwdnlh05fvlrxjn6m3vqz33kvy3drgjs"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath hspec interpolate markdown-unlit + mockery QuickCheck shake silently + ]; + homepage = "https://generics-eot.readthedocs.io/"; + description = "A library for generic programming that aims to be easy to understand"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; version = "0.3.2.0"; sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; + revision = "1"; + editedCabalFile = "1cijsc0chx04i8v1n8zhlkd00dmrjq2pcpiw0y9126vmnxw5l90l"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -80401,26 +81195,6 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.13.0.1"; - sha256 = "10sfab5frm53bll8kh6bkwg0y0cv47740sxy6gsnd9fycvixf0k9"; - libraryHaskellDepends = [ - base base-compat base-orphans generics-sop tagged - ]; - testHaskellDepends = [ - base base-compat base-orphans filepath generics-sop hspec - QuickCheck safe silently tagged - ]; - homepage = "https://github.com/soenkehahn/getopt-generics#readme"; - description = "Create command line interfaces with ease"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "getopt-generics_0_13_0_2" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, filepath - , generics-sop, hspec, QuickCheck, safe, silently, tagged - }: - mkDerivation { - pname = "getopt-generics"; version = "0.13.0.2"; sha256 = "0330f63gy5gk461hvyy79jxrz5bcxdh2sgl0r1g1ffl4swjsl176"; libraryHaskellDepends = [ @@ -80433,7 +81207,6 @@ self: { homepage = "https://github.com/soenkehahn/getopt-generics#readme"; description = "Create command line interfaces with ease"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "getopt-simple" = callPackage @@ -80537,20 +81310,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_2_1" = callPackage + "ghc_8_4_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy - , hoopl, hpc, process, template-haskell, terminfo, time - , transformers, unix + , hpc, process, template-haskell, terminfo, time, transformers + , unix }: mkDerivation { pname = "ghc"; - version = "8.2.1"; - sha256 = "0b87bj9n2zsi0v9s5ssf5b9c4y4lji7jbxp9j8s93hb95zlmzq17"; + version = "8.4.1"; + sha256 = "1axvba6vd13bf9z45jffv05r3jy5n5pxly59r8s5pxh369188076"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - ghc-boot ghc-boot-th ghci hoopl hpc process template-haskell - terminfo time transformers unix + ghc-boot ghc-boot-th ghci hpc process template-haskell terminfo + time transformers unix ]; libraryToolDepends = [ alex happy ]; homepage = "http://www.haskell.org/ghc/"; @@ -80650,6 +81423,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-core-smallstep" = callPackage + ({ mkDerivation, base, ghc, ghc-paths }: + mkDerivation { + pname = "ghc-core-smallstep"; + version = "0.1.0.1"; + sha256 = "1yz0qzy1h5134sbmhrk7gn192fcw729bnzdkqf5wh8vh9a396l21"; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ base ghc ghc-paths ]; + description = "A small-step semantics for Core"; + license = stdenv.lib.licenses.mit; + }) {}; + "ghc-datasize" = callPackage ({ mkDerivation, base, deepseq, ghc-heap-view }: mkDerivation { @@ -81153,12 +81938,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_1_1" = callPackage + "ghc-prim_0_5_2_0" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.1.1"; - sha256 = "1dkl0l891min86jpndcah8dx7i3ssnaj6yf2ghxplp8619bmqhb2"; + version = "0.5.2.0"; + sha256 = "1ccvzkw3v4xlj7g126wwlc5rvd480hbv1pcq2rfb85k77rzi6bjr"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -81171,28 +81956,6 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1"; - sha256 = "1jpf2pn37vgwqcnsm799g9s9d7qbxk9d305b6i2k12573cv1x8r4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - homepage = "https://github.com/maoe/ghc-prof"; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1_1" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; version = "1.4.1.1"; sha256 = "1zxk2fs0zykpqklyfwssbi5hfmzm7hc1yx8l8x1fy29qxim3y2z5"; isLibrary = true; @@ -81207,7 +81970,6 @@ self: { homepage = "https://github.com/maoe/ghc-prof"; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-aeson" = callPackage @@ -82152,8 +82914,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.16"; - sha256 = "1xm13f4whvi08bwq2n6axkz1sirhqpsxpnfq9c8px0j9izy9qnpb"; + version = "2.0.18"; + sha256 = "0h7liqxf63wmhjzgbjshv7pa4fx743jpvkphn5yyjkc0bnfcvsqk"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -82375,8 +83137,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.21"; - sha256 = "01ivj9hs5jys1p4znfgrwxmd2848nhs73cscfww733rgdpwdlfw6"; + version = "3.0.22"; + sha256 = "017nnypxsrxsqar7pmbf0kwvbkpdnp3y7dvn8s82b09qiymxa0rz"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -82398,10 +83160,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.5.0"; - sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv"; - revision = "2"; - editedCabalFile = "0cv2ca8skkz4gfnw7xxy9ppcxcr9d97rnxr1jj5ii7nki9njb693"; + version = "0.3.6.1"; + sha256 = "0qa1ig3z44p47badin0v3rnwilck05659jnk7xcvh2pjhmjmpclw"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -82628,8 +83388,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.15"; - sha256 = "1imgkbqfkdf7vbx4x170qnnyivy7jdn4hcj428wv3996ff5pjqa6"; + version = "2.4.16"; + sha256 = "01qsq8hy974j8i35spac1iyc46jrl4p0nnlx666nlxqa08a1f438"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -82900,8 +83660,8 @@ self: { }: mkDerivation { pname = "giphy-api"; - version = "0.5.2.0"; - sha256 = "1sbwv6mvjb17g95b1b1ggryhk6lykp2vwvxja3y6z9rjzb9i2wa4"; + version = "0.6.0.1"; + sha256 = "0146813vcnjgb8clyczlz8g6ngm9l702gib60f2m6rf2bc0bbpwd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82986,18 +83746,18 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus - , directory, disk-free-space, dlist, dns, edit-distance, esqueleto - , exceptions, fdo-notify, feed, filepath, free, git, gnupg - , hinotify, hslogger, http-client, http-conduit, http-types, IfElse - , lsof, magic, memory, monad-control, monad-logger, mountpoints - , mtl, network, network-info, network-multicast, network-uri - , old-locale, openssh, optparse-applicative, path-pieces, perl - , persistent, persistent-sqlite, persistent-template, process - , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore - , sandi, securemem, shakespeare, socks, split, stm, stm-chans - , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , clientsession, concurrent-output, conduit, containers, crypto-api + , cryptonite, curl, data-default, DAV, dbus, directory + , disk-free-space, dlist, dns, edit-distance, esqueleto, exceptions + , fdo-notify, feed, filepath, free, git, gnupg, hinotify, hslogger + , http-client, http-conduit, http-types, IfElse, lsof, magic + , memory, monad-control, monad-logger, mountpoints, mtl, network + , network-info, network-multicast, network-uri, old-locale, openssh + , optparse-applicative, path-pieces, perl, persistent + , persistent-sqlite, persistent-template, process, QuickCheck + , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi + , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup + , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core @@ -83005,8 +83765,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180316"; - sha256 = "0wdsyiiswki4m9hv5j65rhivqn8g01smrhj0s19fz2rbvpcfn5cb"; + version = "6.20180409"; + sha256 = "05cwyh3x432k3czrd59py0jsvl3qjg8ky7nc0rxkw6pbzwpgcb8c"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -83021,20 +83781,20 @@ self: { ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - conduit-extra containers crypto-api cryptonite data-default DAV - dbus directory disk-free-space dlist dns edit-distance esqueleto - exceptions fdo-notify feed filepath free hinotify hslogger - http-client http-conduit http-types IfElse magic memory - monad-control monad-logger mountpoints mtl network network-info - network-multicast network-uri old-locale optparse-applicative - path-pieces persistent persistent-sqlite persistent-template - process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi - securemem shakespeare socks split stm stm-chans tagsoup tasty - tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time - torrent transformers unix unix-compat unordered-containers - utf8-string uuid vector wai wai-extra warp warp-tls yesod - yesod-core yesod-form yesod-static + case-insensitive clientsession concurrent-output conduit containers + crypto-api cryptonite data-default DAV dbus directory + disk-free-space dlist dns edit-distance esqueleto exceptions + fdo-notify feed filepath free hinotify hslogger http-client + http-conduit http-types IfElse magic memory monad-control + monad-logger mountpoints mtl network network-info network-multicast + network-uri old-locale optparse-applicative path-pieces persistent + persistent-sqlite persistent-template process QuickCheck random + regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare + socks split stm stm-chans tagsoup tasty tasty-hunit + tasty-quickcheck tasty-rerun template-haskell text time torrent + transformers unix unix-compat unordered-containers utf8-string uuid + vector wai wai-extra warp warp-tls yesod yesod-core yesod-form + yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -83436,8 +84196,8 @@ self: { pname = "github"; version = "0.19"; sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph"; - revision = "1"; - editedCabalFile = "0f6frc80nkwxjp8p0mr6x6x0jd9vvwi0aw0a8yfsk7lxvd4lr6cs"; + revision = "2"; + editedCabalFile = "0ib40npsrwd92mgiqv5rqv21dnhmdh5x6ql84i8ivz8vs2a43hqq"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -83534,27 +84294,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.1.5"; - sha256 = "04248cgs4wi348c9v6qdn6yhyrg8mmdq75nib4rpr795sk1gvdfb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/github-release#readme"; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_1_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; version = "1.1.6"; sha256 = "1amvbrs7sb6d2l20rr4qc8gjj6m9xlhgkbrr13nrnjfg5fg0midn"; isLibrary = true; @@ -83570,7 +84309,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -83679,6 +84417,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "githud" = callPackage + ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, unix + }: + mkDerivation { + pname = "githud"; + version = "2.0.2"; + sha256 = "0nhik30c7xzn3aqj8d8b8rk05viqmhl8q9ymswxxn9ws2nkm7rk8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec process text unix ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "http://github.com/gbataille/gitHUD#readme"; + description = "More efficient replacement to the great git-radar"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -84065,27 +84824,6 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "0.3.4"; - sha256 = "00dwlxl05g2s6br0nya2ayp24yjmf8rg6y3yi6bnqs0a2fyyzq42"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - homepage = "https://github.com/MichelBoucey/glabrous"; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_0_3_5" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , cereal, cereal-text, directory, either, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "glabrous"; version = "0.3.5"; sha256 = "0n3mqpcmxz9z339r18dac5s4zdgkknlx470cd1mfi9gd932cr4z9"; libraryHaskellDepends = [ @@ -84098,7 +84836,6 @@ self: { homepage = "https://github.com/MichelBoucey/glabrous"; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -84421,8 +85158,8 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.4.0.4"; - sha256 = "01qnvynldllb4qdvg29r64qq17qb1fs8yg7jgyj3f8ajgyi5jn9q"; + version = "0.4.0.5"; + sha256 = "09z7i4h5zwgyh3gg5w0l6p0ch1lhzmsnbmk1yfbc9b21gbxna5js"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; @@ -84595,10 +85332,8 @@ self: { ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { pname = "gloss-accelerate"; - version = "2.0.0.0"; - sha256 = "1hfiy2j7850yisbakz5nadr6l9k5maqq5mvg1xhak9jj1k1ji9if"; - revision = "1"; - editedCabalFile = "1arsf3j8b59qr5z5sy5sxx5mdddagjginrqs3jb9lpj1s3c3672b"; + version = "2.0.0.1"; + sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -84754,8 +85489,8 @@ self: { pname = "gloss-raster-accelerate"; version = "2.0.0.0"; sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; - revision = "1"; - editedCabalFile = "07c56r31akmq7hq0cyw4lc4h5370laand231wjd5ffwk369x2prg"; + revision = "2"; + editedCabalFile = "0k0a562qa8khj39zpgp4sr8kh8h2q4krjjhbvpbsll4r83067ahj"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -84993,8 +85728,8 @@ self: { ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.5"; - sha256 = "1xi840k962nz3mkf48sc08z4lbdmx8rmix00gzxywyjyia33zg3r"; + version = "0.1.0.7"; + sha256 = "1p0iqsvx85ycd5xab73k5aaj796kqanbkjfmivslb6i6ibix02v9"; libraryHaskellDepends = [ base recursion-schemes ]; librarySystemDepends = [ gmp ]; homepage = "https://github.com/vmchale/gmpint#readme"; @@ -85062,8 +85797,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.30"; - sha256 = "1cjfhpza7mhfywx09rf2qzglqwyss3ndk9sqn0vwvpv4c2wvglaq"; + version = "0.3.31"; + sha256 = "0raqapwms5c160n1nqjvmnzqxhimjd1aa8ji9jgb5iv37gfalv8z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86941,6 +87676,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-oauth2-easy" = callPackage + ({ mkDerivation, aeson, base, criterion, http-api-data, http-client + , mtl, servant, servant-client, tasty, tasty-hspec, text + , text-conversions, unordered-containers + }: + mkDerivation { + pname = "google-oauth2-easy"; + version = "0.0.0"; + sha256 = "03jzlshz7649rvgmql5nsq4hys253dlqpm163xqpccif1s34z59b"; + libraryHaskellDepends = [ + aeson base http-api-data http-client mtl servant servant-client + text text-conversions unordered-containers + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/jxv/google-oauth2-easy#readme"; + description = "Opininated use of Google Authentication for ease"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-oauth2-for-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , hspec, http-types, req, time, unix, wai, warp @@ -86975,6 +87731,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "google-oauth2-jwt_0_3_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.3.0"; + sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj"; + libraryHaskellDepends = [ + base base64-bytestring bytestring HsOpenSSL RSA text unix-time + ]; + homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; + description = "Get a signed JWT for Google Service Accounts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-search" = callPackage ({ mkDerivation, base, free, nats, text, time }: mkDerivation { @@ -87568,8 +88341,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.2.2"; - sha256 = "0l1zjgn4jix9m2zbiwnms3c6004zqzpqxwvsdq9fmafbh7zhfvvx"; + version = "0.3"; + sha256 = "1dqmjg40h4gm6921yq84sx8x5sdbzhnv8xl7m2ylb872ddbzfwg3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87579,8 +88352,8 @@ self: { base containers monoid-subclasses parsers rank2classes ]; testHaskellDepends = [ - base checkers doctest monoid-subclasses parsers QuickCheck - rank2classes tasty tasty-quickcheck testing-feat + base checkers containers doctest monoid-subclasses parsers + QuickCheck rank2classes tasty tasty-quickcheck testing-feat ]; benchmarkHaskellDepends = [ base containers criterion deepseq monoid-subclasses rank2classes @@ -88082,8 +88855,8 @@ self: { }: mkDerivation { pname = "graphite"; - version = "0.9.6.0"; - sha256 = "0qryrwsj4pwvk804hv0cqglk197y895xlhgf5mq9azsp7ll39w3v"; + version = "0.9.8.0"; + sha256 = "1ylpa2kkbdhfgiq7g1kdlvjzs2ln3ag8pssp0widzz1p0is8ldm1"; libraryHaskellDepends = [ base bytestring cassava containers deepseq graphviz hashable process QuickCheck random semigroups text unordered-containers @@ -88482,8 +89255,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.1.0.0"; - sha256 = "0krmn6gbf50q8w9gm041zangfsc1c738ajahzg65hcclkca2iq4c"; + version = "0.1.1.0"; + sha256 = "1mf1fgp1i3pxayhgkc4jmx3fjx3s16vcn9n2jbg750d6nif6yyxi"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers unordered-containers @@ -88500,14 +89273,14 @@ self: { "greskell-core" = callPackage ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec - , QuickCheck, scientific, text, unordered-containers + , QuickCheck, scientific, semigroups, text, unordered-containers }: mkDerivation { pname = "greskell-core"; - version = "0.1.0.0"; - sha256 = "1s8hwfp4vfyj5zb8kfvk7ahi5crbf6jwsjk2g188nf7gzy76mf6v"; + version = "0.1.1.0"; + sha256 = "0in0ilj337zm00qg0qxcmiai8xvlni5vz4sz0h0dmc3pmg57zmh0"; libraryHaskellDepends = [ - aeson base scientific text unordered-containers + aeson base scientific semigroups text unordered-containers ]; testHaskellDepends = [ aeson base doctest doctest-discover hspec QuickCheck text @@ -89242,6 +90015,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "gtk-strut" = callPackage + ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: + mkDerivation { + pname = "gtk-strut"; + version = "0.1.1.0"; + sha256 = "1g88afi75a727s85v37n4mvqr5zp4849s2kc1zdx3pvc9a15i9pd"; + libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; + homepage = "https://github.com/IvanMalison/gtk-strut#readme"; + description = "Libary for creating strut windows with gi-gtk"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gtk-toggle-button-list" = callPackage ({ mkDerivation, base, gtk }: mkDerivation { @@ -89267,17 +90052,17 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, gtk2, x11 }: + ({ mkDerivation, base, glib, gtk3, x11 }: mkDerivation { pname = "gtk-traymanager"; - version = "0.1.6"; - sha256 = "0hind14k37823jsa9dg2r6bfj7d6y1m70xn8mcr610rhakazac6b"; - libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ gtk2 x11 ]; + version = "1.0.1"; + sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di"; + libraryHaskellDepends = [ base glib gtk3 ]; + libraryPkgconfigDepends = [ x11 ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; + }) {inherit (pkgs) x11;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory @@ -90911,22 +91696,20 @@ self: { "hackage-repo-tool" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , hackage-security, network, network-uri, optparse-applicative, tar - , time, unix, zlib + , hackage-security, network, network-uri, old-time + , optparse-applicative, tar, time, unix, zlib }: mkDerivation { pname = "hackage-repo-tool"; - version = "0.1.1"; - sha256 = "1x34f28wqa1v935d90fzhra2d1c5kj6nrp79iyp53kj2kmqw5xi3"; - revision = "2"; - editedCabalFile = "04mlgliz33sb9dwzayd858b42pa30a7wpcd9jgmk1kc59dlv1y38"; + version = "0.1.1.1"; + sha256 = "05r4i7zhwbsv9ci4yid57fnb5lkx254pch9arq5a11dvwsvdzvzw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal directory filepath hackage-security network - network-uri optparse-applicative tar time unix zlib + network-uri old-time optparse-applicative tar time unix zlib ]; - homepage = "https://github.com/well-typed/hackage-security"; + homepage = "https://github.com/haskell/hackage-security"; description = "Utility to manage secure file-based package repositories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -90935,17 +91718,14 @@ self: { "hackage-security" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, HUnit, mtl, network, network-uri - , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, time, transformers - , zlib + , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec + , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, time, transformers, zlib }: mkDerivation { pname = "hackage-security"; - version = "0.5.2.2"; - sha256 = "0h9wag599x9ysdrgwa643phmpb1xiiwhyh2dix67fji6a5w86yjh"; - revision = "5"; - editedCabalFile = "0f1ml7dvwk4xrz3gsf133n67cbxzf0sz5frxfsx9i79x1yrg9zdj"; + version = "0.5.3.0"; + sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -90953,10 +91733,10 @@ self: { transformers zlib ]; testHaskellDepends = [ - base bytestring Cabal containers HUnit network-uri QuickCheck tar - tasty tasty-hunit tasty-quickcheck temporary time zlib + base bytestring Cabal containers network-uri QuickCheck tar tasty + tasty-hunit tasty-quickcheck temporary time zlib ]; - homepage = "https://github.com/well-typed/hackage-security"; + homepage = "https://github.com/haskell/hackage-security"; description = "Hackage security library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91416,6 +92196,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haddock-library_1_4_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , QuickCheck, transformers + }: + mkDerivation { + pname = "haddock-library"; + version = "1.4.3"; + sha256 = "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p"; + libraryHaskellDepends = [ base bytestring deepseq transformers ]; + testHaskellDepends = [ + base base-compat bytestring deepseq hspec QuickCheck transformers + ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock-library_1_4_4" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec , hspec-discover, QuickCheck, transformers @@ -91526,8 +92324,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.6.0"; - sha256 = "1ajwzyh3x185lvn22vi3wnfprf9fq0k1kxjxz575h87xwnq46y4v"; + version = "1.6.2"; + sha256 = "0nkq1qlhpd6gmrj75vik51a4fndn6sy3vwx2nk91vmdd7ml2f0v8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91978,39 +92776,33 @@ self: { ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring , containers, cryptohash, data-default, deepseq, directory , file-embed, filepath, fsnotify, http-conduit, http-types - , lrucache, mtl, network, network-uri, optparse-applicative, pandoc - , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base - , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-hunit + , lrucache, mtl, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-hunit , tasty-quickcheck, text, time, time-locale-compat , unordered-containers, utillinux, vector, wai, wai-app-static , warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.12.0.1"; - sha256 = "07alx008dg4q2ygwqf854r1nyizac0i3frkk23lzsfpzrbi784r0"; + version = "4.12.1.0"; + sha256 = "0hw6j6kq7g9sg03ihw0q1f4d96kkr6dnfg7f2bj4skpwfsslb2cg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary blaze-html blaze-markup bytestring containers cryptohash data-default deepseq directory file-embed filepath - fsnotify http-conduit http-types lrucache mtl network network-uri + fsnotify http-conduit http-types lrucache mtl network-uri optparse-applicative pandoc pandoc-citeproc parsec process random - regex-base regex-tdfa resourcet scientific tagsoup text time + regex-tdfa resourcet scientific tagsoup text time time-locale-compat unordered-containers vector wai wai-app-static warp yaml ]; executableHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory filepath fsnotify - http-conduit http-types lrucache mtl network network-uri - optparse-applicative pandoc pandoc-citeproc parsec process - QuickCheck random regex-base regex-tdfa resourcet scientific - tagsoup tasty tasty-hunit tasty-quickcheck text time - time-locale-compat unordered-containers vector wai wai-app-static - warp yaml + base bytestring containers filepath QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers yaml ]; testToolDepends = [ utillinux ]; homepage = "http://jaspervdj.be/hakyll"; @@ -92175,12 +92967,15 @@ self: { }) {}; "hakyll-dir-list" = callPackage - ({ mkDerivation, base, containers, filepath, hakyll }: + ({ mkDerivation, base, containers, data-default, filepath, hakyll + }: mkDerivation { pname = "hakyll-dir-list"; - version = "0.1.1.0"; - sha256 = "0j5amghlsjdnvi4klag6ifwwzy05v17bsf7j6lzl32hcx66a62qb"; - libraryHaskellDepends = [ base containers filepath hakyll ]; + version = "1.0.0.2"; + sha256 = "0irkfnwbzhchvjsfzndb6i3w76gnwik9fq3fhi3qg3jc7l0cgi76"; + libraryHaskellDepends = [ + base containers data-default filepath hakyll + ]; homepage = "http://github.com/freylax/hakyll-dir-list"; description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; @@ -93127,8 +93922,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.10"; - sha256 = "057mihkspxp78q2gwgyqmqgiy5pzimkzvsj8rk9psmzci09l68qd"; + version = "2.3.4.11"; + sha256 = "1df9yybqzljfilpqgrz8qpa6iy5lfa3f3vmz0ip8qpvzgcxyhpd7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -93502,22 +94297,22 @@ self: { ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, sendfile, syb - , system-filepath, template-haskell, text, threads, time + , network-uri, old-locale, parsec, process, semigroups, sendfile + , syb, system-filepath, template-haskell, text, threads, time , time-compat, transformers, transformers-base, transformers-compat , unix, utf8-string, xhtml, zlib }: mkDerivation { pname = "happstack-server"; - version = "7.5.0.1"; - sha256 = "05cb20rj4qys7r5kkbvjnm4bknfzwanf4r4yk1jq7a71x2sgcxc0"; + version = "7.5.1"; + sha256 = "18cfkwffwfz410x9wjbciynbqs9srpzg60rappzx778lb33px1rj"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html monad-control mtl network network-uri old-locale parsec process - sendfile syb system-filepath template-haskell text threads time - time-compat transformers transformers-base transformers-compat unix - utf8-string xhtml zlib + semigroups sendfile syb system-filepath template-haskell text + threads time time-compat transformers transformers-base + transformers-compat unix utf8-string xhtml zlib ]; testHaskellDepends = [ base bytestring containers HUnit parsec zlib @@ -93960,8 +94755,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "harp"; - version = "0.4.3"; - sha256 = "17d9isgwdvrmycbj3ddmmn0810kh4m8b8lmaz4qc8i51i5li8ja7"; + version = "0.4.3.1"; + sha256 = "0g4ig5s5rawlbq7zj1hkydnkw2s1gn7x0sdimd6j6kr5bynrdnhk"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/seereason/harp"; description = "HaRP allows pattern-matching with regular expressions"; @@ -94055,6 +94850,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt-extras" = callPackage + ({ mkDerivation, base, containers, hasbolt, lens + , neat-interpolation, template-haskell, text, th-lift-instances + }: + mkDerivation { + pname = "hasbolt-extras"; + version = "0.0.0.4"; + sha256 = "0dclanbd07knph3bxn5a3kyl9qkqcwhy00y5jnah9sxk4qqhjkk5"; + libraryHaskellDepends = [ + base containers hasbolt lens neat-interpolation template-haskell + text th-lift-instances + ]; + homepage = "https://github.com/biocad/hasbolt-extras#readme"; + description = "Extras for hasbolt library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hascal" = callPackage ({ mkDerivation, base, data-default, split }: mkDerivation { @@ -94485,10 +95297,8 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.2.1"; - sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs"; - revision = "1"; - editedCabalFile = "0wcjkd8imgx3j4ygj3r2cdfzknk1bbq0745axy7kbm2sckz1xqcz"; + version = "1.2.3.0"; + sha256 = "19bkpx43f3b5mya4jkygiafw402hvazawp6qr69h3wqkc6xv8mpr"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -95606,16 +96416,16 @@ self: { }) {}; "haskell-packages" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers + ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl , optparse-applicative, tagged, transformers, transformers-compat }: mkDerivation { pname = "haskell-packages"; - version = "0.5"; - sha256 = "0b6hzz5ql6c9x7lxdldi50yw257cccp4d26jbdp51fi5chp2h7y6"; + version = "0.6.1"; + sha256 = "16lsk6djhy34k9clmaqsqrd4277dk7nva77djs91h0nl68zz3hhs"; libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq directory filepath + base binary bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged transformers transformers-compat ]; @@ -95914,8 +96724,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-sc"; - version = "0.1.0.5"; - sha256 = "15ja2h0flp73f017r1ylr8fmksd3v76v68x8whv37bgy3mrqznx9"; + version = "0.1.0.6"; + sha256 = "1bfkwladavard87pnnr2nigs214hb3k4j3mki0ffd5zfxldb2ncv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts ]; @@ -97030,8 +97840,8 @@ self: { }: mkDerivation { pname = "haskey"; - version = "0.2.0.1"; - sha256 = "07q7kp07ipq20v3ag49j3ca116p48yn3pn5im5p101l8372hj58n"; + version = "0.3.0.1"; + sha256 = "1v5af0pd015d7ccdi0f2wc3gb60xy4j59kzngx6wh6dljkxrcga7"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath focus haskey-btree list-t lz4 mtl semigroups stm stm-containers @@ -97057,8 +97867,8 @@ self: { }: mkDerivation { pname = "haskey-btree"; - version = "0.2.0.1"; - sha256 = "025g1sa41fa29v69hpbghabq2irkb498a6b48bgp0nb8m3cmz2ls"; + version = "0.3.0.0"; + sha256 = "0nj6jhigzgjac45cg0qjbjamn152n7rvir5clkwj5yraisd7sf4h"; libraryHaskellDepends = [ base binary bytestring containers hashable mtl semigroups text transformers vector @@ -97079,8 +97889,8 @@ self: { }: mkDerivation { pname = "haskey-mtl"; - version = "0.2.0.0"; - sha256 = "1n3j4avydrr2w0sa0zjsc2jvmr9fmyxz5s54y6zam40a2cg2wc2l"; + version = "0.3.0.0"; + sha256 = "0jc2wa41gmx01ccb7svv91llncm47adb2g6winm513k23bvk8028"; libraryHaskellDepends = [ base exceptions haskey haskey-btree mtl transformers ]; @@ -97565,20 +98375,20 @@ self: { "hasktags" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json - , unix, utf8-string + , utf8-string }: mkDerivation { pname = "hasktags"; - version = "0.69.4"; - sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni"; + version = "0.69.5"; + sha256 = "0jln0r3dzd7g17avxqgnyxzv4nmqlmqaw41vrysb838yql6g6ns8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory filepath json unix utf8-string + base bytestring directory filepath json utf8-string ]; - executableHaskellDepends = [ base directory filepath unix ]; + executableHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ - base bytestring directory filepath HUnit json unix utf8-string + base bytestring directory filepath HUnit json utf8-string ]; homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; @@ -97714,29 +98524,27 @@ self: { }) {}; "hasmin" = callPackage - ({ mkDerivation, attoparsec, base, bifunctors, bytestring - , containers, criterion, directory, doctest, doctest-discover - , gitrev, hopfli, hspec, hspec-attoparsec, matrix, mtl, numbers - , optparse-applicative, parsers, QuickCheck, text + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, directory, doctest, doctest-discover, gitrev, hopfli + , hspec, hspec-attoparsec, matrix, mtl, numbers + , optparse-applicative, parsers, QuickCheck, quickcheck-instances + , text }: mkDerivation { pname = "hasmin"; - version = "1.0.1"; - sha256 = "1h5ygl9qmzmbhqfb58hhm2zw850dqfkp4b8cp3bhsnangg4lgbjk"; - revision = "3"; - editedCabalFile = "0v410xlx9riyhzxbqi2fx8qnw9i3k9cc6q24f0cz2ympl86f4019"; + version = "1.0.2"; + sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bifunctors containers matrix mtl numbers parsers - text + attoparsec base containers matrix mtl numbers parsers text ]; executableHaskellDepends = [ base bytestring gitrev hopfli optparse-applicative text ]; testHaskellDepends = [ attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl - QuickCheck text + QuickCheck quickcheck-instances text ]; benchmarkHaskellDepends = [ base criterion directory text ]; homepage = "https://github.com/contivero/hasmin#readme"; @@ -99382,6 +100190,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hdf5-lite" = callPackage + ({ mkDerivation, base, c2hs, containers, exceptions, ghc-prim, hdf5 + , hspec, inline-c, primitive, QuickCheck, template-haskell, text + , vector + }: + mkDerivation { + pname = "hdf5-lite"; + version = "0.1.1.0"; + sha256 = "1c13qg0zx9g6zmhmy2snmbnkhmmgchm6qlh0vn4i3df2vdi4rb8v"; + libraryHaskellDepends = [ + base containers exceptions ghc-prim inline-c primitive + template-haskell text vector + ]; + librarySystemDepends = [ hdf5 ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/hdf5-lite"; + description = "High-level bindings to the HDF5 \"lite\" interface"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) hdf5;}; + "hdigest" = callPackage ({ mkDerivation, base, cgi, Crypto, network, parsec, random, time }: @@ -99684,8 +100513,8 @@ self: { }: mkDerivation { pname = "heavy-logger"; - version = "0.3.1.0"; - sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4"; + version = "0.3.2.0"; + sha256 = "1kx6l7ysniqjzzp7l74vjcfbi8qz5xqjqvisb49k18cnf22mikvv"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default fast-logger hsyslog lifted-base monad-control monad-logger mtl stm @@ -99713,6 +100542,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heavy-logger-instances" = callPackage + ({ mkDerivation, base, binary, exceptions, heavy-logger, hsyslog + , mtl, template-haskell, text, text-format-heavy + }: + mkDerivation { + pname = "heavy-logger-instances"; + version = "0.2.0.0"; + sha256 = "0flh5j79ijkvdwhjg1gn3qkhybzspvg1jh8nib18fgzmvcx8zckm"; + libraryHaskellDepends = [ + base binary exceptions heavy-logger hsyslog mtl template-haskell + text text-format-heavy + ]; + testHaskellDepends = [ + base binary exceptions heavy-logger hsyslog mtl template-haskell + text text-format-heavy + ]; + homepage = "https://github.com/portnov/heavy-logger#readme"; + description = "Orphan instances for data types in heavy-logger package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -99844,8 +100694,8 @@ self: { }: mkDerivation { pname = "hedgehog-gen-json"; - version = "0.2.0"; - sha256 = "1irr4lniz5s176r6fnhd7sjnxbs627yif1yd8nd8jrq9p1rwc5jm"; + version = "0.3.0"; + sha256 = "09b362v9cdl9jwrx0hyb7hhf2krg3rhrsgssz4dl3sjz3y2a8i1h"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude regex-genex scientific text time timerep tz unordered-containers @@ -99856,7 +100706,7 @@ self: { regex-genex regex-pcre scientific tasty tasty-hedgehog text time timerep tz unordered-containers vector ]; - homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; + homepage = "https://github.com/amrhassan/haskell-hedgehog-gen-json"; description = "JSON generators for Hedgehog"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -100006,22 +100856,22 @@ self: { "hedn" = callPackage ({ mkDerivation, attoparsec, base, base-compat, bytestring - , containers, deepseq, hspec, HUnit, mtl, QuickCheck, scientific - , stringsearch, template-haskell, text, time, time-locale-compat - , utf8-string, vector + , containers, deepseq, hspec, hspec-contrib, HUnit, mtl, QuickCheck + , scientific, stringsearch, template-haskell, text, time + , time-locale-compat, utf8-string, vector }: mkDerivation { pname = "hedn"; - version = "0.1.8.2"; - sha256 = "15f1zrp5cb1m2xhy974v8f67xg08yks6w43m3sbky4v5mbfy12ig"; + version = "0.1.9.0"; + sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq mtl scientific stringsearch text time time-locale-compat utf8-string vector ]; testHaskellDepends = [ - base bytestring containers hspec HUnit QuickCheck template-haskell - text time vector + base bytestring containers hspec hspec-contrib HUnit QuickCheck + template-haskell text time vector ]; homepage = "https://bitbucket.org/dpwiz/hedn"; description = "EDN parsing and encoding"; @@ -100062,8 +100912,48 @@ self: { pname = "heist"; version = "1.0.1.2"; sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71"; - revision = "2"; - editedCabalFile = "0nyxym4jqkcxx0rim7vzfgr1hhmcgvgi3pann4192ahhsail8b2d"; + revision = "3"; + editedCabalFile = "0siqhy0svk9lfi8rx7lhjhjihrmjk6plvyjnhhyhvyakmycggqpc"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers directory directory-tree dlist filepath hashable + lifted-base map-syntax monad-control mtl process random text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors blaze-builder blaze-html + bytestring containers directory directory-tree dlist filepath + hashable HUnit lens lifted-base map-syntax monad-control mtl + process QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unordered-containers vector xmlhtml + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers criterion directory directory-tree dlist filepath + hashable HUnit lifted-base map-syntax monad-control mtl process + random statistics test-framework test-framework-hunit text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + homepage = "http://snapframework.com/"; + description = "An Haskell template system supporting both HTML5 and XML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "heist_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder + , blaze-html, bytestring, containers, criterion, directory + , directory-tree, dlist, filepath, hashable, HUnit, lens + , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck + , random, statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unordered-containers, vector, xmlhtml + }: + mkDerivation { + pname = "heist"; + version = "1.1"; + sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -100677,14 +101567,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "herms_1_8_2_1" = callPackage + "herms_1_8_2_2" = callPackage ({ mkDerivation, ansi-terminal, base, brick, directory, microlens , microlens-th, optparse-applicative, semigroups, split, vty }: mkDerivation { pname = "herms"; - version = "1.8.2.1"; - sha256 = "0njp1jsz4clb6qyz00xrpw7av4109gx5wd4h180q794vi8xw6v4j"; + version = "1.8.2.2"; + sha256 = "0x6h1l9kikjqzyyxa23y9df6bdw529cr07g74qc2qbdbg39713zq"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -100893,6 +101783,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "heterogeneous-list-literals" = callPackage + ({ mkDerivation, base, OneTuple }: + mkDerivation { + pname = "heterogeneous-list-literals"; + version = "0.1.0.1"; + sha256 = "0cb38kpw01fzwfrhlgi2l1869b8hd9cd7kzbyr1ap6ik5gkljq6k"; + libraryHaskellDepends = [ base OneTuple ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/davidm-d/heterogeneous-list-literals"; + description = "Allows the use of tuples as literals for Heterogeneous collections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "heterolist" = callPackage ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata }: @@ -101678,25 +102581,24 @@ self: { "hgis" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart - , Chart-cairo, Chart-diagrams, colour, composition + , Chart-cairo, Chart-diagrams, colour, composition-prelude , data-binary-ieee754, data-default, directory, filepath, hspec - , lens, monad-loops, optparse-applicative, transformers + , lens, monad-loops, optparse-applicative }: mkDerivation { pname = "hgis"; - version = "0.1.3.7"; - sha256 = "0c6xk4zf80pqjasyl7n5i2k3iy9l3xzkv2glmamm5scz9kyzdbvr"; + version = "0.1.3.8"; + sha256 = "10lqv0v4lnah22qwlyh1ixhcvl0abs9brlpddw0a24xdym4j0xhf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo - Chart-diagrams colour composition data-binary-ieee754 data-default - directory filepath lens monad-loops optparse-applicative - transformers + Chart-diagrams colour composition-prelude data-binary-ieee754 + data-default directory filepath lens monad-loops + optparse-applicative ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/vmchale/hgis#readme"; description = "Package and command-line for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -102062,8 +102964,8 @@ self: { }: mkDerivation { pname = "hierarchy"; - version = "0.3.1.2"; - sha256 = "07aldpvbsc2mjg7v2gi46il66qg0hk9ly7sw4vd7h0lkk5q3vb6h"; + version = "0.3.1.4"; + sha256 = "0bli7mv2d6lmxc89fysmkhb9kamhzs2rqx75rn4mbcw61il1cznq"; libraryHaskellDepends = [ base exceptions free mmorph monad-control mtl pipes semigroups transformers transformers-base transformers-compat @@ -102508,9 +103410,12 @@ self: { pname = "hinduce-classifier-decisiontree"; version = "0.0.0.1"; sha256 = "1hdz4lbbpy2yc5j7chkagjvslsakmv3hbz2s7lpz0isfq7ls9idl"; + revision = "1"; + editedCabalFile = "16zh2f474ga3s1jzg58hv6q103gdxb3kl25g2cj0k14jxr4k15a2"; libraryHaskellDepends = [ base convertible hinduce-classifier hinduce-missingh layout ]; + homepage = "https://github.com/roberth/hinduce-classifier-decisiontree#readme"; description = "Decision Tree Classifiers for hInduce"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -102552,6 +103457,8 @@ self: { pname = "hinotify"; version = "0.3.9"; sha256 = "16fzql0s34my9k1ib4rdjf9fhhijkmmbrvi148f865m51160wj7j"; + revision = "1"; + editedCabalFile = "0df5pak0586626k3ryzg2lb26ys562l3i94jr9vpa0krs8iia209"; libraryHaskellDepends = [ async base containers directory unix ]; testHaskellDepends = [ base directory ]; homepage = "https://github.com/kolmodin/hinotify.git"; @@ -102559,6 +103466,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_3_10" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.3.10"; + sha256 = "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg"; + revision = "1"; + editedCabalFile = "07z0n5rvki3w0kjr190bwv7sq8p3myspv8999ilz9rlsqf5a0324"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + homepage = "https://github.com/kolmodin/hinotify.git"; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -103398,26 +104323,25 @@ self: { ({ mkDerivation, ansi-terminal, base, base-compat, bytestring , cmdargs, containers, criterion, csv, data-default, Decimal, Diff , directory, file-embed, filepath, hashable, haskeline, here - , hledger-lib, html, HUnit, megaparsec, mtl, mtl-compat, old-time - , parsec, pretty-show, process, regex-tdfa, safe, shakespeare - , split, tabular, temporary, terminfo, test-framework + , hledger-lib, html, HUnit, lucid, megaparsec, mtl, mtl-compat + , old-time, parsec, pretty-show, process, regex-tdfa, safe + , shakespeare, split, tabular, temporary, terminfo, test-framework , test-framework-hunit, text, time, timeit, transformers , unordered-containers, utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.5"; - sha256 = "0mmgjahdlyka2mi1271kawrvkvnw8bgd3a08r8bykskj9b9f5181"; + version = "1.9"; + sha256 = "10lsh1rayzg7gri6b2mn01ncjziga5dzw0s5a91068brrrf4rymm"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv data-default Decimal Diff directory file-embed filepath hashable - haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time - pretty-show process regex-tdfa safe shakespeare split tabular - temporary terminfo text time transformers unordered-containers - utf8-string utility-ht wizards + haskeline here hledger-lib HUnit lucid megaparsec mtl mtl-compat + old-time pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo text time transformers + unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv @@ -103454,11 +104378,10 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.5"; - sha256 = "1wanah469danp0ljjxr258gdcd9lb175chz2jlq0y604wksaaj19"; + version = "1.9"; + sha256 = "00bqsz8hkmx78r9d692kihbpmldkpnsdmpljs3ivi14jfay4avim"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring containers Decimal docopt either hledger hledger-lib microlens microlens-platform safe servant-server @@ -103507,32 +104430,30 @@ self: { "hledger-iadd" = callPackage ({ mkDerivation, base, brick, containers, directory, free , hledger-lib, hspec, megaparsec, microlens, microlens-th - , optparse-applicative, QuickCheck, semigroups, text, text-format - , text-zipper, time, transformers, unordered-containers, vector - , vty, xdg-basedir + , optparse-applicative, QuickCheck, semigroups, text, text-zipper + , time, transformers, unordered-containers, vector, vty + , xdg-basedir }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.1"; - sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv"; - revision = "2"; - editedCabalFile = "03cc91bzxmk3hffkmda3w87rgwarpdjbs1kwafix65avhw03g7ga"; + version = "1.3.4"; + sha256 = "1dii629ynrb04q4hmli6zxpz1ylkw0rm1vf8jrrcm81drvdxw6qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory free hledger-lib megaparsec microlens microlens-th optparse-applicative semigroups text - text-format text-zipper time transformers unordered-containers - vector vty xdg-basedir + text-zipper time transformers unordered-containers vector vty + xdg-basedir ]; executableHaskellDepends = [ base brick directory free hledger-lib megaparsec microlens - optparse-applicative text text-format text-zipper time transformers + optparse-applicative text text-zipper time transformers unordered-containers vector vty xdg-basedir ]; testHaskellDepends = [ - base free hledger-lib hspec megaparsec QuickCheck text text-format - text-zipper time transformers vector + base free hledger-lib hspec megaparsec QuickCheck text text-zipper + time transformers vector ]; homepage = "https://github.com/hpdeifel/hledger-iadd#readme"; description = "A terminal UI as drop-in replacement for hledger add"; @@ -103578,31 +104499,30 @@ self: { "hledger-lib" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-compat , blaze-markup, bytestring, cmdargs, containers, csv, data-default - , Decimal, deepseq, directory, doctest, extra, filepath, Glob - , hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec - , pretty-show, regex-tdfa, safe, semigroups, split, test-framework + , Decimal, deepseq, directory, doctest, easytest, extra, filepath + , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time + , parsec, pretty-show, regex-tdfa, safe, split, test-framework , test-framework-hunit, text, time, transformers, uglymemo , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.5"; - sha256 = "00k0wqib3hadi4rcnldr14q2va57b09whfbwzd14pz824x7pnfd7"; - enableSeparateDataOutput = true; + version = "1.9"; + sha256 = "0bm4vdzjxyxjmq000wng6hkx9kinbzw5hx7m0i1vjj500gcp0zq1"; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory extra filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe semigroups split text time transformers - uglymemo utf8-string + pretty-show regex-tdfa safe split text time transformers uglymemo + utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory - doctest extra filepath Glob hashtables HUnit megaparsec mtl - mtl-compat old-time parsec pretty-show regex-tdfa safe semigroups - split test-framework test-framework-hunit text time transformers - uglymemo utf8-string + doctest easytest extra filepath Glob hashtables HUnit megaparsec + mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split + test-framework test-framework-hunit text time transformers uglymemo + utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; @@ -103618,11 +104538,10 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.5"; - sha256 = "104vjyqpddwv8g9mfbaw174nl4lb41zwl14i8225m6v1gxvs5w6x"; + version = "1.9"; + sha256 = "0z5w69vxl8f1gdc8753ndnm4mcm5xw3abjfqidyrn3gsi800pxzd"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal async base base-compat brick cmdargs containers data-default directory filepath fsnotify hledger hledger-lib HUnit @@ -103665,11 +104584,10 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.5.1"; - sha256 = "0g3jxxxav1v55dy50sclij05ypmapwbi43xxqz3y47xgvlfq9j23"; + version = "1.9"; + sha256 = "0xgd1akird9hpdrwml4dxc0vx3vzgacr5f6z19zy6q4bvnw1g58n"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin @@ -103774,6 +104692,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsass;}; + "hlibsass_0_1_7_0" = callPackage + ({ mkDerivation, base, Cabal, directory, hspec, libsass }: + mkDerivation { + pname = "hlibsass"; + version = "0.1.7.0"; + sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2"; + configureFlags = [ "-fexternalLibsass" ]; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ libsass ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/jakubfijalkowski/hlibsass"; + description = "Low-level bindings to Libsass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libsass;}; + "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, filepath @@ -103783,8 +104718,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1"; - sha256 = "13chm0dhh1fn2iy3flnh7ahc3yzh8q0v10qxwd1739sywhykayg9"; + version = "2.1.1"; + sha256 = "0mmfavd158l5ig5wb1b1zbhbraj8hhqvbk4mg85n6c8ndpr4grd4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103860,16 +104795,16 @@ self: { "hlrdb" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite - , hashable, hedis, hlrdb-core, memory, random, store, time-exts + , hashable, hedis, hlrdb-core, memory, random, store, time , unordered-containers }: mkDerivation { pname = "hlrdb"; - version = "0.1.0.0"; - sha256 = "1kqm14kd5app34438b3w9h1nxr6fp1dvrf58xrbv2xn2y65jb5jc"; + version = "0.2.0.0"; + sha256 = "1x7vw2mcwd703dr5mjghsjd04yxwl6z7wzdysgk75i4l7f0lcqfq"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis - hlrdb-core memory random store time-exts unordered-containers + hlrdb-core memory random store time unordered-containers ]; homepage = "https://github.com/identicalsnowflake/hlrdb"; description = "High-level Redis Database"; @@ -103879,14 +104814,14 @@ self: { "hlrdb-core" = callPackage ({ mkDerivation, base, bytestring, hashable, hedis, lens, mtl - , profunctors, random, unordered-containers + , profunctors, random, time, unordered-containers }: mkDerivation { pname = "hlrdb-core"; - version = "0.1.0.0"; - sha256 = "1gy5sycr4han0i0lk8m3rl99pagd9slfry0b94c05cj6kai6c9ss"; + version = "0.1.1.0"; + sha256 = "0jxpzbwlcf8ix08sbxppcbvlvq2hhs8ya0mkk9b262zb2bfv3m4i"; libraryHaskellDepends = [ - base bytestring hashable hedis lens mtl profunctors random + base bytestring hashable hedis lens mtl profunctors random time unordered-containers ]; homepage = "https://github.com/identicalsnowflake/hlrdb-core"; @@ -104003,11 +104938,12 @@ self: { }: mkDerivation { pname = "hmatrix-backprop"; - version = "0.1.0.0"; - sha256 = "088spv7149788iwda2pyf6fc9i40vq4dfziqldgxjrnngxw9z8iv"; + version = "0.1.2.0"; + sha256 = "0lrdy5zxl8kvzfsgb4i5lqvdaqpnwixgjnjsvkm89fw6ms86bqac"; libraryHaskellDepends = [ - ANum backprop base ghc-typelits-knownnat ghc-typelits-natnormalise - hmatrix hmatrix-vector-sized microlens vector vector-sized + ANum backprop base finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens + vector vector-sized ]; testHaskellDepends = [ backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized @@ -106566,19 +107502,19 @@ self: { "hpath" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , hspec, HUnit, process, QuickCheck, simple-sendfile, unix + , hspec, HUnit, IfElse, process, QuickCheck, simple-sendfile, unix , unix-bytestring, utf8-string, word8 }: mkDerivation { pname = "hpath"; - version = "0.8.0"; - sha256 = "19xbzgz51dwjm5w11j170bp8nv0b19qk6b8mx75c367n4xshgxc3"; + version = "0.9.0"; + sha256 = "1d0f58xvqpr5d9n3n8wpy5x59mfh57al4bvpllfmb6a6dm514k4d"; libraryHaskellDepends = [ - base bytestring deepseq exceptions hspec simple-sendfile unix - unix-bytestring utf8-string word8 + base bytestring deepseq exceptions hspec IfElse simple-sendfile + unix unix-bytestring utf8-string word8 ]; testHaskellDepends = [ - base bytestring doctest hspec HUnit process QuickCheck unix + base bytestring doctest hspec HUnit IfElse process QuickCheck unix unix-bytestring utf8-string ]; description = "Support for well-typed paths"; @@ -106698,8 +107634,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.9.0.5"; - sha256 = "0k1n2la7c5ld13nr0j2hc1ia2i9gy4aacs2cna4rkmcnyamgg38i"; + version = "0.9.0.6"; + sha256 = "07443kb6w1kwcg78j8jaffb5pblv9si7bvsmlg4dbm32m4wd66xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106780,8 +107716,8 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.5.1"; - sha256 = "0bdx85k9c9cb5wkp91fi1sb0dahg6f4fknyddfh92wcywa485q9b"; + version = "0.5.2"; + sha256 = "1r1sas1rcxcra4q3vjw3qmiv0xc4j263m7p93y6bwm1fvpxlkvcc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106796,37 +107732,6 @@ self: { }) {}; "hpqtypes" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , data-default-class, exceptions, HUnit, lifted-base, monad-control - , mtl, postgresql, QuickCheck, random, resource-pool, scientific - , test-framework, test-framework-hunit, text, text-show, time - , transformers, transformers-base, unordered-containers, vector - }: - mkDerivation { - pname = "hpqtypes"; - version = "1.5.1.1"; - sha256 = "0nkrah6ny24qayr03dyar5yhb90k5as3fn19pzsp6df8gi6j375r"; - revision = "1"; - editedCabalFile = "0k255rbvzinwrav3k7f3n2hssiv9p3bb51fg4vp2mhnm9igfy5b9"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default-class exceptions - lifted-base monad-control mtl resource-pool text text-show time - transformers transformers-base vector - ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ - aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework - test-framework-hunit text text-show time transformers-base - unordered-containers vector - ]; - homepage = "https://github.com/scrive/hpqtypes"; - description = "Haskell bindings to libpqtypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) postgresql;}; - - "hpqtypes_1_5_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default-class, directory, exceptions, filepath, HUnit , lifted-base, monad-control, mtl, postgresql, QuickCheck, random @@ -107523,8 +108428,8 @@ self: { }: mkDerivation { pname = "hs-java"; - version = "0.3.4"; - sha256 = "1qv6zwp9fws9s6502d9afwwbsh025xfpw4vsq8wgh2i0gvlskzq7"; + version = "0.4.1"; + sha256 = "1wpibfwxv9m1ldn9xqfrvjld18q8x31h06flvb4sbk26hqjrkr6f"; libraryHaskellDepends = [ array base binary binary-state bytestring containers control-monad-exception data-binary-ieee754 data-default directory @@ -107904,20 +108809,18 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude , cpphs, criterion, deepseq, haskell-src-exts, hspec - , hspec-dirstream, language-ats, lens, optparse-generic - , system-filepath + , hspec-dirstream, language-ats, microlens, system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.2.1.7"; - sha256 = "01hinvxj9v04kzvyck01z4ky3b1gmffwxvl7wri2ggps26h2d5gf"; + version = "0.3.0.0"; + sha256 = "1s92riisihcqim6hy4sa4z3dhk92dp2iyn32j0jl0qlpzdlbj4cp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base casing composition-prelude cpphs deepseq - haskell-src-exts language-ats lens optparse-generic + haskell-src-exts language-ats microlens ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-dirstream system-filepath ]; @@ -108023,6 +108926,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {xenctrl = null;}; + "hsaml2" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring + , bytestring, cryptonite, data-default, http-types, HUnit, hxt + , hxt-charproperties, hxt-http, hxt-unicode, invertible + , invertible-hxt, lens, libxml2, memory, mtl, network-uri, process + , semigroups, template-haskell, time, x509, zlib + }: + mkDerivation { + pname = "hsaml2"; + version = "0.1"; + sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base base64-bytestring bytestring + cryptonite data-default http-types hxt hxt-charproperties + hxt-unicode invertible invertible-hxt lens memory mtl network-uri + process semigroups template-haskell time x509 zlib + ]; + libraryPkgconfigDepends = [ libxml2 ]; + testHaskellDepends = [ + base bytestring HUnit hxt hxt-http network-uri semigroups time x509 + ]; + description = "OASIS Security Assertion Markup Language (SAML) V2.0"; + license = stdenv.lib.licenses.asl20; + }) {inherit (pkgs) libxml2;}; + "hsass" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath , hlibsass, hspec, hspec-discover, monad-loops, temporary @@ -108032,6 +108960,8 @@ self: { pname = "hsass"; version = "0.5.0"; sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d"; + revision = "1"; + editedCabalFile = "00va8x51p6rbg8jbkxpyz74pa2pfm5dsrpi57icbyickx39iaydd"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -108045,6 +108975,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsass_0_7_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, filepath + , hlibsass, hspec, hspec-discover, monad-loops, temporary, text + , transformers + }: + mkDerivation { + pname = "hsass"; + version = "0.7.0"; + sha256 = "0mqsj1jm37pqc1vwjs5y5mh4sfhdyclp1vdr7q5nq2a3pa3qwxbk"; + libraryHaskellDepends = [ + base bytestring data-default-class filepath hlibsass monad-loops + transformers + ]; + testHaskellDepends = [ + base bytestring data-default-class hspec hspec-discover temporary + text + ]; + homepage = "https://github.com/jakubfijalkowski/hsass"; + description = "Integrating Sass into Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsay" = callPackage ({ mkDerivation, base, Hclip, HTTP, process, unix }: mkDerivation { @@ -108625,6 +109578,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hscharm" = callPackage + ({ mkDerivation, base, random, random-shuffle }: + mkDerivation { + pname = "hscharm"; + version = "0.0.2"; + sha256 = "17713j542kph74n8rvjrx847r19yk96dz80n04nl8w6vzabj5wng"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base random random-shuffle ]; + description = "minimal ncurses-like library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsclock" = callPackage ({ mkDerivation, base, cairo, glib, gtk, old-time }: mkDerivation { @@ -108760,8 +109727,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.1.2"; - sha256 = "1abwv4987xznfv6sx8sfhk04f4s7dpjvgzwzjzi8rwxibm8az09p"; + version = "0.3.1.3"; + sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109922,8 +110889,8 @@ self: { }: mkDerivation { pname = "hspec-dirstream"; - version = "0.4.0.0"; - sha256 = "01090ph0njwv5cabj9f82xsiy0lk254sk3iq6l9h7dkh57sm7q9n"; + version = "1.0.0.0"; + sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base dirstream filepath hspec hspec-core pipes pipes-safe @@ -110344,19 +111311,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-smallcheck_0_5_1" = callPackage - ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit - , QuickCheck, smallcheck + "hspec-smallcheck_0_5_2" = callPackage + ({ mkDerivation, base, base-orphans, call-stack, hspec, hspec-core + , HUnit, QuickCheck, smallcheck }: mkDerivation { pname = "hspec-smallcheck"; - version = "0.5.1"; - sha256 = "11202q3ixqmmi3nx79l82jha5kdnpajvv1rd1s6rwh0560i8vj2v"; + version = "0.5.2"; + sha256 = "06c1ym793zkdwi4bxk5f4l7m1n1bg5jmnm0p68q2pa9rlhk1lc4s"; libraryHaskellDepends = [ base call-stack hspec-core HUnit smallcheck ]; testHaskellDepends = [ - base call-stack hspec hspec-core HUnit QuickCheck smallcheck + base base-orphans call-stack hspec hspec-core HUnit QuickCheck + smallcheck ]; homepage = "http://hspec.github.io/"; description = "SmallCheck support for the Hspec testing framework"; @@ -110703,8 +111671,8 @@ self: { }: mkDerivation { pname = "hsqml"; - version = "0.3.5.0"; - sha256 = "1im7jm144vvyvrmkvblxwhbya55xsyxl8z10bs4anwxxjlf9sggc"; + version = "0.3.5.1"; + sha256 = "046inz0pa5s052w653pk2km9finj44c6y2yx7iqihn4h4vnqbim0"; setupHaskellDepends = [ base Cabal filepath template-haskell ]; libraryHaskellDepends = [ base containers filepath tagged text transformers @@ -111300,8 +112268,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.2"; - sha256 = "06j2nc2yg8a8pp3c2ayxrm76fj2w2w5d2ilq91hvwwb1ikrklg5b"; + version = "0.14.1.3"; + sha256 = "15y7mk01cffc1xgsddkqqmi76npbi7mikgia6xa3xk4916kwsl91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111842,16 +112810,16 @@ self: { "htoml-megaparsec" = callPackage ({ mkDerivation, aeson, base, bytestring, composition-prelude , containers, criterion, deepseq, file-embed, hspec, megaparsec - , mtl, old-locale, tasty, tasty-hspec, tasty-hunit, text, time + , mtl, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.1.0.1"; - sha256 = "10bgm0dqi2hni9sxjri2i7imfwqfi750pwwrpbghdvyfxrivfcpy"; + version = "1.1.0.3"; + sha256 = "0bzja2n7hxj530d3pfh58zn29vapl341fy7x6ggvp5sfgsysg7ll"; libraryHaskellDepends = [ - base composition-prelude containers deepseq megaparsec mtl - old-locale text time unordered-containers vector + base composition-prelude containers deepseq megaparsec mtl text + time unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers file-embed hspec megaparsec tasty @@ -112043,8 +113011,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.11"; - sha256 = "0mjm2d77i82jazq0602v34m5xiyxc15680zx6ay9ncspr7rhd6wp"; + version = "0.5.12"; + sha256 = "1m4c4zyl8y3i8bzyrgqv9kcjqzj17rwnf49dvn6745bn8kiyq6v0"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -112316,6 +113284,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_1" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.1"; + sha256 = "0nbq3xklz5nfc4k50qj413q2acwcbs0g5am4pncbjhiamgqc6lc2"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + homepage = "http://www.yesodweb.com/book/http-conduit"; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -112550,6 +113548,8 @@ self: { pname = "http-media"; version = "0.7.1.2"; sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; + revision = "1"; + editedCabalFile = "0lxlig3mhw52ixqq65c9fzawviia2fl00d7hn1diny964h8klwgc"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -112929,8 +113929,8 @@ self: { }: mkDerivation { pname = "http2-client"; - version = "0.7.0.0"; - sha256 = "1grcb4mbqx8dkdwal3pldfyasnlghdkzcrksl0hvj7xg8bqjs2n5"; + version = "0.8.0.0"; + sha256 = "1c9nn6b9fs30prrkalx7n7i4a4a5ss53ky4x2nba4vcq4rgipch3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113309,20 +114309,20 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.1.0.2"; - sha256 = "1r6i135dj3kn2sx49asy2k0i88vfb13z7giyzj1qs8m8cfx2pi89"; + version = "1.1.0.3"; + sha256 = "18zpvc77p0djay8d8lz3d6y7ppmdjk2cihakhlin7bqpzmyydkbl"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_1_0_3" = callPackage + "hunit-dejafu_1_2_0_0" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.1.0.3"; - sha256 = "18zpvc77p0djay8d8lz3d6y7ppmdjk2cihakhlin7bqpzmyydkbl"; + version = "1.2.0.0"; + sha256 = "0djn982mlz4m58hxsghxxj34vsw78i57scxx9a1i3zk7qznmingv"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -113779,23 +114779,6 @@ self: { }) {}; "hw-fingertree" = callPackage - ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "hw-fingertree"; - version = "0.1.0.0"; - sha256 = "0hh1f9m92s53254a2bk3h4i77girf8nni8rmyrd0ljramn4hiz55"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base deepseq HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-fingertree_0_1_0_1" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit , hw-hspec-hedgehog, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -113812,38 +114795,18 @@ self: { homepage = "https://github.com/haskell-works/hw-fingertree#readme"; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-fingertree-strict" = callPackage - ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "hw-fingertree-strict"; - version = "0.1.0.1"; - sha256 = "18ki65cmbvbqj97y1v25sh2bvilkkg6q6pzzyprmgv24yscqkrp3"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/githubuser/hw-fingertree-strict#readme"; - description = "Generic strict finger-tree structure"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-fingertree-strict_0_1_0_2" = callPackage - ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit + , hw-hspec-hedgehog, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "hw-fingertree-strict"; - version = "0.1.0.2"; - sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv"; - libraryHaskellDepends = [ base ]; + version = "0.1.0.3"; + sha256 = "03njx1g23f8s8a9dcyanpfm8pzgcbyds4zwkmp7g8mshk1rljfcm"; + libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -113851,7 +114814,6 @@ self: { homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme"; description = "Generic strict finger-tree structure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hedgehog" = callPackage @@ -113871,11 +114833,11 @@ self: { ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: mkDerivation { pname = "hw-hspec-hedgehog"; - version = "0.1.0.2"; - sha256 = "1rafrpys347qc60van79y55n13pjdhdx64j495g4hhvyzf32az67"; + version = "0.1.0.3"; + sha256 = "0bnqvbh8jkpnannfgx1ghv5b4qvj37w1p29ap730s2bbfpsaldq2"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; testHaskellDepends = [ base hedgehog hspec ]; - homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme"; + homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme"; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113932,6 +114894,7 @@ self: { homepage = "http://github.com/haskell-works/hw-json#readme"; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-lens" = callPackage @@ -113966,24 +114929,25 @@ self: { homepage = "http://github.com/haskell-works/hw-json-lens#readme"; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache , containers, errors, hashable, hspec, http-client, http-types, mtl - , pure-zlib, QuickCheck, semigroups, servant, servant-client, text - , transformers, unordered-containers + , pure-zlib, QuickCheck, semigroups, servant, servant-client + , tagged, text, transformers, unordered-containers }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.3.0"; - sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa"; + version = "1.4.0"; + sha256 = "19lk0vyrl6hcd8f053yh7m1hym2hqs9srhjq9isq19s8nqgpijc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable http-client http-types mtl pure-zlib semigroups servant - servant-client text transformers unordered-containers + servant-client tagged text transformers unordered-containers ]; testHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable @@ -114161,6 +115125,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-rankselect_0_11_0_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, deepseq + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap + , QuickCheck, resourcet, vector + }: + mkDerivation { + pname = "hw-rankselect"; + version = "0.11.0.0"; + sha256 = "0sywcqzrrxmlwgg4glj8fm8fn4n1a33f20lmj9bvchzh20gg340c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base + vector + ]; + executableHaskellDepends = [ + base directory hw-bits hw-prim hw-rankselect-base mmap vector + ]; + testHaskellDepends = [ + base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog + hw-prim hw-rankselect-base mmap QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion directory hw-bits hw-prim + hw-rankselect-base mmap resourcet vector + ]; + homepage = "http://github.com/haskell-works/hw-rankselect#readme"; + description = "Rank-select"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-rankselect-base" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim , hw-string-parse, QuickCheck, safe, vector @@ -114183,6 +115180,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-rankselect-base_0_3_0_0" = callPackage + ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec + , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim + , hw-string-parse, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-rankselect-base"; + version = "0.3.0.0"; + sha256 = "19gclmljps2nplfqch26grzagvsraafr4540s6x19x2m58aa3m7g"; + libraryHaskellDepends = [ + base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector + ]; + testHaskellDepends = [ + base bits-extra hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bits-extra criterion hw-bits hw-prim vector + ]; + homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; + description = "Rank-select base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -114232,23 +115254,23 @@ self: { "hw-xml" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, cereal, conduit, containers, criterion, ghc-prim - , hspec, hw-balancedparens, hw-bits, hw-conduit, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap, mtl, QuickCheck - , resourcet, transformers, vector, word8 + , bytestring, cereal, conduit, containers, criterion, deepseq + , ghc-prim, hspec, hw-balancedparens, hw-bits, hw-conduit + , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap + , mtl, QuickCheck, resourcet, transformers, vector, word8 }: mkDerivation { pname = "hw-xml"; - version = "0.1.0.1"; - sha256 = "0fhf0l6zpmrj76gkhbym8ds9dg270y22hdpqxrg11gxyrdymdnbd"; + version = "0.1.0.3"; + sha256 = "15vycayfmykds6dka0kw106fjk2wg3qgifk698fwkj1i4chsia97"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array attoparsec base bytestring cereal conduit - containers ghc-prim hw-balancedparens hw-bits hw-conduit hw-parser - hw-prim hw-rankselect hw-rankselect-base lens mtl resourcet - transformers vector word8 + containers deepseq ghc-prim hw-balancedparens hw-bits hw-conduit + hw-parser hw-prim hw-rankselect hw-rankselect-base lens mtl + resourcet transformers vector word8 ]; executableHaskellDepends = [ base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect @@ -114653,8 +115675,8 @@ self: { pname = "hxt-pickle-utils"; version = "0.1.0.3"; sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx"; - revision = "2"; - editedCabalFile = "109jh2iibhnllkwpqpiyfwdqjn3v06ap58fhyzikjdqzz0rzwgh5"; + revision = "3"; + editedCabalFile = "0d5fg718y7xzw76ip33q0w1liqk70q9074qkd198mjnijxjcrkf3"; libraryHaskellDepends = [ base hxt mtl ]; homepage = "https://github.com/silkapp/hxt-pickle-utils"; description = "Utility functions for using HXT picklers"; @@ -117107,10 +118129,10 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.0.0"; - sha256 = "1qkpwa2am439bpngiiwgh14cg19d4mp6s9qqa890rvm5pqh8skvz"; + version = "1.1.1"; + sha256 = "0drq4rzbljql51hc2d8ldsm6xhsj7imlsxclivmf3lr9lykkp0p1"; libraryHaskellDepends = [ base lens ]; - homepage = "https://github.com/wdanilo/impossible"; + homepage = "https://github.com/luna/impossible"; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -117279,6 +118301,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "incremental" = callPackage + ({ mkDerivation, base, containers, deepseq, semigroups }: + mkDerivation { + pname = "incremental"; + version = "0"; + sha256 = "01fvc963gln6svash9cf9v2wbfnssh4j5r49l6y23zmnmqnzxs8x"; + libraryHaskellDepends = [ base containers deepseq semigroups ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/fumieval/incremental#readme"; + description = "incremental update library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "incremental-computing" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers , deepseq, dlist, fingertree, order-maintenance, QuickCheck @@ -117767,7 +118802,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_5_0" = callPackage + "influxdb_1_5_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -117776,8 +118811,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.5.0"; - sha256 = "008ry9znrjjn3yhc5831gc4jgnxnwr1yibzm72lmngqywhv0mi9w"; + version = "1.5.1"; + sha256 = "1gxhd5ywz27z6jkx9bdmqsjafl2j0wk5vmrclz7l7hwfnn5553c7"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -118101,8 +119136,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "5"; - editedCabalFile = "13m83jdnxxykkc8fi2fa5qmy2mpsg3w9yphbl8cxdhmj8566pr7c"; + revision = "6"; + editedCabalFile = "0dna826vhnal6m213llszn68phjs27pd43f7s8wdhdmjdx1nzk72"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -118341,10 +119376,8 @@ self: { }: mkDerivation { pname = "int-cast"; - version = "0.1.2.0"; - sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb"; - revision = "2"; - editedCabalFile = "14i728sy9y38zjm9xcjqyg9jjnayzdpzplpff2cdpc9jk596fmcs"; + version = "0.2.0.0"; + sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -120030,8 +121063,8 @@ self: { }: mkDerivation { pname = "iso8583-bitmaps"; - version = "0.1.0.0"; - sha256 = "0w6m8ygpy1g95zvmbzq9402rxh4dj48i5bhcdzc4s0kig239gzqd"; + version = "0.1.1.0"; + sha256 = "04i557469q2ablwmlwg35jazh7mpd1cgbrzl02xbvn4xbg7n2fcr"; libraryHaskellDepends = [ base binary bytestring containers parsec syb template-haskell th-lift @@ -120912,8 +121945,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.4"; - sha256 = "0bqvxnysynpznhibwlcmcg849psjm0q158mh50w0bcwa7jx6v441"; + version = "0.5.5"; + sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120924,7 +121957,7 @@ self: { executableHaskellDepends = [ base boxes directory filepath ]; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -121561,6 +122594,39 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_7_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.7.0.0"; + sha256 = "051rjqfskizgm9j927zh500q54lii3scldsymgcdfbaw40d0mncc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + executableHaskellDepends = [ aeson base bytestring lens mtl ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + homepage = "https://github.com/frasertweedale/hs-jose"; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -121586,6 +122652,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jot" = callPackage + ({ mkDerivation, base, data-default, dhall, docopt, extra, filepath + , process, time, turtle, yaml + }: + mkDerivation { + pname = "jot"; + version = "0.1.0.3"; + sha256 = "1rw5ah60kfazycpf2f0sin98rba99d06gkqfci30m64wpkcm9l4g"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base data-default dhall docopt extra filepath process time turtle + yaml + ]; + homepage = "http://gitlab.com/locallycompact/jot"; + description = "Tiny markdown notebook"; + license = stdenv.lib.licenses.isc; + }) {}; + "jpeg" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -121823,21 +122908,6 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9.1"; - sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn"; - libraryHaskellDepends = [ - array base bytestring containers mtl parsec pretty syb text - ]; - description = "Support for serialising Haskell to and from JSON"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "json_0_9_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, mtl, parsec - , pretty, syb, text - }: - mkDerivation { - pname = "json"; version = "0.9.2"; sha256 = "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6"; libraryHaskellDepends = [ @@ -121845,7 +122915,6 @@ self: { ]; description = "Support for serialising Haskell to and from JSON"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-api" = callPackage @@ -121973,6 +123042,39 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "json-autotype_1_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, GenericPretty, hashable, lens, mtl + , optparse-applicative, pretty, process, QuickCheck, scientific + , smallcheck, text, uniplate, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "json-autotype"; + version = "1.1.2"; + sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers filepath GenericPretty hashable lens mtl + pretty process scientific text uniplate unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers filepath GenericPretty hashable + lens mtl optparse-applicative pretty process scientific text + uniplate unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath GenericPretty + hashable lens mtl optparse-applicative pretty process QuickCheck + scientific smallcheck text uniplate unordered-containers vector + ]; + homepage = "https://github.com/mgajda/json-autotype"; + description = "Automatic type declaration for JSON input data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "json-b" = callPackage ({ mkDerivation, base, bytestring, bytestring-nums, bytestring-trie , bytestringparser-temporary, containers, utf8-string @@ -122288,8 +123390,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "4"; - editedCabalFile = "1vdfhhbk020bpdg6x8lx21w5aykzzfk9k119cd4px9hm6r77grcy"; + revision = "5"; + editedCabalFile = "0fi7cij476s4lhjpi7m1yp9p30qv7pyv0hlcj30kd0zq74nwwrdz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122336,8 +123438,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "3"; - editedCabalFile = "1bn1w9vwif05hjdprc354if3mccaw9gari233x0l6p35188idmsc"; + revision = "4"; + editedCabalFile = "19nasv4sxjn3j0xvr1pd9x6bf8f8566wwd15y3wwll89bpnyd4z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122362,8 +123464,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; - revision = "12"; - editedCabalFile = "0x3cvndfshy4sd66m2xilyp876kvmgw5flagawamwis6hs8pfdi2"; + revision = "13"; + editedCabalFile = "07r9sdkhhp7wp7zyrw8mnr9dk1z83drm3jfcayv9gz28jnr3gpv1"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -122417,8 +123519,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.4.2.0"; - sha256 = "06y8q95vyavcbvq5z4zh50jn3djhlj1xq7yv8dns7gxfc5fvdndy"; + version = "0.4.2.3"; + sha256 = "0ijic6vfrpykzy7j3li94fjmaj1vclvp0in1ymb5z5whvljlynw7"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -123403,8 +124505,8 @@ self: { }: mkDerivation { pname = "kansas-lava"; - version = "0.2.4.4"; - sha256 = "0pbciwh79y1pzqlpd2f8pm5w8bjq5bs47slqw71q09f7jlgs0i7d"; + version = "0.2.4.5"; + sha256 = "0pcxmsf18ykvf1mbm3w8qn86rdmr69ilcakrgidl1ag6liq1s6zc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -124429,14 +125531,14 @@ self: { , exceptions, fast-logger, filepath, http-client, lifted-base , MonadRandom, network, optparse-applicative, process, raaz, random , random-shuffle, readline, SafeSemaphore, secret-sharing, servant - , servant-client, servant-server, socks, split, stm, text, time - , token-bucket, transformers, unbounded-delays, unix, unix-compat - , utf8-string, wai, warp, zxcvbn-c + , servant-client, servant-server, socks, split, stm, text + , text-short, time, token-bucket, transformers, unbounded-delays + , unix, unix-compat, utf8-string, wai, warp, zxcvbn-c }: mkDerivation { pname = "keysafe"; - version = "0.20170811"; - sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py"; + version = "0.20180326"; + sha256 = "01kagnpliw0qmhhrx1lcaxdg41sq76km3c1gzk3b9siyqkszhq08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124445,8 +125547,8 @@ self: { http-client lifted-base MonadRandom network optparse-applicative process raaz random random-shuffle readline SafeSemaphore secret-sharing servant servant-client servant-server socks split - stm text time token-bucket transformers unbounded-delays unix - unix-compat utf8-string wai warp zxcvbn-c + stm text text-short time token-bucket transformers unbounded-delays + unix unix-compat utf8-string wai warp zxcvbn-c ]; homepage = "https://keysafe.branchable.com/"; description = "back up a secret key securely to the cloud"; @@ -125228,19 +126330,6 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.1"; - sha256 = "0vlic5ad1zdqhlg0jd3zgc65acq7270607blkf6qgm6bk2g3j1pr"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - homepage = "https://github.com/tfausak/lackey#readme"; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lackey_1_0_2" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; version = "1.0.2"; sha256 = "00zvbdls0nr4q18889xr8z3cpfldi5gg3m2g7d572bcxvwfhm4y4"; libraryHaskellDepends = [ base servant servant-foreign text ]; @@ -125248,7 +126337,6 @@ self: { homepage = "https://github.com/tfausak/lackey#readme"; description = "Generate Ruby clients from Servant APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lagrangian" = callPackage @@ -125386,12 +126474,12 @@ self: { ({ mkDerivation, base, containers, mtl, read-bounded }: mkDerivation { pname = "lambda-options"; - version = "0.9.0.1"; - sha256 = "16q4skxkmc6xaj23ys5ddpazwcxvck7dvvilm8n4k0wam0llhs2h"; + version = "0.9.1.0"; + sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n"; libraryHaskellDepends = [ base containers mtl read-bounded ]; homepage = "https://github.com/thomaseding/lambda-options"; - description = "A modern command-line parser for Haskell"; - license = "unknown"; + description = "Declarative command line parser using type-driven pattern matching"; + license = stdenv.lib.licenses.bsd2; }) {}; "lambda-placeholders" = callPackage @@ -126106,20 +127194,20 @@ self: { "language-ats" = callPackage ({ mkDerivation, alex, ansi-wl-pprint, array, base - , composition-prelude, containers, criterion, deepseq, happy, hspec - , hspec-dirstream, lens, recursion-schemes, system-filepath - , transformers + , composition-prelude, containers, cpphs, criterion, deepseq, happy + , hspec, hspec-dirstream, microlens, microlens-th + , recursion-schemes, system-filepath, transformers }: mkDerivation { pname = "language-ats"; - version = "1.2.0.2"; - sha256 = "1hbngljls19a9mr6gz5qm80ibx8z75ky0s5gn57nmlsf8pazkfvz"; + version = "1.2.0.6"; + sha256 = "0g1yq11pml5pkpszbzdqkhj172v9zyw8mbf9bl97p883p55p0nxa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq - lens recursion-schemes transformers + microlens microlens-th recursion-schemes transformers ]; - libraryToolDepends = [ alex happy ]; + libraryToolDepends = [ alex cpphs happy ]; testHaskellDepends = [ base hspec hspec-dirstream system-filepath ]; @@ -126251,6 +127339,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-c-quote_0_12_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.12.2"; + sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mainland/language-c-quote"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -126338,26 +127452,22 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "language-docker_3_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath, free - , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck - , semigroups, split, template-haskell, text, th-lift - , th-lift-instances, time, transformers, unordered-containers, yaml + "language-docker_4_0_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, free, Glob + , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split + , template-haskell, text, th-lift, time }: mkDerivation { pname = "language-docker"; - version = "3.0.1"; - sha256 = "1bs9ghajxz0a1jmzarb7fzn4z2m8qmcyydsf93rqlzxc8y8fhsp2"; + version = "4.0.1"; + sha256 = "0z1jifvinq90qh4106azd6ss80ds5p8acvl8x73j4zmqpn2d95xa"; libraryHaskellDepends = [ - aeson base bytestring directory filepath free Glob mtl parsec - pretty semigroups split template-haskell text th-lift - th-lift-instances time transformers unordered-containers yaml + base bytestring free mtl parsec pretty split template-haskell text + th-lift time ]; testHaskellDepends = [ - aeson base bytestring directory filepath free Glob hspec HUnit mtl - parsec pretty process QuickCheck semigroups split template-haskell - text th-lift th-lift-instances time transformers - unordered-containers yaml + base bytestring directory filepath free Glob hspec HUnit mtl parsec + pretty process QuickCheck split template-haskell text th-lift time ]; homepage = "https://github.com/hadolint/language-docker#readme"; description = "Dockerfile parser, pretty-printer and embedded DSL"; @@ -126834,6 +127944,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "language-oberon" = callPackage + ({ mkDerivation, base, containers, directory, either, filepath + , grammatical-parsers, optparse-applicative, parsers, prettyprinter + , rank2classes, repr-tree-syb, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "language-oberon"; + version = "0.1.1"; + sha256 = "0b63yryiaw4fr793qif2bq64fcx4ml3yi8wgkz1rg77j0nnga2vs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory either filepath grammatical-parsers + parsers prettyprinter rank2classes text + ]; + executableHaskellDepends = [ + base containers either filepath grammatical-parsers + optparse-applicative prettyprinter rank2classes repr-tree-syb text + ]; + testHaskellDepends = [ + base directory either filepath tasty tasty-hunit + ]; + homepage = "https://github.com/blamario/language-oberon"; + description = "Parser and pretty-printer for the Oberon programming language"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "language-objc" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, newtype, pretty, process, syb @@ -126905,8 +128042,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.16"; - sha256 = "0n0rhz4aljazfdy8057ld65sibqaipz98wmnnip2ldcqwcklawnh"; + version = "1.3.17"; + sha256 = "0n71grhaw59z3vqkys499kx06q10fn6l5r4sfim17vyxdy0bz8xq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127189,8 +128326,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.0"; - sha256 = "04g5w3gdq4x7vkaw6x36xad7hjmah3iynqnp6xncac31ykkmbwgl"; + version = "0.1"; + sha256 = "195v3jpz5n5vksa8svqng1kwc629ds2kd1p55f6npz2q2j6k8lac"; libraryHaskellDepends = [ base blas-ffi comfort-array lapack-ffi netlib-ffi non-empty transformers utility-ht @@ -127207,8 +128344,8 @@ self: { }: mkDerivation { pname = "lapack-carray"; - version = "0.0.1"; - sha256 = "0f6d9g69a64wwyanwdq2ny3ga2ci0g2hingxv3w52w0xisx00apj"; + version = "0.0.2"; + sha256 = "1dr4mbhc5y21mbnksyi530rsvckfp4mclhhig2rjhx3b06cksfna"; libraryHaskellDepends = [ base carray lapack-ffi netlib-carray netlib-ffi storable-complex transformers @@ -127223,8 +128360,8 @@ self: { ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { pname = "lapack-ffi"; - version = "0.0.1"; - sha256 = "1bxp1lb0nwbc8xswxd2p0l30mfjq5xa1bwy9pkgpp3anww84l0bh"; + version = "0.0.2"; + sha256 = "11759avf0kzkqy4s24kn556j93l10x28njpg6h14y915pdl35dyl"; libraryHaskellDepends = [ base netlib-ffi ]; libraryPkgconfigDepends = [ liblapack ]; homepage = "http://hub.darcs.net/thielema/lapack-ffi/"; @@ -127241,29 +128378,6 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1"; - sha256 = "1x5sv2b4rkglqqgpl44mprwxkkycnv48d5s526m3wmvxzdgz7adz"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring cassava containers explicit-exception filepath - non-empty optparse-applicative parsec pathtype transformers - unordered-containers utility-ht vector - ]; - homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/"; - description = "Generator for Haskell interface to Fortran LAPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lapack-ffi-tools_0_1_0_1" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers - , explicit-exception, filepath, non-empty, optparse-applicative - , parsec, pathtype, transformers, unordered-containers, utility-ht - , vector - }: - mkDerivation { - pname = "lapack-ffi-tools"; version = "0.1.0.1"; sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w"; isLibrary = false; @@ -127277,7 +128391,6 @@ self: { homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/"; description = "Generator for Haskell interface to Fortran LAPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "large-hashable" = callPackage @@ -127484,8 +128597,8 @@ self: { pname = "lattices"; version = "1.7.1"; sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x"; - revision = "1"; - editedCabalFile = "1h68xxzy90i7nggyh67f4744zk9a4zv4lb5ag9dwp126acvg2c9n"; + revision = "2"; + editedCabalFile = "0ngxvs48hqdr5353fbblcrq5hqrwr89xl39akxg8rkridkr3hq96"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -127552,6 +128665,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "layered-state" = callPackage + ({ mkDerivation, base, constraints, criterion, data-default + , deepseq, either, exceptions, kan-extensions, lens, lens-utils + , monad-branch, monoid, mtl, mtl-c, primitive, profunctors + , prologue, timeit, transformers, typelevel + }: + mkDerivation { + pname = "layered-state"; + version = "1.1.2"; + sha256 = "1z9xz9nvzlqvzrp4dva9skci70g70lzzf5d5d38ilxvfk7kh56h6"; + libraryHaskellDepends = [ + base constraints data-default exceptions lens lens-utils + monad-branch monoid mtl primitive profunctors prologue transformers + typelevel + ]; + benchmarkHaskellDepends = [ + criterion deepseq either kan-extensions mtl-c timeit + ]; + homepage = "https://github.com/luna/layered-state"; + description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; + license = stdenv.lib.licenses.asl20; + }) {}; + "layers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -127623,6 +128759,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "layouting" = callPackage + ({ mkDerivation, base, container, layered-state, prologue + , terminal-text, text + }: + mkDerivation { + pname = "layouting"; + version = "1.1.2"; + sha256 = "1j3bki62ldi5gbl3asa31rjjlah2842rhgylxwab13c3r50a7p85"; + libraryHaskellDepends = [ + base container layered-state prologue terminal-text text + ]; + homepage = "https://github.com/luna/layouting"; + description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers."; + license = stdenv.lib.licenses.asl20; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -128082,6 +129234,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "left4deadrl" = callPackage + ({ mkDerivation, base, hscharm, random, random-shuffle }: + mkDerivation { + pname = "left4deadrl"; + version = "0.0.2"; + sha256 = "1lwpkhlhiy8dbw3ln0dz65ci8my7cmqs7d08f5wy728ixmmcn84w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base hscharm random random-shuffle ]; + description = "left4dead-inspired roguelike"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "legion" = callPackage ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring , canteven-http, conduit, conduit-extra, containers @@ -128286,10 +129451,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.16"; - sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z"; - revision = "4"; - editedCabalFile = "18nipajdyqz5vpqx0mrl5c1a97jb8wm2skq57jashgygq5h8y7g4"; + version = "4.16.1"; + sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -128329,6 +129492,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-accelerate_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, base, lens }: + mkDerivation { + pname = "lens-accelerate"; + version = "0.2.0.0"; + sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; + libraryHaskellDepends = [ accelerate base lens ]; + homepage = "https://github.com/tmcdonell/lens-accelerate"; + description = "Instances to mix lens with accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-action" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant , directory, doctest, filepath, lens, mtl, profunctors @@ -128586,6 +129762,7 @@ self: { homepage = "https://github.com/xngns/lens-toml-parser"; description = "Lenses for toml-parser"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-tutorial" = callPackage @@ -128602,13 +129779,17 @@ self: { }) {}; "lens-utils" = callPackage - ({ mkDerivation, base, lens }: + ({ mkDerivation, aeson, base, containers, data-default, lens + , monoid, template-haskell + }: mkDerivation { pname = "lens-utils"; - version = "1.2"; - sha256 = "1ysr9ph03f8klvnbhvzjn45vsnxbfp1ry34lbcrhdm6gy7x0maib"; - libraryHaskellDepends = [ base lens ]; - homepage = "https://github.com/wdanilo/lens-utils"; + version = "1.4.2"; + sha256 = "1sgsahb2cgfhbv3vw0h1cqls5g5kgbq9crx4w0rfjxcwk9d5jzds"; + libraryHaskellDepends = [ + aeson base containers data-default lens monoid template-haskell + ]; + homepage = "https://github.com/luna/lens-utils"; description = "Collection of missing lens utilities"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -128664,8 +129845,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.10.1"; - sha256 = "04hr5q48da5clfvypwb9fii6si19kda12ncyx10rp2fni50sshrl"; + version = "1.0.11.3"; + sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128707,6 +129888,8 @@ self: { pname = "lenz-template"; version = "0.2.0.0"; sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn"; + revision = "1"; + editedCabalFile = "05rgdgqk2yb92wlfs13844bdh7a2k2rddnxf9fcnz1c3qq4wkyi5"; libraryHaskellDepends = [ base base-unicode-symbols containers lenz template-haskell ]; @@ -130209,8 +131392,8 @@ self: { pname = "linear"; version = "1.20.7"; sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; - revision = "3"; - editedCabalFile = "0y7gjzrwhfsbr4vh10qkky563jiwr60cp0yx019adabvx6sf7yil"; + revision = "4"; + editedCabalFile = "11fxa2bqpyf99iv2b3yzi9z17y0r70afqij52lmifsyzr24zizv3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -130247,6 +131430,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear-accelerate_0_6_0_0" = callPackage + ({ mkDerivation, accelerate, base, Cabal, cabal-doctest + , distributive, doctest, lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.6.0.0"; + sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + accelerate base distributive lens linear + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/linear-accelerate/"; + description = "Lifting linear vector spaces into Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-algebra-cblas" = callPackage ({ mkDerivation, base, ieee754, QuickCheck, storable-complex , test-framework, test-framework-quickcheck2, vector @@ -131128,24 +132330,6 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.0.1"; - sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa"; - libraryHaskellDepends = [ - base base-prelude mmorph monad-control mtl transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - homepage = "https://github.com/nikita-volkov/list-t"; - description = "ListT done right"; - license = stdenv.lib.licenses.mit; - }) {}; - - "list-t_1_0_1" = callPackage - ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control - , mtl, mtl-prelude, transformers, transformers-base - }: - mkDerivation { - pname = "list-t"; version = "1.0.1"; sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3"; libraryHaskellDepends = [ @@ -131155,7 +132339,6 @@ self: { homepage = "https://github.com/nikita-volkov/list-t"; description = "ListT done right"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t-attoparsec" = callPackage @@ -131262,8 +132445,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.3"; - sha256 = "13pasfggjbzldy85d0kaydw95myxna63299k021fmbaifz26q2fx"; + version = "1.0.4"; + sha256 = "0zia1b2phk4skv39q2k481jsagz1syd6rkgfcdra15i2s5dhzvyp"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library"; @@ -131769,6 +132952,8 @@ self: { pname = "llvm-hs"; version = "6.0.0"; sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd"; + revision = "1"; + editedCabalFile = "1apyscxr48g37qw15wmqb98si8gcnx8cky6bj68ai3jfjfphbjly"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -132017,8 +133202,8 @@ self: { }: mkDerivation { pname = "lmdb-simple"; - version = "0.3.1.0"; - sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn"; + version = "0.4.0.0"; + sha256 = "1bq8zdym2x1yyzafyyw2syn9pg4w33y107qyrid67492zmck10zi"; libraryHaskellDepends = [ base bytestring lmdb serialise ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -132112,6 +133297,7 @@ self: { homepage = "https://github.com/deech/load-font#load-font"; description = "A cross platform library for loading bundled fonts into your application"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loadavg" = callPackage @@ -132294,6 +133480,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "loch-th_0_2_2" = callPackage + ({ mkDerivation, base, pretty, template-haskell }: + mkDerivation { + pname = "loch-th"; + version = "0.2.2"; + sha256 = "1hvdkcyrlnv65q8x8h0441x30wr9bbfbg3961xd3fy9an5r961fc"; + libraryHaskellDepends = [ base pretty template-haskell ]; + homepage = "https://github.com/liskin/loch-th"; + description = "Support for precise error locations in source files (Template Haskell version)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lock-file" = callPackage ({ mkDerivation, base, data-default-class, directory, exceptions , filepath, HUnit, tagged-exception-core, test-framework @@ -132486,6 +133685,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-elasticsearch_0_10_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bloodhound, bytestring, deepseq, http-client, http-client-tls + , log-base, semigroups, text, text-show, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + version = "0.10.0.0"; + sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bloodhound bytestring + deepseq http-client http-client-tls log-base semigroups text + text-show time transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-postgres" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base @@ -132544,8 +133764,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.8.10.1"; - sha256 = "0chwqn8pdlfhlixl3z9a6gvx86vxmq92v325z0fsamwzb7hhcf52"; + version = "1.8.11"; + sha256 = "0xhvipk5dlv7r2pmgn5mf46rrz092xhm6ar611y5lrr99i2kg172"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132681,29 +133901,6 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.2.4"; - sha256 = "14j63172ml4yj7sqscjxdkxxg869w6hvnlysf9s79qzbjnw44h3h"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl semigroups stm - stm-delay text time transformers transformers-base wl-pprint-text - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - text time wl-pprint-text - ]; - homepage = "https://github.com/ocharles/logging-effect"; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_2_5" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , semigroups, stm, stm-delay, text, time, transformers - , transformers-base, wl-pprint-text - }: - mkDerivation { - pname = "logging-effect"; version = "1.2.5"; sha256 = "1db8x2rihkddww54cyzww0c65vk90nlnp82xrw226wliknbikri3"; libraryHaskellDepends = [ @@ -132717,7 +133914,6 @@ self: { homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -132765,25 +133961,6 @@ self: { }: mkDerivation { pname = "logging-effect-extra-handler"; - version = "1.1.3"; - sha256 = "0pxsnah1v2d0zk5x3w8whifb0f78shhn0kpg5iq00ggpwg6x686i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base exceptions logging-effect time wl-pprint-text - ]; - executableHaskellDepends = [ base logging-effect wl-pprint-text ]; - homepage = "https://github.com/jship/logging-effect-extra#readme"; - description = "Handy logging handler combinators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-effect-extra-handler_1_1_4" = callPackage - ({ mkDerivation, base, exceptions, logging-effect, time - , wl-pprint-text - }: - mkDerivation { - pname = "logging-effect-extra-handler"; version = "1.1.4"; sha256 = "0932i0qrwrr2j7w40bf3q5dlazz4800drc0chvr1kpbpk6b4njim"; isLibrary = true; @@ -132795,7 +133972,6 @@ self: { homepage = "https://github.com/jship/logging-effect-extra#readme"; description = "Handy logging handler combinators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -133546,8 +134722,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "1"; - editedCabalFile = "0axg26s9gssg3ig613rnqj5v4aczki4kgyqmnd208kljkawq6c7k"; + revision = "2"; + editedCabalFile = "0ypilhv8im5vqwdy6wk9ql2dlpr4cykag6ikvyjapl8bpyfm44xa"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -133665,6 +134841,7 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltiv1p1" = callPackage @@ -133817,6 +134994,8 @@ self: { pname = "lucid"; version = "2.9.10"; sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0"; + revision = "1"; + editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -134214,8 +135393,8 @@ self: { }: mkDerivation { pname = "lz4-conduit"; - version = "0.2"; - sha256 = "18zl3cxa8f6n64p1iz9l834vkk93bjdb37h69jj5wdd4q6hc51km"; + version = "0.3"; + sha256 = "18yjrf9iw4bwq25x7fd95lf99qcqj9nm3hdq6lkgxc5plgy94nyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134662,21 +135841,21 @@ self: { , composition-prelude, containers, criterion, directory, file-embed , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec , MonadRandom, mtl, optparse-applicative, random-shuffle - , recursion-schemes, recursion-schemes-ext, tar, template-haskell - , text, th-lift-instances, titlecase, zip-archive, zlib + , recursion-schemes, tar, template-haskell, text, th-lift-instances + , titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "4.0.1.0"; - sha256 = "08nw11l8vpazyfny3f8alyb9r268wlh3q24032q34sk1n5d92pcl"; + version = "4.0.2.6"; + sha256 = "079100sdqh4g7mlbf7p1j04r7g6c6b3q58nm4qiy8yrdvbzjdrhv"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl - random-shuffle recursion-schemes recursion-schemes-ext tar - template-haskell text th-lift-instances titlecase zip-archive zlib + random-shuffle recursion-schemes tar template-haskell text + th-lift-instances titlecase zip-archive zlib ]; executableHaskellDepends = [ base directory megaparsec optparse-applicative text @@ -134944,6 +136123,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "main-tester" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, hspec + , hspec-core, QuickCheck, text + }: + mkDerivation { + pname = "main-tester"; + version = "0.1.0.0"; + sha256 = "0sagm9fkdgjv8x602bjj32glcrivjf3yz47gpbbm48k0mk0dj2dc"; + libraryHaskellDepends = [ base bytestring directory ]; + testHaskellDepends = [ + base bytestring doctest hspec hspec-core QuickCheck text + ]; + homepage = "https://gitlab.com/igrep/main-tester#readme"; + description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mainland-pretty" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { @@ -134958,6 +136154,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mainland-pretty_0_7" = callPackage + ({ mkDerivation, base, containers, srcloc, text, transformers }: + mkDerivation { + pname = "mainland-pretty"; + version = "0.7"; + sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi"; + libraryHaskellDepends = [ + base containers srcloc text transformers + ]; + homepage = "https://github.com/mainland/mainland-pretty"; + description = "Pretty printing designed for printing source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "majordomo" = callPackage ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale , threads, time, unix, zeromq-haskell @@ -135640,6 +136851,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "map-classes" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , kan-extensions, transformers, utility-ht + }: + mkDerivation { + pname = "map-classes"; + version = "0.1.0.0"; + sha256 = "1bimmnr6k1a87l24a7gzylx02gal64jcvg0zv6ci82nxbb7i1v0c"; + libraryHaskellDepends = [ + array base bytestring containers kan-extensions transformers + utility-ht + ]; + homepage = "https://github.com/clintonmead/map-classes"; + description = "A set of classes and instances for working with key/value mappings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "map-exts" = callPackage ({ mkDerivation, base, bytestring, cassava, containers }: mkDerivation { @@ -135673,6 +136901,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "map-syntax_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl + , QuickCheck, transformers + }: + mkDerivation { + pname = "map-syntax"; + version = "0.3"; + sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ + base containers deepseq hspec HUnit mtl QuickCheck transformers + ]; + description = "Syntax sugar for defining maps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mappy" = callPackage ({ mkDerivation, ansi-terminal, base, containers, directory , haskeline, hspec, parsec, QuickCheck @@ -135714,6 +136959,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "marihana" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "marihana"; + version = "0.1.1.0"; + sha256 = "1wcrmjxw39pcarvwn4cfzd4wimvsf57qg8vl5lykcd9s4p2dnyvw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory ]; + executableHaskellDepends = [ base directory ]; + testHaskellDepends = [ base directory ]; + homepage = "https://github.com/suzukeno/marihana#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "marionetta" = callPackage ({ mkDerivation, base, containers, gloss, mtl, splines, vector , vector-space @@ -135741,8 +137001,8 @@ self: { }: mkDerivation { pname = "markdown"; - version = "0.1.17"; - sha256 = "11bcbhrlfddjlifrab46qywbrabxcf8hg1zp26l17dlxs3nm681w"; + version = "0.1.17.1"; + sha256 = "0n1vcw0vmhpgsmyxxafc82r2kp27g081zwx9md96zj5x5642vxz1"; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup conduit conduit-extra containers data-default text transformers xml-conduit xml-types @@ -136111,8 +137371,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.1.2.0"; - sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli"; + version = "0.1.4.0"; + sha256 = "0hp0dvc9qr0px3x2w28wvks3918jc5z1ib2c0n2bfz0isi11gs1s"; libraryHaskellDepends = [ base data-default-class deepseq ghc-prim primitive vector ]; @@ -136124,14 +137384,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_1_4_0" = callPackage + "massiv_0_1_5_0" = callPackage ({ mkDerivation, base, data-default, data-default-class, deepseq , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector }: mkDerivation { pname = "massiv"; - version = "0.1.4.0"; - sha256 = "0hp0dvc9qr0px3x2w28wvks3918jc5z1ib2c0n2bfz0isi11gs1s"; + version = "0.1.5.0"; + sha256 = "1azd011abvlkr27rssl6cra8an142z6jrfwj6yaas1favbs6r570"; libraryHaskellDepends = [ base data-default-class deepseq ghc-prim primitive vector ]; @@ -136163,6 +137423,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-io_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq, directory + , filepath, JuicyPixels, massiv, netpbm, process, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.2.0"; + sha256 = "02va411j1alsja009xms30x0zhwansjiy81djz2za06ghyg4f6a1"; + libraryHaskellDepends = [ + base bytestring data-default deepseq directory filepath JuicyPixels + massiv netpbm process vector + ]; + homepage = "https://github.com/lehins/massiv"; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -136541,8 +137819,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "40700.0.0"; - sha256 = "1knf05p9qmk51ysvp2gp718d365g9n7myycb07w8d84f4vrphg51"; + version = "40800.0.2"; + sha256 = "0fgk0my3r0vcw545xqjcda8ikj5cbfzgg9vxfs3jzdcnsa0rgcyf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -136558,8 +137836,8 @@ self: { base base-compat brick bytestring cheapskate checkers config-ini connection containers directory filepath hashable Hclip mattermost-api mattermost-api-qc microlens-platform mtl process - quickcheck-text stm strict string-conversions tasty tasty-hunit - tasty-quickcheck text text-zipper time timezone-olson + quickcheck-text semigroups stm strict string-conversions tasty + tasty-hunit tasty-quickcheck text text-zipper time timezone-olson timezone-series transformers Unique unordered-containers vector vty xdg-basedir ]; @@ -136571,20 +137849,21 @@ self: { "mattermost-api" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, connection , containers, gitrev, hashable, HTTP, HUnit, memory, microlens - , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty - , tasty-hunit, template-haskell, text, time, unordered-containers - , websockets + , microlens-th, mtl, network-uri, pretty-show, process + , resource-pool, stm, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, websockets }: mkDerivation { pname = "mattermost-api"; - version = "40700.0.0"; - sha256 = "1nhhlj6vgjndm34aw9kzmsjrkx7j3fir8rccx65d4c10labclsb9"; + version = "40800.0.2"; + sha256 = "1l2yb9nvy2haw5kyjjij465g45w8xm8vm97jbkx5jb3p4cs44xl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring connection containers gitrev hashable HTTP memory microlens microlens-th network-uri pretty-show process - stm template-haskell text time unordered-containers websockets + resource-pool stm template-haskell text time unordered-containers + websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit @@ -136601,8 +137880,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40700.0.0"; - sha256 = "0dz254wmrxbavsjqhyn90gg6iplcgcpsw8p9fv0c5kxlafqwg0kf"; + version = "40800.0.2"; + sha256 = "04whpcbcd5cqnwfrskk3r2gjmyvap2m7d8xsjdry56kil6iqznk5"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -137374,6 +138653,32 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_6_5_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, hspec, hspec-discover, hspec-expectations + , mtl, parser-combinators, QuickCheck, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "6.5.0"; + sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec hspec-expectations mtl QuickCheck + scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -137393,8 +138698,8 @@ self: { }: mkDerivation { pname = "mellon-core"; - version = "0.8.0.6"; - sha256 = "07dhbqw0x7vbwzkhf1wh083h4b8xrw8sv75db2s72zgjrh8igpfm"; + version = "0.8.0.7"; + sha256 = "1nlqqkmm4163260zgl9cqxrd47iy3fpdyhd52y79c2cr1mqjw39q"; libraryHaskellDepends = [ async base mtl protolude time transformers ]; @@ -137411,8 +138716,8 @@ self: { ({ mkDerivation, base, hpio, mellon-core, protolude }: mkDerivation { pname = "mellon-gpio"; - version = "0.8.0.6"; - sha256 = "08mr37wmg1paigbhs1wv7rpdxkhy2jiba8nd22rg1lhscc04k7g1"; + version = "0.8.0.7"; + sha256 = "0hg878il0d31lfqwkb3rsd7gxbhs5cb1sxgc3rwdv70fdg63iirp"; libraryHaskellDepends = [ base hpio mellon-core protolude ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; @@ -137424,34 +138729,37 @@ self: { , exceptions, hpio, hspec, hspec-wai, http-client, http-client-tls , http-types, lens, lucid, mellon-core, mellon-gpio, mtl, network , optparse-applicative, protolude, QuickCheck, quickcheck-instances - , servant, servant-client, servant-docs, servant-lucid - , servant-server, servant-swagger, servant-swagger-ui, swagger2 - , text, time, transformers, wai, wai-extra, warp + , servant, servant-client, servant-client-core, servant-docs + , servant-lucid, servant-server, servant-swagger + , servant-swagger-ui, swagger2, text, time, transformers, wai + , wai-extra, warp }: mkDerivation { pname = "mellon-web"; - version = "0.8.0.6"; - sha256 = "0hfb2gkfn9kdg8a5n6l8c7jky8d4545qqlpdzl2qv63500nr4wz3"; + version = "0.8.0.7"; + sha256 = "1m3ch98i8wzhi7g2c2l9klp0a3xcqfwfbq6ad6grl43v8fh1q737"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring http-client http-types lens - lucid mellon-core protolude servant servant-client servant-docs - servant-lucid servant-server servant-swagger servant-swagger-ui - swagger2 text time transformers wai warp + lucid mellon-core protolude servant servant-client + servant-client-core servant-docs servant-lucid servant-server + servant-swagger servant-swagger-ui swagger2 text time transformers + wai warp ]; executableHaskellDepends = [ base bytestring exceptions hpio http-client http-client-tls http-types mellon-core mellon-gpio mtl network optparse-applicative - protolude servant-client time transformers warp + protolude servant-client servant-client-core time transformers warp ]; testHaskellDepends = [ aeson aeson-pretty base bytestring doctest hspec hspec-wai http-client http-types lens lucid mellon-core network protolude - QuickCheck quickcheck-instances servant servant-client servant-docs - servant-lucid servant-server servant-swagger servant-swagger-ui - swagger2 text time transformers wai wai-extra warp + QuickCheck quickcheck-instances servant servant-client + servant-client-core servant-docs servant-lucid servant-server + servant-swagger servant-swagger-ui swagger2 text time transformers + wai wai-extra warp ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "A REST web service for Mellon controllers"; @@ -138284,12 +139592,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens_0_4_9" = callPackage + "microlens_0_4_9_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.9"; - sha256 = "1zsisv6vlkphqw8rdi6c6phm6k3izc0n6vj1z1b6my7r8zyshlia"; + version = "0.4.9.1"; + sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; @@ -138446,14 +139754,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th_0_4_2" = callPackage + "microlens-th_0_4_2_1" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell , th-abstraction, transformers }: mkDerivation { pname = "microlens-th"; - version = "0.4.2"; - sha256 = "16962h9qxjw6mv7nqn2xz7kclfgllla52illrzpri738wnf2nwsd"; + version = "0.4.2.1"; + sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -139443,15 +140751,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_15_0_0" = callPackage + "miso_0_18_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.15.0.0"; - sha256 = "1kkh71psj0acia9r1mzvp16lzmc6gsma81shp7bhfy35yhbvwsl4"; + version = "0.18.0.0"; + sha256 = "17znwg6spm950qnjrw2v72lff5xng4c1rpcq3140qkmcq99v1zvi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139624,6 +140932,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mltool_0_2_0_0" = callPackage + ({ mkDerivation, ascii-progress, base, deepseq, hmatrix + , hmatrix-gsl, hmatrix-morpheus, HUnit, MonadRandom, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "mltool"; + version = "0.2.0.0"; + sha256 = "0yjq9wbvni9sgh966jccfcsm6ajicrfkgvwg08383rwnsqbbjm8q"; + libraryHaskellDepends = [ + ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-morpheus + MonadRandom random vector + ]; + testHaskellDepends = [ + base hmatrix hmatrix-morpheus HUnit MonadRandom random + test-framework test-framework-hunit test-framework-quickcheck2 + vector + ]; + homepage = "https://github.com/alexander-ignatyev/mltool"; + description = "Machine Learning Toolbox"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmap" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -139713,8 +141046,8 @@ self: { ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; - version = "1.1.1"; - sha256 = "17hhfvdr2cclrhslsph3jaly7gfn7caajbzh7xr2prgvxmjhsdg3"; + version = "1.1.2"; + sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -139900,12 +141233,12 @@ self: { "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split - , text, text-show + , text, text-show, transformers }: mkDerivation { pname = "modify-fasta"; - version = "0.8.2.3"; - sha256 = "0pj6qymvz1b7rm5i1p2vys7ayp6p6pp8m8f3giahrccp9zg0gvnw"; + version = "0.8.3.0"; + sha256 = "1hvn55c0cg4h2980ia28b2n2r9p7p0rqyfr5wvkkqyhz4si7dp9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139914,7 +141247,7 @@ self: { ]; executableHaskellDepends = [ base containers fasta mtl optparse-applicative pipes pipes-text - semigroups split text + semigroups split text transformers ]; homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; @@ -140176,8 +141509,8 @@ self: { }: mkDerivation { pname = "monad-abort-fd"; - version = "0.6.1"; - sha256 = "1wwaia512sb3kh8k0p4ql6zqkmj4fpxzwqfnp7s939j2simmv8gp"; + version = "0.7"; + sha256 = "0w1v39n93zg6i22qx312m6z8pc35im3whp5sb13wfvj2ws0nl1z7"; libraryHaskellDepends = [ base mtl stm transformers transformers-abort transformers-base transformers-compat @@ -140236,6 +141569,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-branch" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "monad-branch"; + version = "1.0.3"; + sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r"; + libraryHaskellDepends = [ base mtl transformers ]; + homepage = "https://github.com/luna/monad-branch"; + description = "Monadic abstraction for computations that can be branched and run independently"; + license = stdenv.lib.licenses.asl20; + }) {}; + "monad-classes" = callPackage ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph , monad-control, peano, reflection, tasty, tasty-hunit @@ -140329,8 +141674,8 @@ self: { }: mkDerivation { pname = "monad-control-aligned"; - version = "0.0.1"; - sha256 = "11s226d80dbzq7as6ik077hg82swfj2svlk662l32sc9y03m3dyx"; + version = "0.0.1.1"; + sha256 = "1xhiw1g0p8zljhy8yz43ljnwhhqn6dwxqi06mdsfji365p9qzrs4"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -140412,8 +141757,8 @@ self: { }: mkDerivation { pname = "monad-finally"; - version = "0.1.1"; - sha256 = "0f2bb8l00vqsswsckc6zgnzl372jg1w7c1zgpcj8fq8bnvia23hb"; + version = "0.1.2"; + sha256 = "1vg9mg748frf63l428wsdjdbf25pphjqixdslvlwgvf8d1ayl2xz"; libraryHaskellDepends = [ base monad-abort-fd monad-control transformers transformers-abort transformers-base transformers-compat @@ -140597,8 +141942,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.28.2"; - sha256 = "1dqrsqpqw4qfyida4j0z6dffds4sj7j282x4ir6wrq9j7nmns4yx"; + version = "0.3.28.3"; + sha256 = "11v5014zqp1sl801wc39yyix8m30vrf3ibas28bcdjyfrbhhvskp"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -140977,23 +142322,6 @@ self: { }: mkDerivation { pname = "monad-recorder"; - version = "0.1.0"; - sha256 = "1n3bp3vian88b6wq2r3qybbnvnflphf1815g1qd6kb9r7d4z2g9i"; - libraryHaskellDepends = [ - base exceptions monad-control mtl transformers transformers-base - ]; - testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/harendra-kumar/monad-recorder"; - description = "Record and replay the results of monadic actions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-recorder_0_1_1" = callPackage - ({ mkDerivation, base, exceptions, hspec, monad-control, mtl - , transformers, transformers-base - }: - mkDerivation { - pname = "monad-recorder"; version = "0.1.1"; sha256 = "05d27h3lx7p4qzby8jrxf6wj5z69s11pgpbkdacxrag0v8vynqq8"; libraryHaskellDepends = [ @@ -141003,7 +142331,6 @@ self: { homepage = "http://github.com/harendra-kumar/monad-recorder"; description = "Record and replay the results of monadic actions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-resumption" = callPackage @@ -141132,11 +142459,11 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "monad-supply"; - version = "0.6"; - sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir"; + version = "0.7"; + sha256 = "1786rj4n0rrjpp07gn2y8vwpf6ijkjaim1q34rq7lvbjx1fhr2z5"; libraryHaskellDepends = [ base mtl ]; description = "Stateful supply monad"; - license = "unknown"; + license = stdenv.lib.licenses.mit; }) {}; "monad-task" = callPackage @@ -141166,6 +142493,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-time_0_3_1_0" = callPackage + ({ mkDerivation, base, mtl, time }: + mkDerivation { + pname = "monad-time"; + version = "0.3.1.0"; + sha256 = "0z30c0k5bqlz86vwajnm6kj26i09zx6dzqwd00z6ba8hqyzm1x0a"; + libraryHaskellDepends = [ base mtl time ]; + testHaskellDepends = [ base mtl time ]; + homepage = "https://github.com/scrive/monad-time"; + description = "Type class for monads which carry the notion of the current time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-timing" = callPackage ({ mkDerivation, base, containers, exceptions, hlint, hspec , monad-control, mtl, time, transformers, transformers-base @@ -141245,12 +142586,12 @@ self: { }) {}; "monad-var" = callPackage - ({ mkDerivation, base, stm, transformers }: + ({ mkDerivation, base, base-compat, stm }: mkDerivation { pname = "monad-var"; - version = "0.1.2.0"; - sha256 = "1nj10lhijwvim7js2vl9b9qq7x55dx7bk6q4jmvpz99c2vqfhyy5"; - libraryHaskellDepends = [ base stm transformers ]; + version = "0.2.1.0"; + sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88"; + libraryHaskellDepends = [ base base-compat stm ]; homepage = "https://github.com/effectfully/monad-var#readme"; description = "Generic operations over variables"; license = stdenv.lib.licenses.bsd3; @@ -141789,6 +143130,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monoid" = callPackage + ({ mkDerivation, base, containers, lens, mtl }: + mkDerivation { + pname = "monoid"; + version = "0.1.8"; + sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf"; + libraryHaskellDepends = [ base containers lens mtl ]; + homepage = "https://github.com/luna/monoid"; + description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used."; + license = stdenv.lib.licenses.asl20; + }) {}; + "monoid-absorbing" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -141806,14 +143159,28 @@ self: { }: mkDerivation { pname = "monoid-extras"; - version = "0.4.2"; - sha256 = "07r86ip6jfa2ka84dpilap01g1pg8r5bqz2nk7js6mlnbh2lxzqk"; - revision = "2"; - editedCabalFile = "04h78r48rg2ppi53869vb8y226g135fxgy9ryi1v08nqsiqi1vvw"; + version = "0.4.3"; + sha256 = "1c2zdsyq0iyagzp9y64j75nxvpbjr5y3fdg8cd1pkfqgms977qsr"; + revision = "1"; + editedCabalFile = "08961ibwiqks8qw5cwpkzpz3acrlrd48l2sl1qny96gycaslzrps"; + libraryHaskellDepends = [ base groups semigroupoids semigroups ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Various extra monoid-related definitions and utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "monoid-extras_0_4_4" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.4.4"; + sha256 = "1ik88ilg5zjrajqllg3zjp92bz8mhvrc8q9mx6llkwry5k3avsfx"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-owns" = callPackage @@ -142173,38 +143540,6 @@ self: { "morte" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, http-client, http-client-tls - , microlens, microlens-mtl, mtl, optparse-applicative, pipes - , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit - , tasty-quickcheck, text, text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.16"; - sha256 = "1k7j9dvl3m8l77r9m8d02nm9dxkr17y57d58x49icvk7bq0ij29x"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page optparse-applicative text text-format - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_18" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, formatting, http-client , http-client-tls, microlens, microlens-mtl, mtl , optparse-applicative, pipes, QuickCheck, system-fileio @@ -142234,7 +143569,6 @@ self: { benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -142346,22 +143680,23 @@ self: { }) {}; "movie-monad" = callPackage - ({ mkDerivation, base, filepath, gi-gdk, gi-gdkpixbuf, gi-glib - , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi - , haskell-gi-base, MissingH, network-uri, process, system-fileio - , system-filepath, text, time + ({ mkDerivation, base, bytestring, filepath, gi-gdk, gi-gdkpixbuf + , gi-glib, gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi + , haskell-gi-base, haskell-gi-overloading, MissingH, network-uri + , process, system-fileio, system-filepath, text, time }: mkDerivation { pname = "movie-monad"; - version = "0.0.4.0"; - sha256 = "0wdnf8gm3h7ykdmnwc7jw1y0rs27izzh1kz2gkgi3g2dyllh7sq3"; + version = "0.0.5.0"; + sha256 = "02hqkgz3855d3lgvyq6nyqm70x5c0ycfzvw6pxndhv8ly5i61nby"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gst - gi-gstvideo gi-gtk haskell-gi haskell-gi-base MissingH network-uri - process system-fileio system-filepath text time + base bytestring filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gst gi-gstvideo gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading MissingH network-uri process system-fileio + system-filepath text time ]; homepage = "https://github.com/lettier/movie-monad"; description = "Plays videos using GStreamer and GTK+"; @@ -144508,22 +145843,6 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.4"; - sha256 = "13k6vdmkdbhjlgfsjw6r2smrxhkbiqkw9rdnfx554lc843dpb1lv"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; - testHaskellDepends = [ base bytestring hspec ]; - homepage = "https://github.com/paul-rouse/mysql"; - description = "A low-level MySQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; - - "mysql_0_1_5" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql - }: - mkDerivation { - pname = "mysql"; version = "0.1.5"; sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9"; setupHaskellDepends = [ base Cabal ]; @@ -144533,7 +145852,6 @@ self: { homepage = "https://github.com/paul-rouse/mysql"; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mysql;}; "mysql-effect" = callPackage @@ -144619,25 +145937,6 @@ self: { "mysql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light - , text, time - }: - mkDerivation { - pname = "mysql-simple"; - version = "0.4.4"; - sha256 = "1rrwhc9szdsn1wm5y510kyj0cfhavw01j61vywf96yw57132y75m"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder blaze-textual - bytestring mysql old-locale pcre-light text time - ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/paul-rouse/mysql-simple"; - description = "A mid-level MySQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mysql-simple_0_4_5" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, hspec, mysql, old-locale , pcre-light, text, time }: @@ -144653,7 +145952,6 @@ self: { homepage = "https://github.com/paul-rouse/mysql-simple"; description = "A mid-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple-quasi" = callPackage @@ -145839,25 +147137,25 @@ self: { ({ mkDerivation, attoparsec, base, errors, exceptions , extractable-singleton, hashable, hspec, hspec-wai, http-types , monad-control-aligned, mtl, poly-arity, pred-trie, regex-compat - , tasty, tasty-hspec, text, tries, unordered-containers + , tasty, tasty-hspec, text, tries, unordered-containers, wai , wai-middleware-content-type, wai-middleware-verbs , wai-transformers }: mkDerivation { pname = "nested-routes"; - version = "9.0.0"; - sha256 = "1vdmwkr69n7ybwamfazy2p65r9s2fqbgvfy31wxiqyn6phg6r57v"; + version = "9.0.0.1"; + sha256 = "1y9562nq2hylcd0ahc28cfb9q1bsl4dg8ilrdsy64ls776dkj951"; libraryHaskellDepends = [ attoparsec base errors exceptions extractable-singleton hashable monad-control-aligned mtl poly-arity pred-trie regex-compat text - tries unordered-containers wai-middleware-content-type + tries unordered-containers wai wai-middleware-content-type wai-middleware-verbs wai-transformers ]; testHaskellDepends = [ attoparsec base errors exceptions extractable-singleton hashable hspec hspec-wai http-types monad-control-aligned mtl poly-arity pred-trie regex-compat tasty tasty-hspec text tries - unordered-containers wai-middleware-content-type + unordered-containers wai wai-middleware-content-type wai-middleware-verbs wai-transformers ]; homepage = "https://github.com/athanclark/nested-routes#readme"; @@ -146010,8 +147308,8 @@ self: { ({ mkDerivation, base, carray, netlib-ffi, transformers }: mkDerivation { pname = "netlib-carray"; - version = "0.0.1"; - sha256 = "061cn2k8in7j0izbar7xj86ksls8a1zxyf3ngkg19dwwjwfvn4yh"; + version = "0.0.1.1"; + sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv"; libraryHaskellDepends = [ base carray netlib-ffi transformers ]; homepage = "http://hub.darcs.net/thielema/netlib-carray/"; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; @@ -146030,6 +147328,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "netlib-ffi_0_1" = callPackage + ({ mkDerivation, base, storable-complex, transformers }: + mkDerivation { + pname = "netlib-ffi"; + version = "0.1"; + sha256 = "0ckwa5r8fx2j7qb5phy6gm3xbg9crr9amglcicdxgnzgjd8aap2h"; + libraryHaskellDepends = [ base storable-complex transformers ]; + homepage = "http://hub.darcs.net/thielema/netlib-ffi/"; + description = "Helper modules for FFI to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netlines" = callPackage ({ mkDerivation, base, bytestring, contstuff, enumerator, HTF , random, text, time @@ -146083,8 +147394,8 @@ self: { ({ mkDerivation, base, netlist, pretty }: mkDerivation { pname = "netlist-to-vhdl"; - version = "0.3.2"; - sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61"; + version = "0.3.3"; + sha256 = "1f62l4i1l1z47gbrv49xx5y78ykcf6iq6bish3sx5fw46mhcr1j4"; libraryHaskellDepends = [ base netlist pretty ]; description = "Convert a Netlist AST to VHDL"; license = stdenv.lib.licenses.bsd3; @@ -146266,8 +147577,8 @@ self: { }: mkDerivation { pname = "netwire"; - version = "5.0.2"; - sha256 = "10yd28himql3gkilxzwky3d87k2nva43vmb7s5ayaqicchchyyad"; + version = "5.0.3"; + sha256 = "0bi2xyipz11vsai4wghdrh5yywzl0bkinfpmh0qdp77y7qlygpgi"; libraryHaskellDepends = [ base containers deepseq parallel profunctors random semigroups time transformers @@ -146306,6 +147617,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "netwire-input-glfw_0_0_10" = callPackage + ({ mkDerivation, base, containers, deepseq, GLFW-b, mtl + , netwire-input, stm + }: + mkDerivation { + pname = "netwire-input-glfw"; + version = "0.0.10"; + sha256 = "1r186xwr5lycs0snr8amvyxvbq2l5jd9p20v8n12zyjm60kmi90y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deepseq GLFW-b mtl netwire-input stm + ]; + homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; + description = "GLFW instance of netwire-input"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netwire-input-javascript" = callPackage ({ mkDerivation, base, containers, ghcjs-base, netwire , netwire-input, transformers @@ -146365,18 +147695,13 @@ self: { }) {}; "network" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, HUnit - , test-framework, test-framework-hunit, unix - }: + ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }: mkDerivation { pname = "network"; - version = "2.6.3.4"; - sha256 = "1yswp78fg7i1w1inn6p07vhz7lmfs33niavxhq60z6yv0qx2c3dw"; + version = "2.6.3.5"; + sha256 = "0h84pv672psxhh5ls407w175cik0gbyx39zynzmw991hr7jgc64s"; libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring directory doctest HUnit test-framework - test-framework-hunit - ]; + testHaskellDepends = [ base bytestring doctest hspec HUnit ]; homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; @@ -146463,8 +147788,8 @@ self: { }: mkDerivation { pname = "network-api-support"; - version = "0.3.2"; - sha256 = "1wzigwxdql9v6m9kwvnlgaachkr0rk9ldghnazrkkxba8di5kpsi"; + version = "0.3.3"; + sha256 = "1dp9fp907sc1r0mshby18vlbkji9bggikbycjbdlb6mzg7mjmiav"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls @@ -146495,7 +147820,7 @@ self: { homepage = "https://github.com/alunduil/network-arbitrary"; description = "Arbitrary Instances for Network Types"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ alunduil ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-attoparsec" = callPackage @@ -146754,8 +148079,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-info"; - version = "0.2.0.9"; - sha256 = "0rmajccwhkf0p4inb8jjj0dzsksgn663w90km00xvf4mq3pkjab3"; + version = "0.2.0.10"; + sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; @@ -147274,7 +148599,7 @@ self: { homepage = "https://github.com/alunduil/network-uri-json"; description = "FromJSON and ToJSON Instances for Network.URI"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ alunduil ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-uri-static" = callPackage @@ -147524,18 +148849,19 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit - , semigroups, transformers + ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups + , transformers }: mkDerivation { pname = "newtype-generics"; - version = "0.5.2.2"; - sha256 = "1hjw9w0hrjvf9akspgjcwidicviflf0ba3jg91dhg9n8cf9y82i9"; + version = "0.5.3"; + sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj"; libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec HUnit ]; + testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion semigroups ]; - description = "A typeclass and set of functions for working with newtypes, with generics support"; + homepage = "http://github.com/sjakobi/bsb-http-chunked"; + description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -147648,8 +148974,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.3.0"; - sha256 = "1x4na14387sr26lnjmxdnk8gl41pfi4xq3r5a37yl45l4gdhr5hs"; + version = "1.4.0"; + sha256 = "16gs4wmv8qd8zlm2clsd2h4gcj8fsad6s926nspnbyznbmsbg6p2"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -148135,6 +149461,21 @@ self: { broken = true; }) {Nmis = null;}; + "nn" = callPackage + ({ mkDerivation, base, random, split, tasty, tasty-hspec + , tasty-quickcheck + }: + mkDerivation { + pname = "nn"; + version = "0.2.0"; + sha256 = "1jl267495x7rc34x35dzrwb05z57w1w97vzgj774ld6z2w1yri7l"; + libraryHaskellDepends = [ base random split ]; + testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; + homepage = "https://github.com/saschagrunert/nn#readme"; + description = "A tiny neural network"; + license = stdenv.lib.licenses.mit; + }) {}; + "nntp" = callPackage ({ mkDerivation, base, bytestring, monad-loops, mtl, network , old-locale, parsec, time @@ -149277,52 +150618,76 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask_0_2_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "numhask"; + version = "0.2.0.0"; + sha256 = "1n465rjgmpwjixnnwn054323rg55abbj98brqzw4ff17hrvy97g0"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/tonyday567/numhask#readme"; + description = "numeric classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, dimensions - , distributive, doctest, ghc-typelits-natnormalise, numhask - , protolude, QuickCheck, singletons, tasty, tasty-quickcheck - , typelits-witnesses, vector + , distributive, doctest, numhask-prelude, protolude, QuickCheck + , singletons, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "numhask-array"; - version = "0.1.1.0"; - sha256 = "0qdlc8ipjb6p5hcp7kvjspa3yjjdsjah1k5c35w6njy0ld9rdi54"; + version = "0.2.0.1"; + sha256 = "05y41d8xnrzgrb5w6skkac5hr6c7npwzmryx308cd0lp4nbfmvql"; libraryHaskellDepends = [ - adjunctions base deepseq dimensions distributive - ghc-typelits-natnormalise numhask protolude QuickCheck singletons - typelits-witnesses vector + adjunctions base deepseq dimensions distributive numhask-prelude + protolude QuickCheck singletons vector ]; testHaskellDepends = [ - base doctest numhask QuickCheck tasty tasty-quickcheck + base doctest numhask-prelude tasty tasty-quickcheck ]; homepage = "https://github.com/tonyday567/numhask-array#readme"; - description = "See readme.md"; + description = "n-dimensional arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-histogram" = callPackage - ({ mkDerivation, base, containers, doctest, foldl, HUnit, numhask - , numhask-range, protolude, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tdigest + ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude + , numhask-range, protolude, tasty, tdigest }: mkDerivation { pname = "numhask-histogram"; - version = "0.0.1.0"; - sha256 = "1s8z2fwgrnsaq0w9zda5rpf9dcrd51dqaq118r6pi2r7y1vwzd6k"; + version = "0.1.1.0"; + sha256 = "18xnkwmf7bwnj2ldj20afg38ykpzdnpg773pgj9af9yzk40vpd28"; libraryHaskellDepends = [ - base containers foldl numhask numhask-range protolude tdigest - ]; - testHaskellDepends = [ - base doctest HUnit protolude QuickCheck tasty tasty-hunit - tasty-quickcheck + base containers foldl numhask-prelude numhask-range tdigest ]; + testHaskellDepends = [ base doctest protolude tasty ]; homepage = "https://github.com/tonyday567/numhask-histogram#readme"; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask-prelude" = callPackage + ({ mkDerivation, base, doctest, numhask, protolude, QuickCheck + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "numhask-prelude"; + version = "0.0.3.0"; + sha256 = "128hnq32826d2rmrlik4p0c72jnsy586gz9lgfk7hnx0fqpr94gy"; + libraryHaskellDepends = [ + base numhask protolude QuickCheck tasty tasty-quickcheck + ]; + testHaskellDepends = [ base doctest tasty ]; + homepage = "https://github.com/tonyday567/numhask#readme"; + description = "A numeric prelude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numhask-range" = callPackage ({ mkDerivation, adjunctions, base, distributive, doctest, numhask , protolude, QuickCheck, semigroupoids, tasty @@ -149342,6 +150707,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask-range_0_2_1_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest + , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty + }: + mkDerivation { + pname = "numhask-range"; + version = "0.2.1.0"; + sha256 = "1i6kpx0jdr0q2lp19m0aqfd73wsi1dm6qhl1w9x8wp4px12j4caz"; + libraryHaskellDepends = [ + adjunctions base distributive numhask-prelude protolude QuickCheck + semigroupoids + ]; + testHaskellDepends = [ base doctest numhask-prelude tasty ]; + homepage = "https://github.com/tonyday567/numhask-range#readme"; + description = "Numbers that are range representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nums" = callPackage ({ mkDerivation }: mkDerivation { @@ -149411,38 +150795,39 @@ self: { }) {}; "nvim-hs" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal - , cereal-conduit, conduit, conduit-extra, containers, data-default - , deepseq, directory, dyre, exceptions, filepath, foreign-store - , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec - , messagepack, monad-control, mtl, network, optparse-applicative - , process, QuickCheck, resourcet, setenv, stm, streaming-commons - , template-haskell, text, time, time-locale-compat, transformers - , transformers-base, utf8-string + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, directory, dyre, filepath + , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec + , messagepack, mtl, network, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck, resourcet + , setenv, stm, streaming-commons, template-haskell, text, time + , time-locale-compat, transformers, transformers-base, unliftio + , unliftio-core, utf8-string, void }: mkDerivation { pname = "nvim-hs"; - version = "0.2.4"; - sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5"; + version = "1.0.0.1"; + sha256 = "05kqrnzxhydns3iyqk1rhdgx3cyqgcskhfwa1d87hcyx0p4w51pw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring cereal cereal-conduit conduit - conduit-extra containers data-default deepseq directory dyre - exceptions filepath foreign-store hslogger lifted-base megaparsec - messagepack monad-control mtl network optparse-applicative process - resourcet setenv stm streaming-commons template-haskell text time - time-locale-compat transformers transformers-base utf8-string + base bytestring cereal cereal-conduit conduit containers + data-default deepseq directory dyre filepath foreign-store hslogger + megaparsec messagepack mtl network optparse-applicative + prettyprinter prettyprinter-ansi-terminal process resourcet setenv + stm streaming-commons template-haskell text time time-locale-compat + transformers transformers-base unliftio unliftio-core utf8-string + void ]; executableHaskellDepends = [ base data-default ]; testHaskellDepends = [ - ansi-wl-pprint base bytestring cereal cereal-conduit conduit - conduit-extra containers data-default directory dyre exceptions - filepath foreign-store hslogger hspec hspec-discover HUnit - lifted-base megaparsec messagepack mtl network optparse-applicative + base bytestring cereal cereal-conduit conduit containers + data-default directory dyre filepath foreign-store hslogger hspec + hspec-discover HUnit megaparsec messagepack mtl network + optparse-applicative prettyprinter prettyprinter-ansi-terminal process QuickCheck resourcet setenv stm streaming-commons template-haskell text time time-locale-compat transformers - transformers-base utf8-string + transformers-base unliftio unliftio-core utf8-string ]; homepage = "https://github.com/neovimhaskell/nvim-hs"; description = "Haskell plugin backend for neovim"; @@ -149451,23 +150836,24 @@ self: { }) {}; "nvim-hs-contrib" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default - , directory, exceptions, filepath, hspec, hspec-discover - , messagepack, mtl, nvim-hs, QuickCheck, text, time, utf8-string - , yaml + ({ mkDerivation, base, bytestring, data-default, directory + , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs + , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, text + , time, utf8-string, yaml }: mkDerivation { pname = "nvim-hs-contrib"; - version = "0.2.0"; - sha256 = "05999ma4whng6brn37bw2wbw7yf2hq9yw8sr12kwykdygxvykrbf"; + version = "1.0.0.0"; + sha256 = "150kg8gkai4cz7yv42vgn3b6rl6p44vfksq897kjaa3b12yjwd5x"; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring data-default directory exceptions - filepath messagepack mtl nvim-hs text time utf8-string yaml + base bytestring data-default directory filepath messagepack mtl + nvim-hs prettyprinter prettyprinter-ansi-terminal text time + utf8-string yaml ]; testHaskellDepends = [ base hspec hspec-discover nvim-hs QuickCheck ]; - homepage = "https://github.com/neovimhaskell/nvim-hs"; + homepage = "https://github.com/neovimhaskell/nvim-hs-contrib"; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -149475,15 +150861,16 @@ self: { "nvim-hs-ghcid" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers, yaml + , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers + , unliftio, yaml }: mkDerivation { pname = "nvim-hs-ghcid"; - version = "0.2.0"; - sha256 = "108fi3pnsc0yj5kmm0awqr7f3xqhyxg1yg29p2kw6bk8vvwjdlvf"; + version = "1.0.0.0"; + sha256 = "06yz73sx2z86dm1yhs3pqpi8g88157885fpm8hd6gkl2q4pjcwc8"; libraryHaskellDepends = [ base bytestring containers directory filepath ghcid nvim-hs - nvim-hs-contrib resourcet transformers yaml + nvim-hs-contrib resourcet transformers unliftio yaml ]; homepage = "https://github.com/saep/nvim-hs-ghcid"; description = "Neovim plugin that runs ghcid to update the quickfix list"; @@ -149611,6 +150998,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "oasis-xrd" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , text, time, uri-bytestring, xml-conduit, xml-conduit-writer + }: + mkDerivation { + pname = "oasis-xrd"; + version = "1.0"; + sha256 = "105m258yqfdmp1n7gd824gsry07xqlhfnpla2kb7sn36nckqr3a0"; + revision = "1"; + editedCabalFile = "1jwvncyyn8njzhjdgqwakqfddp34h26abnhypzbdsgn4nyxad1qs"; + libraryHaskellDepends = [ + aeson base bytestring containers text time uri-bytestring + xml-conduit xml-conduit-writer + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers text time + uri-bytestring xml-conduit xml-conduit-writer + ]; + homepage = "https://gitlab.com/dpwiz/oasis-xrd"; + description = "Extensible Resource Descriptor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oauth10a" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash, entropy, http-types, time, transformers @@ -149840,13 +151250,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ochintin-daicho_0_1_0_2" = callPackage - ({ mkDerivation, base, bookkeeping, doctest, Glob, text }: + "ochintin-daicho_0_3_1_1" = callPackage + ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable + , text, transaction + }: mkDerivation { pname = "ochintin-daicho"; - version = "0.1.0.2"; - sha256 = "1j44dbp0fdsbm117rgwfsg2n3hbl782nz4484p5fif489yqv62vp"; - libraryHaskellDepends = [ base bookkeeping text ]; + version = "0.3.1.1"; + sha256 = "06xdr5763xipzpl83190p8ha1rm9akqa49dh0588ibbhk2zbk0ln"; + libraryHaskellDepends = [ + base bookkeeping mono-traversable text transaction + ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme"; description = "A module to manage payroll books for Japanese companies"; @@ -149954,15 +151368,33 @@ self: { inherit (pkgs.xorg) libXinerama; ovr = null; systemd = null;}; "odbc" = callPackage - ({ mkDerivation }: + ({ mkDerivation, async, base, bytestring, containers, deepseq + , formatting, hspec, optparse-applicative, QuickCheck, semigroups + , text, time, transformers, unixODBC, unliftio-core, weigh + }: mkDerivation { pname = "odbc"; - version = "0.0.0"; - sha256 = "1yyp21j0kmq7mc80z3vpmra16kbqb35pzblir1gppiz0wh1wmgpb"; - doHaddock = false; - description = "TBA"; + version = "0.0.4"; + sha256 = "1fh8yqdycna3if5dd55qc6hic70nwy71vjy2yflzvpjpqkdd8qz6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq formatting semigroups text + time transformers unliftio-core + ]; + librarySystemDepends = [ unixODBC ]; + executableHaskellDepends = [ + base bytestring optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck text time + ]; + benchmarkHaskellDepends = [ async base text weigh ]; + homepage = "https://github.com/fpco/odbc"; + description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; license = stdenv.lib.licenses.bsd3; - }) {}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unixODBC;}; "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text @@ -150537,6 +151969,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "online_0_2_3_0" = callPackage + ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude + , tasty, tdigest, vector, vector-algorithms + }: + mkDerivation { + pname = "online"; + version = "0.2.3.0"; + sha256 = "04yh51gdmb2nycsxjrfzkb07byxdmn1n9wrk7wv7nh3ki7jxi15d"; + libraryHaskellDepends = [ + base foldl numhask-prelude protolude tdigest vector + vector-algorithms + ]; + testHaskellDepends = [ base doctest protolude tasty ]; + homepage = "https://github.com/tonyday567/online#readme"; + description = "online statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "only" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -150596,37 +152047,10 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.0.0"; - sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q"; - revision = "2"; - editedCabalFile = "1zhb7i4za87ixxwwh792drvydr0ln9krwkml1mmdz38a9s0zyhn6"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant dotenv hspec hspec-discover - multiset postgresql-simple product-profunctors profunctors - QuickCheck semigroups text time transformers - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_6_1_0" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, semigroups, text - , time, time-locale-compat, transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; version = "0.6.1.0"; sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l"; + revision = "1"; + editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -150641,7 +152065,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -151136,23 +152559,24 @@ self: { }) {}; "openpgp-asciiarmor" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , cereal, HUnit, test-framework, test-framework-hunit + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, criterion, tasty, tasty-hunit }: mkDerivation { pname = "openpgp-asciiarmor"; - version = "0.1"; - sha256 = "1xrv0n7n1n8izvxvqm8wmj6mkn5l6wcq18bxs9zd1q5riynmmm2w"; + version = "0.1.1"; + sha256 = "01zna9zifixnzgalr3k21g9dv143cn49imawm4q9x37i2r9kybxr"; libraryHaskellDepends = [ - attoparsec base base64-bytestring bytestring cereal + attoparsec base base64-bytestring binary bytestring ]; testHaskellDepends = [ - attoparsec base base64-bytestring bytestring cereal HUnit - test-framework test-framework-hunit + attoparsec base base64-bytestring binary bytestring tasty + tasty-hunit ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "http://floss.scru.org/openpgp-asciiarmor"; description = "OpenPGP (RFC4880) ASCII Armor codec"; - license = "unknown"; + license = stdenv.lib.licenses.isc; }) {}; "openpgp-crypto-api" = callPackage @@ -152594,8 +154018,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; - version = "0.2.0"; - sha256 = "0frxr78vkwm0yjxz1rq71h8b01krdidi19ld1yragkfk54krcz1n"; + version = "0.3.0"; + sha256 = "02ixa91wp0jxdc046gi5qxyyw332znkgknfz5chf4j3ydn7qjlha"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -152839,6 +154263,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pads-haskell" = callPackage + ({ mkDerivation, base, byteorder, bytestring, Cabal, containers + , directory, Glob, haskell-src, haskell-src-meta, HUnit + , mainland-pretty, mtl, normaldistribution, old-locale, parsec + , QuickCheck, random, regex-posix, syb, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , th-lift, time, transformers + }: + mkDerivation { + pname = "pads-haskell"; + version = "0.0.0.1"; + sha256 = "1glf9zfzl8lg6hvqzh76y7kpi1d8jhxgxplnkzz4pdzrh1dfzm9a"; + revision = "1"; + editedCabalFile = "1nfh2i2g4xzqr534hkwa7gygkgsdvyjk4g075n78dp6r48zynbz6"; + libraryHaskellDepends = [ + base byteorder bytestring containers Glob haskell-src + haskell-src-meta HUnit mainland-pretty normaldistribution + old-locale parsec random regex-posix syb template-haskell th-lift + time transformers + ]; + testHaskellDepends = [ + base byteorder bytestring Cabal containers directory Glob + haskell-src haskell-src-meta HUnit mainland-pretty mtl old-locale + parsec QuickCheck regex-posix syb template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 th-lift time + transformers + ]; + homepage = "http://www.padsproj.org"; + description = "PADS data description language for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pagarme" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, lens, text , wreq @@ -153115,41 +154571,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.14.1.5"; - sha256 = "1jp2pzx2avvcngg6krygsiwszq1nbns5p2bz1v1mlgm2mb6szqi9"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_14_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat , bytestring, Cabal, containers, data-default, directory, filepath , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec @@ -153182,7 +154603,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -153211,8 +154631,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.0.3"; - sha256 = "1w24s76w5jj6nngq0q13m7szqs2d5jc70gm94n37pwvxgm4kabrc"; + version = "0.3.1.0"; + sha256 = "11lvsr30f0x2vsqnwr4s3j9v3n4zxx5a83qc95j5c1xijlrzcc3k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -153494,6 +154914,8 @@ self: { pname = "pandoc-types"; version = "1.17.4.2"; sha256 = "1jiy4siyfcf4z0m0kn0z58cbrsvggavlxljrcb4srwblih55xqap"; + revision = "1"; + editedCabalFile = "0izgzjfl7l4fb6xd5iqcy5zca4m1vzvr5xqgccw45vkm8q3arqnf"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -153718,8 +155140,8 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "papa-base-export"; - version = "0.3.1"; - sha256 = "13gd3ldpiwmms3di80smk68x4mf9nigy0irz506cayd9bwqpw3jv"; + version = "0.4"; + sha256 = "120b3ks9h3m9w6z365hmqrcp349kh3w8ii4kgki1zxjhh9z05mnm"; libraryHaskellDepends = [ base semigroups ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; @@ -155270,6 +156692,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path-extra_0_1_1" = callPackage + ({ mkDerivation, base, path }: + mkDerivation { + pname = "path-extra"; + version = "0.1.1"; + sha256 = "0dyhazqz8gz6fk79v76j9kw7bj001njdvc0b3wpl6an3dqw8hy9j"; + libraryHaskellDepends = [ base path ]; + homepage = "https://github.com/athanclark/path-extra#readme"; + description = "Some extensions to Chris Done's path library, for use with urlpath and attoparsec-uri"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-io" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat @@ -156460,6 +157895,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perf_0_4_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, doctest, foldl, rdtsc + , text, time, transformers + }: + mkDerivation { + pname = "perf"; + version = "0.4.0.1"; + sha256 = "1am2wzj43gi0naz5mwpvja9i005g05d6gpkqw0qvdy63mddz9b96"; + libraryHaskellDepends = [ + base containers deepseq foldl rdtsc text time transformers + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/tonyday567/perf#readme"; + description = "Low-level run time measurement"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "perfect-hash-generator" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-ordlist , directory, filepath, hashable, HUnit, optparse-applicative @@ -156616,8 +158069,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.6.0.2"; - sha256 = "1sj2izz8ppam28qcja02jj6fx7khdjmnr4xn2yglbxyzs91fjg44"; + version = "0.6.0.3"; + sha256 = "12arj395b1famyy0hxp394ci2y3mkly68i82a26p67g5dpmdm466"; libraryHaskellDepends = [ array base containers dlist names-th product-isomorphic template-haskell th-data-compat transformers @@ -157069,13 +158522,14 @@ self: { "persistent-sqlite_2_6_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale - , persistent, persistent-template, resource-pool, resourcet + , persistent, persistent-template, resource-pool, resourcet, sqlite , temporary, text, time, transformers, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; version = "2.6.4"; sha256 = "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm"; + configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157083,6 +158537,7 @@ self: { monad-logger old-locale persistent resource-pool resourcet text time transformers unordered-containers ]; + librarySystemDepends = [ sqlite ]; testHaskellDepends = [ base hspec persistent persistent-template temporary text time transformers @@ -157092,18 +158547,19 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; + }) {inherit (pkgs) sqlite;}; "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, temporary, text - , time, transformers, unliftio-core, unordered-containers + , persistent-template, resource-pool, resourcet, sqlite, temporary + , text, time, transformers, unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; version = "2.8.1.2"; sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g"; + configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157111,6 +158567,7 @@ self: { old-locale persistent resource-pool resourcet text time transformers unliftio-core unordered-containers ]; + librarySystemDepends = [ sqlite ]; testHaskellDepends = [ base hspec persistent persistent-template temporary text time transformers @@ -157119,7 +158576,7 @@ self: { description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; + }) {inherit (pkgs) sqlite;}; "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers @@ -157497,6 +158954,8 @@ self: { pname = "pgdl"; version = "10.10"; sha256 = "0wqj7i4shdcy80aiib0dkp3y6ccilqq4g3p8bvndh4vl3cyd2pwv"; + revision = "1"; + editedCabalFile = "17d525qv26y15zbc7kl0vdxfi7n1v1g8v9r821a96dd49zkccsck"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158114,6 +159573,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pig" = callPackage + ({ mkDerivation, base, containers, random, random-shuffle }: + mkDerivation { + pname = "pig"; + version = "0.0.1"; + sha256 = "0fh8lv85h2w6gs7zv1bqb4gc4id84c3vp3ivdrd9cvnxksr50ffr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers random random-shuffle ]; + executableHaskellDepends = [ + base containers random random-shuffle + ]; + description = "dice game"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "piki" = callPackage ({ mkDerivation, base, mtl, parsec, text }: mkDerivation { @@ -158622,20 +160097,6 @@ self: { }) {}; "pipes-concurrency" = callPackage - ({ mkDerivation, async, base, contravariant, pipes, stm, void }: - mkDerivation { - pname = "pipes-concurrency"; - version = "2.0.9"; - sha256 = "1br0cssp4rdfh6lhvjql9ppjvcn0v6kpg1h1f1hi8vqb0c87nvb4"; - libraryHaskellDepends = [ - async base contravariant pipes stm void - ]; - testHaskellDepends = [ async base pipes stm ]; - description = "Concurrency for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-concurrency_2_0_10" = callPackage ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm , void }: @@ -158649,7 +160110,6 @@ self: { testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-conduit" = callPackage @@ -158714,7 +160174,7 @@ self: { ]; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jb55 ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-errors" = callPackage @@ -159294,16 +160754,17 @@ self: { ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest , foldl, free, microlens, pipes, pipes-bytestring , pipes-concurrency, pipes-group, pipes-parse, pipes-safe - , pipes-text, tasty, tasty-hunit, text, transformers, void + , pipes-text, streaming, tasty, tasty-hunit, text, transformers + , void }: mkDerivation { pname = "pipes-transduce"; - version = "0.4.1"; - sha256 = "10lf6fnnq1zf9v04l00f1nd4s6qq6a0pcdl72vxczmj6rn3c0kgq"; + version = "0.4.3.2"; + sha256 = "0q4xc2r0yzyj6gpg16z9scdxm0a3fjzsm1r6qihkr2zks9sac36x"; libraryHaskellDepends = [ base bifunctors bytestring conceit foldl free microlens pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse - pipes-safe pipes-text text transformers void + pipes-safe pipes-text streaming text transformers void ]; testHaskellDepends = [ base doctest foldl free pipes tasty tasty-hunit text @@ -159766,6 +161227,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plex" = callPackage + ({ mkDerivation, async, base, bytestring, deepseq, hspec + , QuickCheck, unix + }: + mkDerivation { + pname = "plex"; + version = "0.2.0.0"; + sha256 = "0y0a3d30k4d3111smfidzzv1z7cq0i47wxvyh9iwbnn223s3446y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ async base bytestring deepseq unix ]; + testHaskellDepends = [ + async base bytestring deepseq hspec QuickCheck unix + ]; + homepage = "https://github.com/phlummox/hs-plex#readme"; + description = "run a subprocess, combining stdout and stderr"; + license = stdenv.lib.licenses.mit; + }) {}; + "plist" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, hxt }: mkDerivation { @@ -160018,8 +161498,8 @@ self: { }: mkDerivation { pname = "ploton"; - version = "1.1.2.0"; - sha256 = "11a4kij1bz38bklaanlsyzwdvps7v9c0c8w4yblmxxdwxwdfvi6g"; + version = "1.1.3.0"; + sha256 = "1bq2qnzlms6j6hl7d728h5mc672h0lpbxcxfh2bz327nhhqid3hn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160134,6 +161614,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plural" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec }: + mkDerivation { + pname = "plural"; + version = "0.0.1"; + sha256 = "15hbvr565qvm608241xnx8sicspl2200jqbxd138a14qfi5aplc0"; + libraryHaskellDepends = [ base bytestring containers ]; + testHaskellDepends = [ base hspec ]; + description = "Pluralize"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ply-loader" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, directory , filepath, lens, linear, parallel-io, transformers, vector @@ -160355,8 +161847,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.4"; - sha256 = "1llqlxcgafbgzb84gzgwldb0lsa9nnqsn3irbrlljralx2zfhxk3"; + version = "1.1.1.5"; + sha256 = "0wrsk5l83dzq0pv0dy24gil0mipw1yalalivjq92qx0dv68z15ja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160370,7 +161862,7 @@ self: { transformers ]; description = "Tool for refactoring expressions into pointfree form"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -160837,6 +162329,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pomaps_0_0_0_4" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, criterion + , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty + , tasty-hspec, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pomaps"; + version = "0.0.0.4"; + sha256 = "0mjfzj2j8b6337ivvnry7ylrw5g1ajxpqqzar1wmscm73ybr0xbn"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim lattices + ]; + testHaskellDepends = [ + base ChasingBottoms containers doctest Glob lattices tasty + tasty-hspec tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lattices random vector + ]; + homepage = "https://github.com/sgraf812/pomaps#readme"; + description = "Maps and sets of partial orders"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pomodoro" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath , heredoc, libnotify, network, process, time, unix, wx, wxcore @@ -161092,8 +162609,8 @@ self: { }: mkDerivation { pname = "poppler"; - version = "0.14.1"; - sha256 = "1djx8qj68md11kdgcljd7mq3bidw6ynh9mwfxm9bj7kr2h57lmsv"; + version = "0.14.2"; + sha256 = "17q8br6w9v7vcz8ricvlrhhaw0ngka9w0i0jazr7m1j0dv1m4xsf"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -161318,8 +162835,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.1.3"; - sha256 = "1z5brmqraz2smpgbp3ldd9da0cz78glc8bfc5l6842qgc588iljp"; + version = "0.2.1.5"; + sha256 = "1pyi25gz2r3pc64f1i5awyp3mg5w74ik9wh5s9i9hs7bfmkjk1as"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix @@ -161672,7 +163189,7 @@ self: { "postgresql-query" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , containers, data-default, derive, either, exceptions, file-embed + , containers, data-default, derive, exceptions, file-embed , haskell-src-meta, hreader, hset, inflections, monad-control , monad-logger, mtl, postgresql-simple, QuickCheck , quickcheck-assertions, quickcheck-instances, resource-pool @@ -161682,12 +163199,12 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.3.0"; - sha256 = "0ilny7vj5ch77kic1bmpm160phv3yxm1cd3ksj6j8gc2nvaysrr8"; + version = "3.4.0"; + sha256 = "1f69rjwhww6knivk8gkx82b8xp8hkg0mhb9z2lm69vv3k5fxv8mb"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers - data-default either exceptions file-embed haskell-src-meta hreader - hset inflections monad-control monad-logger mtl postgresql-simple + data-default exceptions file-embed haskell-src-meta hreader hset + inflections monad-control monad-logger mtl postgresql-simple resource-pool semigroups template-haskell text th-lift th-lift-instances time transformers transformers-base transformers-compat type-fun @@ -161883,28 +163400,6 @@ self: { }: mkDerivation { pname = "postgresql-simple-url"; - version = "0.2.0.0"; - sha256 = "0k7anqkw9gn5mm3y93pzp8rqzlg1526pxikcllxcciyhgpz5mn7p"; - revision = "1"; - editedCabalFile = "1z9qk3kplc5y93h3xbb9gialhdmnblwrmf2943wkj70qg975hajb"; - libraryHaskellDepends = [ - base network-uri postgresql-simple split - ]; - testHaskellDepends = [ - base postgresql-simple tasty tasty-quickcheck - ]; - homepage = "https://github.com/futurice/postgresql-simple-url"; - description = "Parse postgres:// url into ConnectInfo"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "postgresql-simple-url_0_2_1_0" = callPackage - ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; libraryHaskellDepends = [ @@ -161957,8 +163452,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.5.2"; - sha256 = "0ws9xmh199jsvdmxjxkhm59j05ljfsrf16xchkbxqd8p1pg8786c"; + version = "0.5.3.0"; + sha256 = "0apq662lhkjc1xl4alpz20yz20x6mf3gz6li7wb86sp94441rh5k"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -162168,18 +163663,18 @@ self: { "potoki" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bytestring - , directory, foldl, hashable, potoki-core, profunctors, QuickCheck - , quickcheck-instances, random, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, unagi-chan + , directory, foldl, hashable, potoki-core, profunctors, ptr + , QuickCheck, quickcheck-instances, random, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan , unordered-containers, vector }: mkDerivation { pname = "potoki"; - version = "0.11.1"; - sha256 = "1xmxdlg213y1v09akc853zymbkxpg6pkfspwjb0g1kvnirjlj0rj"; + version = "0.11.2"; + sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable - potoki-core profunctors text transformers unagi-chan + potoki-core profunctors ptr text transformers unagi-chan unordered-containers vector ]; testHaskellDepends = [ @@ -162229,6 +163724,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki-hasql" = callPackage + ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core + , profunctors, text, vector + }: + mkDerivation { + pname = "potoki-hasql"; + version = "1.2"; + sha256 = "1viq19rycrm8zdwj3anqam45hlmdlh9wqji3xf120nk8ffqnwks1"; + libraryHaskellDepends = [ + base bytestring hasql potoki potoki-core profunctors text vector + ]; + homepage = "https://github.com/metrix-ai/potoki-hasql"; + description = "Integration of \"potoki\" and \"hasql\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "potrace" = callPackage ({ mkDerivation, base, bindings-potrace, bytestring, containers , data-default, JuicyPixels, vector @@ -162319,6 +163831,7 @@ self: { homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A distributed worker backend for powerqueu"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powerqueue-levelmem" = callPackage @@ -162524,23 +164037,20 @@ self: { "preamble" = callPackage ({ mkDerivation, aeson, base, basic-prelude, exceptions , fast-logger, lens, lifted-base, monad-control, monad-logger - , MonadRandom, mtl, network, resourcet, safe, shakers - , template-haskell, text, text-manipulate, time, transformers-base + , MonadRandom, mtl, network, resourcet, safe, template-haskell + , text, text-manipulate, time, transformers-base , unordered-containers, uuid }: mkDerivation { pname = "preamble"; - version = "0.0.59"; - sha256 = "0i9blxkdjm4fm288qr6isl3jyjrw6x6x58z6lvaj62xr3y4rqd43"; - isLibrary = true; - isExecutable = true; + version = "0.0.60"; + sha256 = "1ygpyaniv4f9ahmnrpkirhmfry40afqwaici4ksrnr3pz64fsll5"; libraryHaskellDepends = [ aeson base basic-prelude exceptions fast-logger lens lifted-base monad-control monad-logger MonadRandom mtl network resourcet safe template-haskell text text-manipulate time transformers-base unordered-containers uuid ]; - executableHaskellDepends = [ base shakers ]; homepage = "https://github.com/swift-nav/preamble"; description = "Yet another prelude"; license = stdenv.lib.licenses.mit; @@ -162655,6 +164165,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "predicate-class" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "predicate-class"; + version = "0.1.0.1"; + sha256 = "03rw51jpfcl827nrv1fxlghqwg0mk89l1rkqwd743lnsydwzi15h"; + libraryHaskellDepends = [ base ]; + description = "Helper class for passing context along a predicate value"; + license = stdenv.lib.licenses.mit; + }) {}; + "predicates" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -162729,8 +164250,8 @@ self: { ({ mkDerivation, base, hspec, regex-pcre-builtin }: mkDerivation { pname = "prefix-expression"; - version = "1.2.5"; - sha256 = "0z1s74iw87qkfaa7v8a3m91w2phmkp02yiz5xk8w2w4jz72x3x0b"; + version = "1.2.6"; + sha256 = "0brw6rrykfsg67ckcfs3d5x4n7m8c6vbnh9hqrk1iq9whlz6vpwy"; libraryHaskellDepends = [ base regex-pcre-builtin ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/VonFry/prefix-expression"; @@ -163406,18 +164927,6 @@ self: { }) {}; "prim-array" = callPackage - ({ mkDerivation, base, ghc-prim, primitive }: - mkDerivation { - pname = "prim-array"; - version = "0.2.1"; - sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf"; - libraryHaskellDepends = [ base ghc-prim primitive ]; - homepage = "https://github.com/andrewthad/prim-array#readme"; - description = "Primitive byte array with type variable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "prim-array_0_2_2" = callPackage ({ mkDerivation, base, ghc-prim, primitive, semigroups }: mkDerivation { pname = "prim-array"; @@ -163427,7 +164936,6 @@ self: { homepage = "https://github.com/andrewthad/prim-array#readme"; description = "Primitive byte array with type variable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prim-spoon" = callPackage @@ -163994,8 +165502,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.9.2.1"; - sha256 = "1p1nfb09sg9krwm7k6j8y5ggbc28yddlkf2yifs06iqfkcmbsbm6"; + version = "0.9.3.0"; + sha256 = "06x2xcjbhwhnwyml8kxqa5wl89mr9fbbpgplysd68d01yhm2dnmr"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -164184,6 +165692,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "product-profunctors_0_10_0_0" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, criterion + , deepseq, profunctors, tagged, template-haskell + }: + mkDerivation { + pname = "product-profunctors"; + version = "0.10.0.0"; + sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; + libraryHaskellDepends = [ + base bifunctors contravariant profunctors tagged template-haskell + ]; + testHaskellDepends = [ base profunctors ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "https://github.com/tomjaguarpaw/product-profunctors"; + description = "product-profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prof2dot" = callPackage ({ mkDerivation, base, containers, filepath, haskell98, parsec }: mkDerivation { @@ -164586,20 +166113,25 @@ self: { }) {}; "prologue" = callPackage - ({ mkDerivation, base, bifunctors, binary, cond, container, convert - , data-default, data-layer, errors, functor-utils, impossible, lens - , lens-utils, mtl, pretty-show, string-qq, text, transformers - , transformers-base, tuple, typelevel, vector + ({ mkDerivation, base, bifunctors, binary, comonad, cond, container + , convert, data-default, deepseq, deriving-compat, either, errors + , exceptions, functor-utils, ghc-prim, impossible, lens, lens-utils + , monoid, mtl, neat-interpolation, placeholders, pointed + , pretty-show, primitive, raw-strings-qq, recursion-schemes + , semigroupoids, string-qq, template-haskell, text, transformers + , transformers-base, typelevel, vector }: mkDerivation { pname = "prologue"; - version = "1.0.7"; - sha256 = "0nwk6m93c2mgzagzad1zkp5p6wnjdz668bw109vwwb0yi23c3s1p"; + version = "3.1.3"; + sha256 = "1nzm4hgjwpbxmvd1y1x58smxbk5ahfyygi22jwwyzqaknrgs5ara"; libraryHaskellDepends = [ - base bifunctors binary cond container convert data-default - data-layer errors functor-utils impossible lens lens-utils mtl - pretty-show string-qq text transformers transformers-base tuple - typelevel vector + base bifunctors binary comonad cond container convert data-default + deepseq deriving-compat either errors exceptions functor-utils + ghc-prim impossible lens lens-utils monoid mtl neat-interpolation + placeholders pointed pretty-show primitive raw-strings-qq + recursion-schemes semigroupoids string-qq template-haskell text + transformers transformers-base typelevel vector ]; homepage = "https://github.com/wdanilo/prologue"; description = "Better, more general Prelude exporting common utilities"; @@ -164734,6 +166266,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "proof-combinators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proof-combinators"; + version = "0.1.0.0"; + sha256 = "1wcm5wxzqm4lq340l3ga15cmjfabpf8njnvma3zagwyhmndabxfw"; + libraryHaskellDepends = [ base ]; + homepage = "http://nikivazou.github.io/"; + description = "Proof Combinators used in Liquid Haskell for Theorem Proving"; + license = stdenv.lib.licenses.mit; + }) {}; + "propane" = callPackage ({ mkDerivation, base, colour, containers, directory, filepath , repa, repa-devil, spawn @@ -164984,20 +166528,6 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.0.4"; - sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - homepage = "https://github.com/google/proto-lens"; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-optparse_0_1_1_0" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; version = "0.1.1.0"; sha256 = "0m32sb05mjajwli9ivrcblkxyy8hrgi8sm2zwjlrjai6aq0ckh1c"; libraryHaskellDepends = [ @@ -165006,7 +166536,6 @@ self: { homepage = "https://github.com/google/proto-lens#readme"; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-protobuf-types" = callPackage @@ -165230,18 +166759,16 @@ self: { "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text + , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text , transformers, transformers-compat }: mkDerivation { pname = "protolude"; - version = "0.2.1"; - sha256 = "1r2baxx6q4z75sswirlqsnyynk4i7amfmpzajggh31fbz13hxgxx"; - revision = "2"; - editedCabalFile = "03w9051jdbldbid9iyvibdhxdr73cawrvp9qdsc0czxix5ggfr75"; + version = "0.2.2"; + sha256 = "0z251xxv8rhds981acdf6dr34ac2kc062mbq9gl2nj339grhqpb8"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat safe stm text transformers transformers-compat + mtl mtl-compat stm text transformers transformers-compat ]; homepage = "https://github.com/sdiehl/protolude"; description = "A small prelude"; @@ -165518,8 +167045,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.2"; - sha256 = "0sa3akkhydyxr7caig8z6bjwiaarr171qazfbwm9kh8x1pdah5dv"; + version = "0.16.4"; + sha256 = "0na3by8mh43cd0xn1s1l7hi3mmm3damr9swgv6mzyg9lhilsndxb"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers @@ -165956,8 +167483,8 @@ self: { }: mkDerivation { pname = "pure-zlib"; - version = "0.6.1"; - sha256 = "0dqc35ca1668j2xfwmz8bqgbyld9gw3b0bld8s5gy6id7qfn7d26"; + version = "0.6.2"; + sha256 = "022ciqcsw39wi4r577q92s9awjwkc2da61ljqi8n5qsal83vhayh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166193,8 +167720,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.1.0.5"; - sha256 = "1gxna2ikq6q1gnarqwsy1xcbqz19j5015girn4mc52sai852ny5z"; + version = "0.1.0.7"; + sha256 = "1rkd7vr2l5136jv1afknqvg6lgvny5wdadh3fcy2k5phihmv9qfd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166311,8 +167838,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.3"; - sha256 = "0a8q16l6yv5azwbp4c8bmw78yd9kmkvyn6s5qsras4x9r1j4fq1m"; + version = "1.5.1.4"; + sha256 = "1h6dl0h9ybbnjqs834bd1n5w4cx0vdbmi52mqdk2y9y267qc9k4a"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -166802,24 +168329,22 @@ self: { }) {}; "qr-imager" = callPackage - ({ mkDerivation, aeson, base, bytestring, cryptonite, directory - , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels - , libqrencode, microlens, optparse-applicative, process, split - , vector + ({ mkDerivation, base, binary, bytestring, cryptonite, directory + , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode + , microlens, process, split, vector }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.6"; - sha256 = "0kc69xkqinvwk7hxblxkspnmj422c1pbdig9kvh3r8sj1in0lpmn"; + version = "2.0.0.0"; + sha256 = "01886bwkap8qk39iihlyrfa9g8cw6sicrynwk7r24nd5ib60csc3"; libraryHaskellDepends = [ - aeson base bytestring cryptonite directory either haskell-qrencode - jose-jwt JuicyPixels microlens optparse-applicative process split - vector + base binary bytestring cryptonite directory haskell-qrencode + jose-jwt JuicyPixels microlens process split vector ]; libraryPkgconfigDepends = [ libqrencode ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/vmchale/QRImager#readme"; - description = "Library to generate QR codes from bytestrings and objects"; + description = "Library to generate images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libqrencode;}; @@ -167158,8 +168683,8 @@ self: { }: mkDerivation { pname = "queryparser"; - version = "0.1.0.0"; - sha256 = "0ixx2ff7b3m7i8yp23x8nx0bpq92r387ddqag1i0026hljwpqchr"; + version = "0.1.0.1"; + sha256 = "1rz3v3cks7ys6313gispxbs8wzm8h5lccl27f9nhha7rpzl9qkcj"; libraryHaskellDepends = [ aeson base bytestring containers fixed-list hashable mtl parsec predicate-class pretty QuickCheck semigroups text @@ -167168,9 +168693,23 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Analysis and parsing library for SQL queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {predicate-class = null;}; + }) {}; + + "queryparser-demo" = callPackage + ({ mkDerivation, base, containers, pretty, queryparser + , queryparser-vertica, text, unordered-containers + }: + mkDerivation { + pname = "queryparser-demo"; + version = "0.1.0.0"; + sha256 = "1ndm7rdwnl8sgfi5058hh1l7xisxbvxl8ign91hwpkyqfmgx3ypi"; + libraryHaskellDepends = [ + base containers pretty queryparser queryparser-vertica text + unordered-containers + ]; + description = "Demo package containing queryparser examples"; + license = stdenv.lib.licenses.mit; + }) {}; "queryparser-hive" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, fixed-list @@ -167180,8 +168719,8 @@ self: { }: mkDerivation { pname = "queryparser-hive"; - version = "0.1.0.0"; - sha256 = "1lh8vj0wbgpsliq8dcfp6cibd0ka3gf8j0b132b1dy9hz8q3k99s"; + version = "0.1.0.1"; + sha256 = "0rj1v715wr3z76mp7i581bsjfvl9038kh4ccwlvjzi67afvds0b8"; libraryHaskellDepends = [ aeson base bytestring containers fixed-list hashable mtl parsec predicate-class pretty queryparser QuickCheck regex-tdfa semigroups @@ -167189,9 +168728,7 @@ self: { ]; description = "Parsing for Hive SQL queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {predicate-class = null;}; + }) {}; "queryparser-presto" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, fixed-list @@ -167201,8 +168738,8 @@ self: { }: mkDerivation { pname = "queryparser-presto"; - version = "0.1.0.0"; - sha256 = "10yh0j7xxmyxpfkixk8wjfl0sbb6y51kylvc6jnl3wclcyw31jvf"; + version = "0.1.0.1"; + sha256 = "0ibcbv76c1qv8w50v7gzq6vv3l9hbda5ir95k44rk1da6n53hj3b"; libraryHaskellDepends = [ aeson base bytestring containers fixed-list hashable mtl parsec predicate-class pretty queryparser QuickCheck regex-tdfa semigroups @@ -167210,9 +168747,7 @@ self: { ]; description = "Parsing for Presto SQL queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {predicate-class = null;}; + }) {}; "queryparser-vertica" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, fixed-list @@ -167222,8 +168757,8 @@ self: { }: mkDerivation { pname = "queryparser-vertica"; - version = "0.1.0.0"; - sha256 = "04g4ciqjkphyim0wjy3mn74fd8in38wkf3hyqsd0968syxdx6ykx"; + version = "0.1.0.1"; + sha256 = "0pkkgb3schbb25pw8k9varx3c0iwhfc47w4f2692y6s39vpm4d5z"; libraryHaskellDepends = [ aeson base bytestring containers fixed-list hashable mtl parsec predicate-class pretty queryparser QuickCheck regex-tdfa semigroups @@ -167231,9 +168766,7 @@ self: { ]; description = "Parsing for Vertica SQL queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {predicate-class = null;}; + }) {}; "querystring-pickle" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework @@ -167431,15 +168964,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_4_2" = callPackage + "quickcheck-classes_0_4_9" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, primitive , QuickCheck, semigroupoids, semigroups, tagged, transformers , vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.2"; - sha256 = "1whin052j39gdvqy1kvfrqiyfa76amclp6pschqd6xmmw2vly491"; + version = "0.4.9"; + sha256 = "1m5qszs50hjfycds84arfcfqj7z4l622479bd2w55vin49mp12pn"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups tagged transformers @@ -167474,6 +169007,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.18"; sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"; + revision = "1"; + editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific tagged text time @@ -167636,8 +169171,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.1.0.2"; - sha256 = "0p1ky7sj42crn9sas9d2cs5cwz03wsk20p55x2wgmlj5rmpr5mla"; + version = "0.1.0.3"; + sha256 = "08f87mqnm04sgi21q5snvr4li3zm4m86jydc3s4b71i9czy4q8wg"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -168204,18 +169739,14 @@ self: { }) {}; "radian" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , profunctors, QuickCheck, template-haskell - }: + ({ mkDerivation, base, HUnit, lens, profunctors }: mkDerivation { pname = "radian"; - version = "0.0.6"; - sha256 = "0p6caw8vnlzmamcka9wfsbgsfffgp2y6jjf5yyibvnb9av8zdnzp"; + version = "0.1"; + sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv"; libraryHaskellDepends = [ base profunctors ]; - testHaskellDepends = [ - base directory doctest filepath lens QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/radian"; + testHaskellDepends = [ base HUnit lens ]; + homepage = "https://github.com/qfpl/radian"; description = "Isomorphisms for measurements that use radians"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -168643,8 +170174,8 @@ self: { ({ mkDerivation, base, containers, microspec, tf-random, vector }: mkDerivation { pname = "rando"; - version = "0.0.0.2"; - sha256 = "0c12z3nd9g30chlz3ylcajxjbwm868nnsnlj6xc803gyficw2vdp"; + version = "0.0.0.4"; + sha256 = "1cvwmp4882xdavfzhg5hwssddg0wjgwh8jxpd3251plf96jz9f4f"; libraryHaskellDepends = [ base tf-random vector ]; testHaskellDepends = [ base containers microspec tf-random vector @@ -169421,25 +170952,6 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.2"; - sha256 = "0mwgnz8s0xpyggdxpakij66fmkdhvc6ra00h451pwy3f3m3g6vpy"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base filepath hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_1_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, text, uuid - }: - mkDerivation { - pname = "ratel"; version = "1.0.3"; sha256 = "1f49nrkvyms9a8q46dpjgcx3h51l1x4zlq6pxnw26bvf8xx0yj4h"; libraryHaskellDepends = [ @@ -169453,7 +170965,6 @@ self: { homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -169462,22 +170973,6 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.0.1"; - sha256 = "190kgqhvda3r5gqk0j8pzr6d123fl77dv3i1csglq22yzrwynkv3"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - homepage = "https://github.com/tfausak/ratel-wai#readme"; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel-wai_1_0_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; version = "1.0.2"; sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss"; libraryHaskellDepends = [ @@ -169486,7 +170981,6 @@ self: { homepage = "https://github.com/tfausak/ratel-wai#readme"; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-systems" = callPackage @@ -169520,8 +171014,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.0.6"; - sha256 = "0ph0kcf8rzn99j6c98786x0kdvbxpi355kqzxj0ia5748jk7ds0m"; + version = "4.0.7"; + sha256 = "1ry5z8dc8hqq5sqxjz23mssk4symnl98zrm77hnfsfapx7jg8b8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169828,22 +171322,22 @@ self: { }) {}; "rdf4h" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, directory, hashable, hgal, HTTP, HUnit, hxt, network - , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit - , tasty-quickcheck, text, text-binary, unordered-containers - , utf8-string + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , criterion, deepseq, directory, hashable, hgal, HTTP, HUnit, hxt + , mtl, network, network-uri, parsec, parsers, QuickCheck, safe + , tasty, tasty-hunit, tasty-quickcheck, text, text-binary + , unordered-containers, utf8-string }: mkDerivation { pname = "rdf4h"; - version = "3.0.1"; - sha256 = "0d45gwldxh1rai1jsvxnb794wdhvxqhjnnqfyh9ql0rzwcwzbv54"; + version = "3.0.2"; + sha256 = "0a9klg4a6ilgmv1p3aa55p5pdimgs9xays8msy01gz38441nnpd3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers deepseq directory hashable hgal - HTTP hxt network network-uri parsec text text-binary - unordered-containers utf8-string + attoparsec base binary bytestring containers deepseq directory + hashable hgal HTTP hxt mtl network network-uri parsec parsers text + text-binary unordered-containers utf8-string ]; executableHaskellDepends = [ base containers network network-uri text @@ -169852,7 +171346,7 @@ self: { base bytestring containers directory HUnit network network-uri QuickCheck safe tasty tasty-hunit tasty-quickcheck text ]; - benchmarkHaskellDepends = [ base criterion text ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; homepage = "https://github.com/robstewart57/rdf4h"; description = "A library for RDF processing in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -170061,20 +171555,21 @@ self: { "reactive-banana" = callPackage ({ mkDerivation, base, containers, hashable, HUnit, pqueue - , psqueues, test-framework, test-framework-hunit, transformers - , unordered-containers, vault + , psqueues, semigroups, test-framework, test-framework-hunit + , transformers, unordered-containers, vault }: mkDerivation { pname = "reactive-banana"; - version = "1.1.0.1"; - sha256 = "1hvhzr3cvg91l8kwxia0idg3n9jrh4knlcrmzm9j978dckzrc3mc"; + version = "1.2.0.0"; + sha256 = "1bwzkpackjpzk2igmlahr2qhgacad62v48lam97g9q85zww70p29"; libraryHaskellDepends = [ - base containers hashable pqueue transformers unordered-containers - vault + base containers hashable pqueue semigroups transformers + unordered-containers vault ]; testHaskellDepends = [ - base containers hashable HUnit pqueue psqueues test-framework - test-framework-hunit transformers unordered-containers vault + base containers hashable HUnit pqueue psqueues semigroups + test-framework test-framework-hunit transformers + unordered-containers vault ]; homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Library for functional reactive programming (FRP)"; @@ -170782,8 +172277,8 @@ self: { }: mkDerivation { pname = "recursion-schemes-ext"; - version = "1.0.0.2"; - sha256 = "1k7jjargdhc5q7ay2r07fwd9wgcs249p1r1rr48qlw6lsccrparw"; + version = "1.0.0.3"; + sha256 = "00yj7h46pmy76iqsx1n0mlg04gzdrhyq10xm1xcl28y13jcjx9lc"; libraryHaskellDepends = [ base composition-prelude lens recursion-schemes ]; @@ -171547,12 +173042,12 @@ self: { }) {}; "reform" = callPackage - ({ mkDerivation, base, containers, mtl, text }: + ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { pname = "reform"; - version = "0.2.7.1"; - sha256 = "0c4jh64rszp9rk62kh8nqyhafnbi5vm9lmc2rx7fx237j24j3gjr"; - libraryHaskellDepends = [ base containers mtl text ]; + version = "0.2.7.2"; + sha256 = "14as5chpwfrrqdfxk5g03f4zia0dx10npb802cphfq2j598mjczv"; + libraryHaskellDepends = [ base containers mtl semigroups text ]; homepage = "http://www.happstack.com/"; description = "reform is a type-safe HTML form generation and validation library"; license = stdenv.lib.licenses.bsd3; @@ -173590,8 +175085,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "1"; - editedCabalFile = "14m20b2i0kygminqw35y3wi1na7bfpkyg1yc03a48qy6rrdqgnc2"; + revision = "2"; + editedCabalFile = "1cbzvqfs8glr004viya4x3p08x8lmkrgwwxjy78s32xkf8b2xxpr"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -173947,6 +175442,8 @@ self: { pname = "resourcet"; version = "1.1.11"; sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil"; + revision = "1"; + editedCabalFile = "09sgrzaaishx645hrfflxckyaq0dwk22agjf4sz8nwjafyv3ssh9"; libraryHaskellDepends = [ base containers exceptions lifted-base mmorph monad-control mtl transformers transformers-base transformers-compat unliftio-core @@ -173975,6 +175472,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_2_1" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.1"; + sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -174014,8 +175529,8 @@ self: { }: mkDerivation { pname = "rest-client"; - version = "0.5.2.1"; - sha256 = "0axilkrqjbq1l30cnm05fl0mm3ngnijnxgl6idi6mcydyrdgl14n"; + version = "0.5.2.3"; + sha256 = "1c4p68n3vb5w5xv0ha5bfq73qkcaqkyz0srfdn27pipy2s1h6p22"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -174056,6 +175571,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rest-core_0_39_0_2" = callPackage + ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring + , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils + , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap + , rest-types, safe, split, test-framework, test-framework-hunit + , text, transformers, transformers-compat, unordered-containers + , uri-encode, utf8-string, uuid + }: + mkDerivation { + pname = "rest-core"; + version = "0.39.0.2"; + sha256 = "0vr538sp8i5qwgd91bzvq9fxv939imxck6358xfzlgrk6x89cr1z"; + libraryHaskellDepends = [ + aeson aeson-utils base base-compat bytestring case-insensitive + errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat + multipart random rest-stringmap rest-types safe split text + transformers transformers-compat unordered-containers uri-encode + utf8-string uuid + ]; + testHaskellDepends = [ + aeson base bytestring HUnit mtl test-framework test-framework-hunit + transformers transformers-compat unordered-containers + ]; + description = "Rest API library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rest-example" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , generic-aeson, generic-xmlpickler, hxt, json-schema, mtl @@ -174090,8 +175633,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.20.0.1"; - sha256 = "0fa4mz7drfy60lcg1j73qajy00byvhy759x195prj4nvbrsn5x31"; + version = "0.20.0.3"; + sha256 = "1kd8i5kqjsdc3pl5gpg3i3lhy807qd6x4gxc86hr9a8kkv7y7hfn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory @@ -174149,10 +175692,8 @@ self: { }: mkDerivation { pname = "rest-stringmap"; - version = "0.2.0.6"; - sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6"; - revision = "7"; - editedCabalFile = "14jqqpxxs7vkrf6syycrg2ymh79gl83z13kq261alw5gy8yjnszv"; + version = "0.2.0.7"; + sha256 = "0l2l46c1mqpxq7hi37vjhaihfyapifjaxbzyi1bdhjkybx7n9m32"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -174168,10 +175709,8 @@ self: { }: mkDerivation { pname = "rest-types"; - version = "1.14.1.1"; - sha256 = "16lnwd7rwjb67sqklrwl40bq4h8qhp3wj1893y4vs85fpdjqxq5p"; - revision = "4"; - editedCabalFile = "04s5xcjycbw9fqhmpx0kmy5wmkpgcs84vam68w428rb7y64099mb"; + version = "1.14.1.2"; + sha256 = "0cjxnb4zvj7iafgy9h4wq8817wkm1mvas45xcb9346kwd3yqgvmy"; libraryHaskellDepends = [ aeson base base-compat case-insensitive generic-aeson generic-xmlpickler hxt json-schema rest-stringmap text uuid @@ -174397,8 +175936,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.6.1"; - sha256 = "052kfbfvadrp2m8l0hnwi4j1jhqcw5m93wl9868863p5bd4w7j82"; + version = "0.7.6.2"; + sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -174927,8 +176466,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.0.3.0"; - sha256 = "1mbxd2v0n0hbrmb1xh27snxxp1r8k87g4ijqsp99hnis8vmqmz84"; + version = "0.1.0.0"; + sha256 = "0k3r7859in1dyybc7lr3bqh91harf7g5yknwxmmsqnhlffzc6ygr"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -174944,6 +176483,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio-orphans" = callPackage + ({ mkDerivation, base, exceptions, hspec, monad-control, resourcet + , rio, transformers-base + }: + mkDerivation { + pname = "rio-orphans"; + version = "0.1.0.0"; + sha256 = "09wy9h6smh532lrh13qzmni91yfb702x8i97r24d3ny6i3krzqi7"; + libraryHaskellDepends = [ + base exceptions monad-control resourcet rio transformers-base + ]; + testHaskellDepends = [ + base exceptions hspec monad-control resourcet rio transformers-base + ]; + homepage = "https://github.com/commercialhaskell/rio#readme"; + description = "Orphan instances for the RIO type in the rio package"; + license = stdenv.lib.licenses.mit; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -175369,8 +176927,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.4"; - sha256 = "18dkha42dcxl9f9771wpkji11m12v139wnscb47bm7s693w7p4nc"; + version = "0.4.1.5"; + sha256 = "025dm3rv4cpig8j02yzkr7xinzfcqmfiaaj8x5kzjw8mgcb1qpn3"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -175517,6 +177075,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "roku-api" = callPackage + ({ mkDerivation, base, bytestring, http-client, network, text, xml + , xml-extractors + }: + mkDerivation { + pname = "roku-api"; + version = "0.1.0.0"; + sha256 = "01vqmzqpdj40qxym3iapn1csr10ld9a9imci1pyncdly6q3a343c"; + libraryHaskellDepends = [ + base bytestring http-client network text xml xml-extractors + ]; + description = "Bindings to Roku's External Control API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "roles" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -176046,6 +177620,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rowdy" = callPackage + ({ mkDerivation, base, containers, dlist, hspec, mtl }: + mkDerivation { + pname = "rowdy"; + version = "0.0.1.0"; + sha256 = "19nafk4zmhx76j0qzg1d5kh6mnzwnr5x3kvvxi56x24kfmvrq5qq"; + libraryHaskellDepends = [ base containers dlist mtl ]; + testHaskellDepends = [ base containers dlist hspec mtl ]; + homepage = "https://github.com/parsonsmatt/rowdy#readme"; + description = "An EDSL for web application routes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rowdy-yesod" = callPackage + ({ mkDerivation, base, hspec, rowdy, yesod-core }: + mkDerivation { + pname = "rowdy-yesod"; + version = "0.0.1.0"; + sha256 = "17k9bbxwpmxpswkmax6jrlcfrp6qhgdkjixsp4d6rn7mj676010g"; + libraryHaskellDepends = [ base rowdy yesod-core ]; + testHaskellDepends = [ base hspec rowdy yesod-core ]; + homepage = "https://github.com/parsonsmatt/rowdy#readme"; + description = "An EDSL for web application routes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rowrecord" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -176291,8 +177891,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.14"; - sha256 = "1ypwxlfmlhx3zjmgi24y5mriprk9wjnc14l0lry38j4ml11glcsd"; + version = "0.2.15"; + sha256 = "0si1cj5py2dwcdxwy2yix9bbfmx7gysbdshy5ql38r963yjdhfxs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176305,10 +177905,10 @@ self: { ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty - tasty-hunit tasty-quickcheck word24 + tasty-hunit tasty-quickcheck text word24 ]; homepage = "http://github.com/swift-nav/librtcm"; - description = "RTCM Library"; + description = "Haskell bindings for RTCM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -176735,6 +178335,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "s3-signer_0_4_0_0" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable + , bytestring, case-insensitive, cryptohash, http-types, time + , utf8-string + }: + mkDerivation { + pname = "s3-signer"; + version = "0.4.0.0"; + sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf"; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder byteable bytestring + case-insensitive cryptohash http-types time utf8-string + ]; + testHaskellDepends = [ base blaze-builder bytestring time ]; + doHaddock = false; + homepage = "https://github.com/dmjio/s3-signer"; + description = "Pre-signed Amazon S3 URLs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -177456,10 +179077,8 @@ self: { }: mkDerivation { pname = "sandi"; - version = "0.4.1"; - sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j"; - revision = "1"; - editedCabalFile = "1gk6vwydqdgz1s5glv4jlkaph7g19aqdf7yxbyq0m1afaj1rvjq9"; + version = "0.4.2"; + sha256 = "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b"; libraryHaskellDepends = [ base bytestring conduit exceptions stringsearch ]; @@ -177745,33 +179364,6 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.3.9"; - sha256 = "180krzjl9p1apm54qnna9xkj9451kah1ndix7c7g0if492a75qd6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - homepage = "https://github.com/swift-nav/libsbp"; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "sbp_2_3_13" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, yaml - }: - mkDerivation { - pname = "sbp"; version = "2.3.13"; sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9"; isLibrary = true; @@ -177789,7 +179381,6 @@ self: { homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -178626,27 +180217,27 @@ self: { "scotty" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, data-default-class, directory, fail, hspec - , hspec-wai, http-types, lifted-base, monad-control, mtl, nats - , network, regex-compat, text, transformers, transformers-base - , transformers-compat, wai, wai-extra, warp + , case-insensitive, data-default-class, directory, exceptions, fail + , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types + , lifted-base, monad-control, mtl, nats, network, regex-compat + , text, transformers, transformers-base, transformers-compat, wai + , wai-extra, warp }: mkDerivation { pname = "scotty"; - version = "0.11.0"; - sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "10"; - editedCabalFile = "0y0ll3nn3n6n1ry2mvqm1g28a688hpba8kaw30m17p7fnv0m7368"; + version = "0.11.1"; + sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive - data-default-class fail http-types monad-control mtl nats network - regex-compat text transformers transformers-base + data-default-class exceptions fail http-types monad-control mtl + nats network regex-compat text transformers transformers-base transformers-compat wai wai-extra warp ]; testHaskellDepends = [ - async base data-default-class directory hspec hspec-wai http-types - lifted-base network text wai + async base bytestring data-default-class directory hpc-coveralls + hspec hspec-wai http-types lifted-base network text wai ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; @@ -179662,6 +181253,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.2.0.0"; + sha256 = "1l9ad4d1m0ylfihg0hpfxanxil09c658jl1bmgzn8268akqay9nj"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -179670,6 +181279,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.2"; sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; + revision = "1"; + editedCabalFile = "08f2xdfpmbwhrwkjaqfmd9k25c3xn3p477d7a1mnnn7kf7328782"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -179686,8 +181297,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.0"; sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; - revision = "1"; - editedCabalFile = "0yf1n9iaaafnllkb2yi38ncyd3q062g4p7ln9ypb6h8gcym8s8m1"; + revision = "2"; + editedCabalFile = "198pg9i0lfx3fwf7b7cw0x5kial6vbf0dqwh18jnh7na3pyn1jr6"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -180156,6 +181767,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sensu-run_0_4_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, http-client + , http-types, lens, network, optparse-applicative, process + , temporary, text, time, unix, unix-compat, vector, wreq + }: + mkDerivation { + pname = "sensu-run"; + version = "0.4.0.5"; + sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring filepath http-client http-types lens network + optparse-applicative process temporary text time unix unix-compat + vector wreq + ]; + homepage = "https://github.com/maoe/sensu-run#readme"; + description = "A tool to send command execution results to Sensu"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sentence-jp" = callPackage ({ mkDerivation, base, mecab, random-shuffle, text, transformers }: mkDerivation { @@ -181342,6 +182975,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-elm_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens + , servant, servant-foreign, text, wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.5.0.0"; + sha256 = "0l5rjml46qbnq4p3d7zjk8zl9gnpz8m5n6n8yf8kgy89ybm6xnfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base elm-export lens servant servant-foreign text wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-export hspec HUnit servant text + ]; + homepage = "http://github.com/mattjbray/servant-elm#readme"; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-examples" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, either , http-types, js-jquery, lucid, random, servant, servant-client @@ -181405,23 +183060,6 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.11"; - sha256 = "1n8cjlk16m24wdxicyp0js1lsshqf27bk5a6qykc2f8kiriw5jcf"; - libraryHaskellDepends = [ - base base-compat http-types lens servant text - ]; - testHaskellDepends = [ base hspec servant ]; - testToolDepends = [ hspec-discover ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_11_1" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover - , http-types, lens, servant, text - }: - mkDerivation { - pname = "servant-foreign"; version = "0.11.1"; sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; libraryHaskellDepends = [ @@ -181431,7 +183069,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-generate" = callPackage @@ -181492,20 +183129,20 @@ self: { "servant-github-webhook" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, github, github-webhooks, http-types, memory, servant - , servant-server, string-conversions, text, unordered-containers - , wai, warp + , servant-server, string-conversions, text, transformers + , unordered-containers, wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.4.0.0"; - sha256 = "0j18bms75z2p746g5p7kqsn95c80ilrss4nmfhymn2rwgiimdhnr"; + version = "0.4.1.0"; + sha256 = "0v6gd7swhl58x3sqbb5cmn5ac6x1p5mg7jqbwk9ny9bzggz9pglb"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite github github-webhooks http-types memory servant servant-server - string-conversions text unordered-containers wai + string-conversions text transformers unordered-containers wai ]; testHaskellDepends = [ - aeson base bytestring servant-server text wai warp + aeson base bytestring servant-server text transformers wai warp ]; homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; @@ -181777,10 +183414,8 @@ self: { ({ mkDerivation, base, safe, servant, servant-server, text }: mkDerivation { pname = "servant-pagination"; - version = "1.0.0"; - sha256 = "1cxd9sqryk619ss7x55w8xh4y3dkxl0gcdr3kawryzcm64qlgyja"; - revision = "1"; - editedCabalFile = "0y9mg8jaag07f89krsk2n3y635rjgmcym1kx130s7hb3h3ly7713"; + version = "2.0.0"; + sha256 = "1z6sr43ir9sl85x65yfj21s77y1fqwzfmrfgjlqdas2zygd3fhh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe servant servant-server text ]; @@ -181941,8 +183576,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.6.0"; - sha256 = "1llhxqnbrydikrxdd10cfk4shgbfpxvlsym0lvvvbva4vci1k8wj"; + version = "0.0.7.0"; + sha256 = "1a0ipg1zds393ywjb1f5yphb23ccb39gv8rc6qv5b7y523cgwri2"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -182227,6 +183862,8 @@ self: { pname = "servant-swagger"; version = "1.1.5"; sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; + revision = "1"; + editedCabalFile = "005b3z7wxcrad8210yw3qsndh3zh0v2h8j50qxl8sj1l6wqb7zs6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers @@ -182254,6 +183891,8 @@ self: { pname = "servant-swagger-ui"; version = "0.2.5.3.9.1"; sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m"; + revision = "1"; + editedCabalFile = "16lixcz9vkkgvcfwdfj3p6pmf458hymyywklzwnbhk7z16wjjhnv"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -182269,6 +183908,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-tracing" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing + , containers, hashable, http-api-data, http-client, HUnit + , lifted-base, monad-control, mtl, QuickCheck, random, servant + , servant-server, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-tracing"; + version = "0.1.0.0"; + sha256 = "0wpybm1vl1bh3sj3vam8y40a0sjrx2ys761jyqrj2dnqymk8xc10"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring bytestring-lexing containers hashable + http-api-data http-client lifted-base monad-control mtl random + servant servant-server text time unordered-containers wai + ]; + executableHaskellDepends = [ + async base bytestring containers http-client lifted-base + monad-control mtl servant servant-server text transformers wai warp + ]; + testHaskellDepends = [ + aeson base containers http-api-data HUnit monad-control mtl + QuickCheck tasty tasty-hunit tasty-quickcheck text time + transformers + ]; + homepage = "https://github.com/ChrisCoffey/servant-tracing#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-websockets" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , exceptions, resourcet, servant-server, text, wai, wai-websockets @@ -183247,22 +184917,26 @@ self: { }) {}; "shadowsocks" = callPackage - ({ mkDerivation, aeson, async, base, binary, bytestring - , conduit-combinators, conduit-extra, containers, cryptohash - , HsOpenSSL, HUnit, iproute, network, optparse-applicative, process + ({ mkDerivation, aeson, async, base, binary, bytestring, conduit + , conduit-extra, containers, cryptohash, directory, HsOpenSSL + , HUnit, iproute, network, optparse-applicative, process , streaming-commons, unordered-containers }: mkDerivation { pname = "shadowsocks"; - version = "1.20151028"; - sha256 = "0z43hlgzklynb0y9b6bz2qmr2590v5nfp241i8b3rq7flb5lhlmp"; - isLibrary = false; + version = "1.20180408"; + sha256 = "19yn788j58i4h2bfi7rxy4a9h9q8ppp7bg2yln6ni563wa6x52p2"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring conduit containers cryptohash + directory HsOpenSSL iproute network optparse-applicative + unordered-containers + ]; executableHaskellDepends = [ - aeson async base binary bytestring conduit-combinators - conduit-extra containers cryptohash HsOpenSSL iproute network - optparse-applicative streaming-commons unordered-containers + async base bytestring conduit conduit-extra network + streaming-commons ]; testHaskellDepends = [ base binary bytestring containers cryptohash HUnit process @@ -183319,8 +184993,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.16.3"; - sha256 = "11rgb0lh8q6alr13in7156dwr44rag0ldynbd5wmlg7073q2g8zc"; + version = "0.16.4"; + sha256 = "0dhlkcn1zsg1w97vzs1yrpkn6iwhlzh36dwclx2lafzbdjja6cmp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -183339,22 +185013,23 @@ self: { js-flot js-jquery primitive process QuickCheck random time transformers unix unordered-containers utf8-string ]; - homepage = "http://shakebuild.com"; + homepage = "https://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hashable - , hs2ats, language-ats, lens, shake, shake-ext, text + , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext + , text }: mkDerivation { pname = "shake-ats"; - version = "1.5.0.9"; - sha256 = "1fjbdik7a2izl8sbxnv1i36h55df0v7w23pn7ivk1p18mgljc9lf"; + version = "1.8.0.0"; + sha256 = "0p29bwh3jfjhy1x795irkwdq6qbmihh3sxgznfrwfz7pxwfx6nb7"; libraryHaskellDepends = [ - base binary dependency directory hashable hs2ats language-ats lens - shake shake-ext text + base binary dependency directory hashable hs2ats language-ats + microlens microlens-th shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; @@ -183385,15 +185060,16 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "2.7.0.3"; - sha256 = "0j1558a43bz7jqbbhn0myjwd9nrd6mnn4r26ix5wqhnsgfpxcw1j"; + version = "2.11.0.0"; + sha256 = "1ny8fj8wdshwp5df8skl3lsl5rp30fa8yclhh696pwk433pijc8f"; libraryHaskellDepends = [ - base Cabal composition-prelude directory shake template-haskell + base Cabal composition-prelude cpphs directory shake + template-haskell ]; - libraryToolDepends = [ cpphs ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-extras" = callPackage @@ -183542,19 +185218,15 @@ self: { }) {}; "shakers" = callPackage - ({ mkDerivation, base, basic-prelude, deepseq, directory - , lifted-base, regex-compat, shake + ({ mkDerivation, base, basic-prelude, directory, lifted-base, shake }: mkDerivation { pname = "shakers"; - version = "0.0.42"; - sha256 = "020j1j5lpl5x0hxgscy1skx1fqw77w184h86rvgkq1kli7pp9kpk"; - isLibrary = true; - isExecutable = true; + version = "0.0.45"; + sha256 = "0abzw28861k3larph3i6kaqsx4zcbk25f69y47v4i61riwdxcj0j"; libraryHaskellDepends = [ - base basic-prelude deepseq directory lifted-base regex-compat shake + base basic-prelude directory lifted-base shake ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; license = stdenv.lib.licenses.mit; @@ -183842,23 +185514,22 @@ self: { "shell-conduit" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , control-monad-loop, directory, filepath, hspec - , hspec-expectations, monad-control, monads-tf, process, resourcet - , semigroups, split, template-haskell, text, transformers - , transformers-base, unix + , directory, filepath, hspec, hspec-expectations, monads-tf + , process, resourcet, semigroups, split, template-haskell, text + , transformers, unix, unliftio }: mkDerivation { pname = "shell-conduit"; - version = "4.6.1"; - sha256 = "0hmdfrq2i1smgn6sjnxxzz4hyx9x8i1dwjpycia2xrssn3w63lc6"; + version = "4.7.0"; + sha256 = "0c5yvm08l37qblqks1r23znixxas39gl1d3mlm6rq8a6zfvcacbg"; libraryHaskellDepends = [ - async base bytestring conduit conduit-extra control-monad-loop - directory filepath monad-control monads-tf process resourcet - semigroups split template-haskell text transformers - transformers-base unix + async base bytestring conduit conduit-extra directory filepath + monads-tf process resourcet semigroups split template-haskell text + transformers unix unliftio ]; testHaskellDepends = [ - base hspec hspec-expectations template-haskell + base bytestring conduit conduit-extra hspec hspec-expectations + template-haskell ]; homepage = "https://github.com/psibi/shell-conduit"; description = "Write shell scripts with Conduit"; @@ -184001,36 +185672,6 @@ self: { "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , enclosed-exceptions, exceptions, filepath, hspec, HUnit - , lifted-async, lifted-base, monad-control, mtl, process - , system-fileio, system-filepath, text, time, transformers - , transformers-base, unix-compat - }: - mkDerivation { - pname = "shelly"; - version = "1.7.1"; - sha256 = "068gabny23r9qs2fnn5vjyy77zi59c323ypmnmd71w7qwyfa2pl8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions lifted-async lifted-base monad-control mtl process - system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - testHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions filepath hspec HUnit lifted-async lifted-base - monad-control mtl process system-fileio system-filepath text time - transformers transformers-base unix-compat - ]; - homepage = "https://github.com/yesodweb/Shelly.hs"; - description = "shell-like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shelly_1_7_2" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process , system-fileio, system-filepath, text, time, transformers @@ -184057,7 +185698,6 @@ self: { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -184140,14 +185780,19 @@ self: { "shimmer" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, haskeline - , text, vector + , text }: mkDerivation { pname = "shimmer"; - version = "0.1.2"; - sha256 = "0d4jllvqkswhxmjczvj2pcfwgdsd8xpvjx60pvw7m06jwslh99dl"; + version = "0.1.3.1"; + sha256 = "04hj31pw04xzhpicblc7mvqrwbs7gf00hps7bffymk2xx4v6xfl7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers filepath haskeline text vector + base bytestring containers filepath haskeline text + ]; + executableHaskellDepends = [ + base bytestring containers filepath haskeline text ]; description = "The Reflective Lambda Machine"; license = stdenv.lib.licenses.mit; @@ -185359,6 +187004,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-src-utils" = callPackage + ({ mkDerivation, base, extra, tasty, tasty-hunit, text }: + mkDerivation { + pname = "simple-src-utils"; + version = "0.1"; + sha256 = "0cfa2l7a0c8kgr0707jnk2qzh12a2564bdzzynjzcdjdqda6d5ch"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ base extra text ]; + testHaskellDepends = [ base extra tasty tasty-hunit text ]; + homepage = "https://github.com/elaforge/simple-src-utils"; + description = "source code editing utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-stacked-vm" = callPackage ({ mkDerivation, array, base, binary-state, containers, filepath , mtl, parsec @@ -185736,27 +187397,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "singleton-bool"; - version = "0.1.3"; - sha256 = "1i29dl0f45rk280qfrcjcfbkshb7h3y0s2ndw2d7drwlcbl4p2if"; - revision = "1"; - editedCabalFile = "0wpwwqgrfgzi6cf4j1jpxwi8b30s80zch2xzcgzcmjmaai7kgc1n"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/phadej/singleton-bool#readme"; - description = "Type level booleans"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singleton-bool_0_1_4" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "singleton-bool"; version = "0.1.4"; sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/phadej/singleton-bool#readme"; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-dict" = callPackage @@ -185973,8 +187619,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.2.0.0"; - sha256 = "15cynic59qkfgb8d3ca6hr3dag0cs48af266xaiblpvim39rk1fb"; + version = "0.3.0.0"; + sha256 = "0h1qcc9d721yczd1szylxpxc1nzi2np6xa5b1rlsck6yjr238bwz"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -186013,8 +187659,8 @@ self: { pname = "size-based"; version = "0.1.0.0"; sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx"; - revision = "1"; - editedCabalFile = "089942604ikg40v4nl25c4j856bylmmm06py4k2spz3y2z4k49rb"; + revision = "2"; + editedCabalFile = "1p4iglrrl5s47cxn520saiszw5wwr4x1kn9xbgn7awz29mv7pmd2"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -186467,8 +188113,8 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.3"; - sha256 = "1zxs697fmcgwrbrkzh7qgmrxcc6l75m1p300zinzqxvxv3zvk5l6"; + version = "0.2.0.4"; + sha256 = "1wbqz6shqm39ivmw7k2pwslaygxf4rxxbkiczxzpvd29y5pm81ah"; libraryHaskellDepends = [ aeson base containers errors http-api-data http-client http-client-tls megaparsec mtl servant servant-client @@ -186491,8 +188137,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.9.0.0"; - sha256 = "19619ladqp1faqdn4z2yrxvffpcr9k0s942s6rjg73i229hccv8f"; + version = "0.10.0.0"; + sha256 = "0f21bmv0dckdim27mm5m7vphci45h6fjbxyzpahai2nlydilhnc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186681,8 +188327,8 @@ self: { pname = "slug"; version = "0.1.7"; sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; - revision = "2"; - editedCabalFile = "0kvx1igj6fs9wrwkh68m19f5pxw1x46d489zgj6f5ah5w8wfxp2h"; + revision = "3"; + editedCabalFile = "1kqaqhg8bkrkax41pbi18612s0m9w2324n5akn5nhmxq0zla73vh"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -187286,20 +188932,21 @@ self: { "snap-auth-cli" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , clientsession, cmdargs, snap, text, unordered-containers - , utf8-string + , clientsession, cmdargs, snap, snaplet-sqlite-simple + , sqlite-simple, text, unordered-containers, utf8-string }: mkDerivation { pname = "snap-auth-cli"; - version = "0.1.0.1"; - sha256 = "0spdn7zazd17yrcx004m4yag8vy4bac4997f81nfvy25jvg87hhl"; + version = "0.2"; + sha256 = "1h93v7fkrdpp5ls2b2g7r7wnf6abfl8q0nld1qzzqj927lzgnzwa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson aeson-pretty base bytestring clientsession cmdargs snap text - unordered-containers utf8-string + aeson aeson-pretty base bytestring clientsession cmdargs snap + snaplet-sqlite-simple sqlite-simple text unordered-containers + utf8-string ]; - homepage = "https://github.com/dzhus/snap-auth-cli"; + homepage = "https://github.com/dzhus/snap-auth-cli#readme"; description = "Command-line tool to manage Snap AuthManager database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187356,43 +189003,6 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.3.1"; - sha256 = "0m2pbz7r5dllk859r8bs3yjkmdh4xrw0vafz390jfmj15vaz0j87"; - revision = "1"; - editedCabalFile = "0yf3i0pb14zff083cnz4lszg5bkbbzg5r1v3yj9s66dchrszrjbd"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers directory filepath hashable HUnit io-streams lifted-base - monad-control mtl network network-uri old-locale random readable - regex-posix text time transformers transformers-base unix-compat - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers deepseq directory filepath hashable HUnit io-streams - lifted-base monad-control mtl network network-uri old-locale - parallel QuickCheck random readable regex-posix test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers transformers-base unix-compat unordered-containers - vector zlib - ]; - homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-core_1_0_3_2" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , case-insensitive, containers, deepseq, directory, filepath - , hashable, HUnit, io-streams, lifted-base, monad-control, mtl - , network, network-uri, old-locale, parallel, QuickCheck, random - , readable, regex-posix, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector - , zlib - }: - mkDerivation { - pname = "snap-core"; version = "1.0.3.2"; sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; libraryHaskellDepends = [ @@ -187414,7 +189024,6 @@ self: { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-cors" = callPackage @@ -189718,29 +191327,20 @@ self: { , http-types, list-t, monad-control, monad-control-aligned, mtl , nested-routes, path, path-extra, pred-trie, stm, strict, text , tmapchan, tmapmvar, transformers, unordered-containers, urlpath - , uuid, wai-middleware-content-type, wai-transformers, websockets - , websockets-simple, wuss + , uuid, wai, wai-middleware-content-type, wai-transformers + , websockets, websockets-simple, wuss }: mkDerivation { pname = "sparrow"; - version = "0.0.1.1"; - sha256 = "14apx9pxbl9s9i5d8i7x3y9wyzdyx3gspz4l4h4vaddg996pq0il"; + version = "0.0.1.3"; + sha256 = "1n1zwhkvhypjmfmk2lqg1dlpw6x720mxd9giggklywhac1brdnzy"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable http-client http-client-tls http-types list-t monad-control monad-control-aligned mtl nested-routes path path-extra pred-trie stm strict text tmapchan tmapmvar transformers unordered-containers - urlpath uuid wai-middleware-content-type wai-transformers - websockets websockets-simple wuss - ]; - testHaskellDepends = [ - aeson aeson-attoparsec async attoparsec attoparsec-uri base - bytestring deepseq exceptions extractable-singleton hashable - http-client http-client-tls http-types list-t monad-control - monad-control-aligned mtl nested-routes path path-extra pred-trie - stm strict text tmapchan tmapmvar transformers unordered-containers - urlpath uuid wai-middleware-content-type wai-transformers + urlpath uuid wai wai-middleware-content-type wai-transformers websockets websockets-simple wuss ]; description = "Unified streaming dependency management for web apps"; @@ -189818,15 +191418,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "sparse-linear-algebra_0_3" = callPackage + "sparse-linear-algebra_0_3_1" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck , scientific, transformers, vector, vector-algorithms }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.3"; - sha256 = "10s3z0mva8hf9f2ckbpfkzdkhnixp73xli5yigh4d44662rzwqn1"; + version = "0.3.1"; + sha256 = "1jfwydr0pzph932h7jvnmp1d8qqrhxsq7rbb6cjbmga55s5pfqn7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers exceptions hspec mtl primitive QuickCheck @@ -190032,10 +191632,8 @@ self: { }: mkDerivation { pname = "species"; - version = "0.4"; - sha256 = "04n9lrh058n66175drw3vsn57fd64j8wmn9wdchfb0557yqcjcmn"; - revision = "1"; - editedCabalFile = "0j69s6gpq0bzv42hkalz3nw35q07m5agdcs8kxv11s62jcm6idrs"; + version = "0.4.0.1"; + sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -190439,8 +192037,8 @@ self: { pname = "splitmix"; version = "0"; sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi"; - revision = "1"; - editedCabalFile = "0dh4p3rzvx3zwj0bh5flf4qsiw831rb4vxmbh5jq45qkvry8z8hy"; + revision = "2"; + editedCabalFile = "0fl7z9lxkyvqk0d14d778j3lk8zi8jgncwq41gqi4z78a20xb2pg"; libraryHaskellDepends = [ base random time ]; testHaskellDepends = [ base base-compat bytestring random tf-random @@ -190910,15 +192508,15 @@ self: { "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only - , text, time, transformers + , semigroups, text, time, transformers }: mkDerivation { pname = "sqlite-simple"; - version = "0.4.14.0"; - sha256 = "0zx4fdv6larfyj6m1d4livb5cqdx10yi06yd6px2n0wnxcmvdyj9"; + version = "0.4.15.0"; + sha256 = "1qk9dzrqfyjavyl9p0l24hbncp2c1faxx0yvjz5iq3s4dl6fswf0"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite Only text time transformers + direct-sqlite Only semigroups text time transformers ]; testHaskellDepends = [ base base16-bytestring bytestring direct-sqlite HUnit text time @@ -190932,8 +192530,8 @@ self: { ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { pname = "sqlite-simple-errors"; - version = "0.6.0.0"; - sha256 = "106rpzxdnsp7g84fh5yvmj145pz5ghrd5cicg1yj5pxlyrgvm5z6"; + version = "0.6.1.0"; + sha256 = "0vvim8zcrl3yqhf30j69x59qs5f6sdx5bvy4ihwmimkldm5gh0ai"; libraryHaskellDepends = [ base parsec sqlite-simple text ]; testHaskellDepends = [ base mtl sqlite-simple text ]; homepage = "https://github.com/caneroj1/sqlite-simple-errors"; @@ -191023,6 +192621,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "squeal-postgresql_0_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , generics-sop, lifted-base, mmorph, monad-control, mtl, network-ip + , postgresql-binary, postgresql-libpq, resource-pool, scientific + , text, time, transformers, transformers-base, uuid-types, vector + }: + mkDerivation { + pname = "squeal-postgresql"; + version = "0.2.1.0"; + sha256 = "1qfz1c4yzjshgvc64plahy3aar96yvcmn2m5giyp17nrfgq266qs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring deepseq generics-sop lifted-base mmorph + monad-control mtl network-ip postgresql-binary postgresql-libpq + resource-pool scientific text time transformers transformers-base + uuid-types vector + ]; + executableHaskellDepends = [ + base bytestring generics-sop mtl text transformers + transformers-base vector + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/morphismtech/squeal"; + description = "Squeal PostgreSQL Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "squeeze" = callPackage ({ mkDerivation, base, Cabal, data-default, directory, extra , factory, filepath, mtl, QuickCheck, random, toolshed @@ -191090,8 +192717,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.5.1.1"; - sha256 = "05qsyrpzbbawpnfmq8v1rr36kvnycarlr3v91hmbj33vk73acj1i"; + version = "0.5.1.2"; + sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mainland/srcloc"; description = "Data types for managing source code locations"; @@ -191430,8 +193057,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "3"; - editedCabalFile = "0r7qx7h3lz6v5fvfkky7crw5ms8vszx0d8xlkr94xa9n7mxbndh3"; + revision = "4"; + editedCabalFile = "03qy0mlyiwpv98aq74m3pyarg6v6w9vn8qlq6ljdlb40xi1p9s7z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -192377,8 +194004,8 @@ self: { pname = "statestack"; version = "0.2.0.5"; sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl"; - revision = "1"; - editedCabalFile = "0kf1jdhdv9fiwlbn2915sg39x23lfxlyp2qb7jkrvx8p8v2sam7i"; + revision = "2"; + editedCabalFile = "0c10cv107ls0wm7gs3gvknd8a1gqvrkk97frn8lp1ch697mz44rp"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -192422,6 +194049,8 @@ self: { pname = "static-canvas"; version = "0.2.0.3"; sha256 = "0jfp3nk9flzjw0qjkbh7rk7q0g6dsmgqb2xwrfmg5pnf13gj821p"; + revision = "1"; + editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7"; libraryHaskellDepends = [ base double-conversion free mtl text ]; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; @@ -192692,6 +194321,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "status-notifier-item" = callPackage + ({ mkDerivation, base, bytestring, containers, dbus, filepath + , hslogger, lens, mtl, network, optparse-applicative, spool + , template-haskell, transformers, vector + }: + mkDerivation { + pname = "status-notifier-item"; + version = "0.1.0.0"; + sha256 = "1g1gf3anqrg8mfdyjvymk5wlg0h4pfc0pv4wlw5phk6r93dxah1n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dbus filepath hslogger lens mtl network + spool template-haskell transformers vector + ]; + executableHaskellDepends = [ + base dbus hslogger optparse-applicative + ]; + homepage = "https://github.com/IvanMalison/status-notifier-item#readme"; + description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "statvfs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192712,8 +194364,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.1.3"; - sha256 = "1sd36j3f7s8dlz2g6w1yir19yys4pn28arw4nlpknpm7dzm6vs1g"; + version = "0.2.1.4"; + sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193293,6 +194945,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stocks" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, semigroups + }: + mkDerivation { + pname = "stocks"; + version = "0.1.0.0"; + sha256 = "10ws7mg0236iqkjclajwph2lb5719adkay5imaxrsj13d10f8ssq"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit semigroups + ]; + homepage = "https://github.com/dabcoder/stocks#readme"; + description = "Library for the IEX Trading API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stomp-conduit" = callPackage ({ mkDerivation, base, conduit, mime, mtl, resourcet, stomp-queue , stompl @@ -193614,6 +195281,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_20_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.20.0"; + sha256 = "0qkhgm951b377i7ny28faczw2s32rrmfvrh1lcgzfz7gszakb5bw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers + ]; + homepage = "https://github.com/frontrowed/stratosphere#readme"; + description = "EDSL for AWS CloudFormation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -193807,6 +195499,52 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, streaming + , streaming-bytestring, tasty, tasty-hunit + }: + mkDerivation { + pname = "streaming-attoparsec"; + version = "1.0.0"; + sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z"; + libraryHaskellDepends = [ + attoparsec base bytestring streaming streaming-bytestring + ]; + testHaskellDepends = [ + attoparsec base bytestring streaming streaming-bytestring tasty + tasty-hunit + ]; + homepage = "https://github.com/haskell-streaming/streaming-attoparsec"; + description = "Attoparsec integration for the streaming ecosystem"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "streaming-benchmarks" = callPackage + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit + , csv, deepseq, directory, gauge, list-t, list-transformer, logict + , machines, mtl, pipes, random, split, streaming, streamly, text + , transformers, typed-process, vector + }: + mkDerivation { + pname = "streaming-benchmarks"; + version = "0.1.0"; + sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Chart Chart-diagrams csv directory split text + typed-process + ]; + benchmarkHaskellDepends = [ + base conduit deepseq gauge list-t list-transformer logict machines + mtl pipes random streaming streamly transformers vector + ]; + homepage = "http://github.com/composewell/streaming-benchmarks"; + description = "Benchmarks to compare streaming packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-binary" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, streaming , streaming-bytestring @@ -193833,8 +195571,8 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.5"; - sha256 = "0ih7ngqbign834i7z1hlqb0g0f3gphgrz6n8sdj81h36vmm6yd8j"; + version = "0.1.6"; + sha256 = "1lsklavhk6wcsgjr2rcwkkv827gnd9spv4zwz5i5zf3njvy27my1"; libraryHaskellDepends = [ base bytestring deepseq exceptions mmorph mtl resourcet streaming transformers transformers-base @@ -193925,8 +195663,8 @@ self: { }: mkDerivation { pname = "streaming-concurrency"; - version = "0.3.1.0"; - sha256 = "151nyi75qrlvp5q3xi678rkg2vk0mrvpyr8c4yagh1df90amhvsm"; + version = "0.3.1.1"; + sha256 = "1qpcplkwdw8dinhn20wwnfgqf07gzyp61lx6m6w0126hr8fq9r35"; libraryHaskellDepends = [ base exceptions lifted-async monad-control stm streaming streaming-with transformers-base @@ -194096,8 +195834,8 @@ self: { }: mkDerivation { pname = "streaming-sort"; - version = "0.1.0.0"; - sha256 = "0zv66xdrg457gskfnviic9mmh38zk9vxsigrlbci8a2fwmphmjxg"; + version = "0.1.0.2"; + sha256 = "0877zzip19zdfn7a5b59x911rh7cjxqmxyrr9ivhahgh8igfsjf9"; libraryHaskellDepends = [ base binary bytestring directory exceptions streaming streaming-binary streaming-bytestring streaming-with transformers @@ -194154,8 +195892,8 @@ self: { }: mkDerivation { pname = "streaming-with"; - version = "0.2.1.0"; - sha256 = "04i4k7n37qblf9yxdj0bl1qr0arpkv2l06kx7f8aqf1xa7vvxz9i"; + version = "0.2.1.1"; + sha256 = "0wyq183z10sr0sdx28n316x22f4h8v67cg164qir3fb7q09pmqbg"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -194170,32 +195908,8 @@ self: { }: mkDerivation { pname = "streamly"; - version = "0.1.0"; - sha256 = "1apw961n69rix4vvb7bsdald0w1qnal1vawi66nw64cyn696sbzi"; - revision = "1"; - editedCabalFile = "0cx4s17r2nn6xwa9lpcn7scvbqqxi6ihxyb20axhj5rim8iz94hm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base containers exceptions lifted-base - lockfree-queue monad-control mtl stm transformers transformers-base - ]; - testHaskellDepends = [ base containers hspec ]; - benchmarkHaskellDepends = [ atomic-primops base criterion mtl ]; - homepage = "https://github.com/composewell/streamly"; - description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streamly_0_1_1" = callPackage - ({ mkDerivation, atomic-primops, base, containers, criterion - , exceptions, hspec, lifted-base, lockfree-queue, monad-control - , mtl, stm, transformers, transformers-base - }: - mkDerivation { - pname = "streamly"; - version = "0.1.1"; - sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6"; + version = "0.1.2"; + sha256 = "1axqac7zi2b87q91hxv75dpk4pfd4d4fcvsna7cjgkhkdvvjarzp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194207,7 +195921,6 @@ self: { homepage = "https://github.com/composewell/streamly"; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamproc" = callPackage @@ -194651,6 +196364,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "string-transform_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , tasty-smallcheck, text, utf8-string + }: + mkDerivation { + pname = "string-transform"; + version = "1.1.0"; + sha256 = "1f76aiimm2knc68g08dc9j495mjkas87jw8w27silrsq3pzayzad"; + libraryHaskellDepends = [ base bytestring text utf8-string ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string + ]; + homepage = "https://github.com/ncaq/string-transform#readme"; + description = "simple and easy haskell string transform wrapper"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-typelits" = callPackage ({ mkDerivation, base, template-haskell, type-combinators , type-combinators-quote @@ -194887,25 +196618,6 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.3"; - sha256 = "1ins8aqxknnz9a00lb074f79ifd1r9lkkwdbx4ksy9cnnd3rnyl1"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - homepage = "https://github.com/tfausak/strive#readme"; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strive_5_0_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "strive"; version = "5.0.4"; sha256 = "1lj3fqyl1a6nix32y5irvlvsdl518gv7zvz67my5dp5fa3z9hklg"; libraryHaskellDepends = [ @@ -194920,7 +196632,6 @@ self: { homepage = "https://github.com/tfausak/strive#readme"; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strptime" = callPackage @@ -195181,8 +196892,8 @@ self: { }: mkDerivation { pname = "stylish-cabal"; - version = "0.4.0.0"; - sha256 = "1357yrnzyc7rhd98dz33m84yckzs2djrlv8dmh5a2p97s31gcp03"; + version = "0.4.0.1"; + sha256 = "00jwq35dr60c9gjwy8hg3i8b39gxknr92mrz21657gazl90cxy4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196244,38 +197955,6 @@ self: { , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob , hashable, hspec, hspec-discover, http-media, HUnit , insert-ordered-containers, lens, mtl, network, QuickCheck - , scientific, template-haskell, text, time, transformers - , transformers-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.2"; - sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6"; - revision = "1"; - editedCabalFile = "0dhs44zhb2yh4yxw88yvlijcd255ppm1ch7dz7pn7sdv1wr6kxq5"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat bytestring containers generics-sop hashable - http-media insert-ordered-containers lens mtl network scientific - template-haskell text time transformers transformers-compat - unordered-containers uuid-types vector - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - text time unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://github.com/GetShopTV/swagger2"; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "swagger2_2_2_1" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob - , hashable, hspec, hspec-discover, http-media, HUnit - , insert-ordered-containers, lens, mtl, network, QuickCheck , quickcheck-instances, scientific, template-haskell, text, time , transformers, transformers-compat, unordered-containers , uuid-types, vector @@ -196284,6 +197963,8 @@ self: { pname = "swagger2"; version = "2.2.1"; sha256 = "11i0yg2g4bw8pjz9p0w7qz7hpriji9zkiz3y5gr26pwb3fzab5qz"; + revision = "1"; + editedCabalFile = "00snyp95rjh3h7yqfwg3x4y9gjhypm6zfv45i2sag4w5cydvkzb5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable @@ -196300,7 +197981,6 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -196380,32 +198060,6 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.2.0"; - sha256 = "0lgd71qa4fs9zzrapi0mkgsdlip5kxjkhz1v1xj6ifaaq8f2f8jp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - old-locale polyparse semigroups text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups - test-framework test-framework-hunit text time - ]; - homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; - description = "A semantic web toolkit"; - license = "LGPL"; - }) {}; - - "swish_0_9_2_1" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, old-locale, polyparse - , semigroups, test-framework, test-framework-hunit, text, time - }: - mkDerivation { - pname = "swish"; version = "0.9.2.1"; sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg"; isLibrary = true; @@ -196423,7 +198077,6 @@ self: { homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; description = "A semantic web toolkit"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sws" = callPackage @@ -196435,6 +198088,8 @@ self: { pname = "sws"; version = "0.4.1.0"; sha256 = "1xcbmwpwp2nvi7adihkddpgi9pkdc7q7ly08vm57r56lcpzvs70p"; + revision = "1"; + editedCabalFile = "1mlyk1959yy4lmx7zsc5iafw1y7vj1d39dndn9as34pqd1rvdk5j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -196442,7 +198097,7 @@ self: { network resourcet transformers wai wai-extra wai-middleware-static warp warp-tls ]; - description = "A simple web server for serving directories, similar to weborf"; + description = "A simple web server for serving directories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -196495,8 +198150,8 @@ self: { }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.8"; - sha256 = "01b187jhhfp77l4zgks5gszkn9jmgjc44mw9yympw1fsfskljiz3"; + version = "0.6.1.9"; + sha256 = "1apvvzzc19lbchmbginmhxzcrvrcg76dvdgsk51pxrnr4glnva86"; libraryHaskellDepends = [ array base bytestring containers template-haskell ]; @@ -197780,8 +199435,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.0"; - sha256 = "0lr2jddm4qsfhl77sx837vva1rpnaf9a45a8wfc57xqrspapjhlz"; + version = "0.8.0.1"; + sha256 = "12glh66b7ih6zxhry1s1a9pbc2arpz0m4z1hvx3r3ji8s87i18kh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197942,36 +199597,37 @@ self: { }) {}; "taffybar" = callPackage - ({ mkDerivation, base, cairo, containers, dbus, dyre - , enclosed-exceptions, filepath, gtk, gtk-traymanager, gtk2 - , HStringTemplate, HTTP, mtl, network, network-uri, old-locale - , parsec, process, safe, split, stm, text, time, time-locale-compat - , transformers, utf8-string, X11, xdg-basedir, xmonad - , xmonad-contrib + ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers + , dbus, directory, dyre, either, enclosed-exceptions, filepath + , glib, gtk-traymanager, gtk3, HStringTemplate, HTTP, mtl, multimap + , network, network-uri, old-locale, parsec, process, rate-limit + , safe, split, stm, text, time, time-locale-compat, time-units + , transformers, tuple, unix, utf8-string, X11, xdg-basedir, xml + , xml-helpers, xmonad, xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "0.4.6"; - sha256 = "1xfaw32yq17a6wm6gzvpdnpabxfnskwbs541h1kk1lvrkm31h2b2"; + version = "1.0.1"; + sha256 = "1agx7q73h8x53cl8i408yifrr80fbm47pwn46mi6abcp61s92chn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo containers dbus dyre enclosed-exceptions filepath gtk - gtk-traymanager HStringTemplate HTTP mtl network network-uri - old-locale parsec process safe split stm text time - time-locale-compat transformers utf8-string X11 xdg-basedir xmonad - xmonad-contrib + alsa-mixer base cairo ConfigFile containers dbus directory dyre + either enclosed-exceptions filepath glib gtk-traymanager gtk3 + HStringTemplate HTTP mtl multimap network network-uri old-locale + parsec process rate-limit safe split stm text time + time-locale-compat time-units transformers tuple unix utf8-string + X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib ]; - libraryPkgconfigDepends = [ gtk2 ]; executableHaskellDepends = [ - base dyre filepath gtk safe xdg-basedir + base containers directory dyre filepath glib gtk3 mtl safe split + utf8-string X11 xdg-basedir ]; - executablePkgconfigDepends = [ gtk2 ]; homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - }) {gtk2 = pkgs.gnome2.gtk;}; + }) {}; "tag-bits" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -198929,20 +200585,20 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.1.0.1"; - sha256 = "0yqaplhwdyfg2wddz0yhzy6c7akpkhi0nkm62171wxfapzpjbbrk"; + version = "1.1.0.2"; + sha256 = "0navsbmga0zzia6v8halqm0hli8x8zs0g80zix2170a55w8k3f0h"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_1_0_2" = callPackage + "tasty-dejafu_1_2_0_0" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.1.0.2"; - sha256 = "0navsbmga0zzia6v8halqm0hli8x8zs0g80zix2170a55w8k3f0h"; + version = "1.2.0.0"; + sha256 = "0dhrcra1vzrw7xxnph28iz3c9pkmkhza0m9xjb9qxc75p2f684p3"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -199092,23 +200748,6 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.3.3"; - sha256 = "00ym5jlh11smmg3aryfylnwjbmi62gsy5jl1pv85bc8gl0kqa85d"; - libraryHaskellDepends = [ - base hspec hspec-core QuickCheck tasty tasty-quickcheck - tasty-smallcheck - ]; - homepage = "https://github.com/mitchellwrosen/tasty-hspec"; - description = "Hspec support for the Tasty test framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-hspec_1_1_4" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-hspec"; version = "1.1.4"; sha256 = "17f4rcga0qnynf1h047chwm5nicmik79lw04kiwpw48ahwc0zkp3"; libraryHaskellDepends = [ @@ -199118,7 +200757,6 @@ self: { homepage = "https://github.com/mitchellwrosen/tasty-hspec"; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-html" = callPackage @@ -199758,6 +201396,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "teardown_0_4_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, criterion, rio, tasty + , tasty-hunit, typed-process, unliftio + }: + mkDerivation { + pname = "teardown"; + version = "0.4.0.0"; + sha256 = "0y2ihw74fnnygzp22nyy7285d3rcp6kw2gjkzys82blwrbdwdlsk"; + libraryHaskellDepends = [ + ansi-wl-pprint base rio typed-process unliftio + ]; + testHaskellDepends = [ + base rio tasty tasty-hunit typed-process unliftio + ]; + benchmarkHaskellDepends = [ + base criterion rio typed-process unliftio + ]; + homepage = "https://github.com/roman/Haskell-teardown#readme"; + description = "Build composable components for your application with clear teardown semantics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "teeth" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -200228,6 +201889,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "temporary_1_3" = callPackage + ({ mkDerivation, base, base-compat, directory, exceptions, filepath + , random, tasty, tasty-hunit, transformers, unix + }: + mkDerivation { + pname = "temporary"; + version = "1.3"; + sha256 = "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c"; + libraryHaskellDepends = [ + base directory exceptions filepath random transformers unix + ]; + testHaskellDepends = [ + base base-compat directory filepath tasty tasty-hunit unix + ]; + homepage = "https://github.com/feuerbach/temporary"; + description = "Portable temporary file and directory support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "temporary-rc" = callPackage ({ mkDerivation, base, directory, exceptions, filepath , transformers, unix @@ -200590,6 +202271,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-text" = callPackage + ({ mkDerivation, ansi-terminal, base, container, layered-state + , prologue, text + }: + mkDerivation { + pname = "terminal-text"; + version = "1.1.1"; + sha256 = "1jgdxqck3ck65mppi694w0f5x0547148y5agi100zggp8r3yxsy3"; + libraryHaskellDepends = [ + ansi-terminal base container layered-state prologue text + ]; + homepage = "https://github.com/luna/terminal-text"; + description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)"; + license = stdenv.lib.licenses.asl20; + }) {}; + "termination-combinators" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -201509,8 +203206,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.0"; - sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx"; + version = "0.1.5.1"; + sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -201870,8 +203567,8 @@ self: { }: mkDerivation { pname = "text-regex-replace"; - version = "0.1.1.1"; - sha256 = "0n0jk3qdcdhy3b91x7xkyc87xk3405g49qrgcfzb3ksr9qyw89rg"; + version = "0.1.1.2"; + sha256 = "1v6gjimq4qzldpc3ihvf0mn24n3mfk4vs87b7xzgmzk63sbpijyk"; libraryHaskellDepends = [ attoparsec base text text-icu ]; testHaskellDepends = [ base hspec QuickCheck smallcheck text text-icu @@ -201973,8 +203670,8 @@ self: { pname = "text-show"; version = "3.7.2"; sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s"; - revision = "1"; - editedCabalFile = "1iaa9scqwys9da98ya62jz2lyqia79ys8zq4hhcgb3l45x0ngc27"; + revision = "2"; + editedCabalFile = "0fjysjlmvvzvndxsni2ja92kr1pyqgl4dyc5c7x2ffaf02g9h2d2"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -202000,6 +203697,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3_7_3" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers + , contravariant, criterion, deepseq, deriving-compat + , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover + , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups + , tagged, template-haskell, text, th-abstraction, th-lift + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.7.3"; + sha256 = "1d8wmdndl8qsz90fb67xxbrprlmmp47p4f3ik6psp5m6r0cdvpzg"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-abstraction th-lift transformers + transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bifunctors bytestring + bytestring-builder containers contravariant deriving-compat + generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats + QuickCheck quickcheck-instances semigroups tagged template-haskell + text th-lift transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant criterion deepseq + generic-deriving ghc-boot-th ghc-prim integer-gmp nats semigroups + tagged template-haskell text th-lift transformers + transformers-compat void + ]; + homepage = "https://github.com/RyanGlScott/text-show"; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -202034,6 +203772,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show-instances_3_6_4" = callPackage + ({ mkDerivation, base, base-compat-batteries, bifunctors, binary + , bytestring, containers, directory, generic-deriving, ghc-boot-th + , ghc-prim, haskeline, hoopl, hpc, hspec, hspec-discover + , old-locale, old-time, pretty, process, QuickCheck + , quickcheck-instances, random, semigroups, tagged + , template-haskell, terminfo, text, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.6.4"; + sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf"; + libraryHaskellDepends = [ + base base-compat-batteries bifunctors binary bytestring containers + directory ghc-boot-th haskeline hoopl hpc old-locale old-time + pretty process random semigroups tagged template-haskell terminfo + text text-show time transformers transformers-compat unix + unordered-containers vector xhtml + ]; + testHaskellDepends = [ + base base-compat-batteries bifunctors binary bytestring containers + directory generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc + hspec old-locale old-time pretty process QuickCheck + quickcheck-instances random semigroups tagged template-haskell + terminfo text text-show th-orphans time transformers + transformers-compat unix unordered-containers vector xhtml + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/RyanGlScott/text-show-instances"; + description = "Additional instances for text-show"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -202555,8 +204329,8 @@ self: { }: mkDerivation { pname = "th-format"; - version = "0.1.0.0"; - sha256 = "0vyvw9m28xb2playrzc533173p26jnlr8w1sbjc9w81y17676z3x"; + version = "0.1.1.0"; + sha256 = "1axan3icxz9yxkra2kb9r66h9h51v4zbjncd1xsvgiplqmwf6fjl"; libraryHaskellDepends = [ base Earley haskell-src-meta template-haskell text ]; @@ -202709,6 +204483,8 @@ self: { pname = "th-orphans"; version = "0.13.5"; sha256 = "1b9599vyn0wjwbq7b7n0w25s3wbihdxr958hscfpwc8lg55lsr4m"; + revision = "1"; + editedCabalFile = "1rgsrnh0qvlriz0c2c3q8wbb3ykby8d3lli0j553ml3n1sn9k4zv"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -203314,31 +205090,6 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.8.2.2"; - sha256 = "13s6n7pxbmr0j2g5xiqpacfnshqg0jq91y161rmmp3wix4bav6am"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson async base bytestring containers data-default deepseq - exceptions file-embed filepath hashable network-uri safe snap-core - snap-server stm template-haskell text transformers - unordered-containers vault vector websockets websockets-snap - ]; - homepage = "http://wiki.haskell.org/Threepenny-gui"; - description = "GUI framework that uses the web browser as a display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "threepenny-gui_0_8_2_3" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, deepseq, exceptions, file-embed, filepath, hashable - , network-uri, safe, snap-core, snap-server, stm, template-haskell - , text, transformers, unordered-containers, vault, vector - , websockets, websockets-snap - }: - mkDerivation { - pname = "threepenny-gui"; version = "0.8.2.3"; sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb"; isLibrary = true; @@ -203353,7 +205104,6 @@ self: { homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -203472,8 +205222,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "2"; - editedCabalFile = "1qbzxll2zfc2y9r17yk2077lyq6f2dw1745kxn5f4r33970128k6"; + revision = "3"; + editedCabalFile = "1gia9j7zq3g74kqvkzwp68d690nhddix1kpmj23d5a3zns3rxasn"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; homepage = "https://www.github.com/bergmark/through-text"; description = "Convert textual types through Text without needing O(n^2) instances"; @@ -203605,15 +205355,17 @@ self: { }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; "tibetan-utils" = callPackage - ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec - , megaparsec, text, text-show + ({ mkDerivation, base, composition-prelude, either, hspec + , hspec-megaparsec, megaparsec, text, text-show }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.4"; - sha256 = "0xr31py60q915a8qg590c55mjprf7w5w4cdlcjg1gz6wqq9kdjam"; + version = "0.1.1.5"; + sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q"; + revision = "1"; + editedCabalFile = "0wmfv4dxjhjwsnkc8n7jfhbkvc7zwgcmkj7pvabmhcjzn5ch0dck"; libraryHaskellDepends = [ - base composition either megaparsec text text-show + base composition-prelude either megaparsec text text-show ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec text @@ -203711,6 +205463,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_0_9_7" = callPackage + ({ mkDerivation, base, colour, containers, hashable, hosc + , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit + , text, time, websockets + }: + mkDerivation { + pname = "tidal"; + version = "0.9.7"; + sha256 = "1b9005f9jf9pbiq5hwvqx4cw9c8hb8ygcpnb7qks4h5q6pf7yw6i"; + libraryHaskellDepends = [ + base colour containers hashable hosc mersenne-random-pure64 mtl + parsec safe text time websockets + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://tidalcycles.org/"; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -204037,11 +205809,11 @@ self: { ({ mkDerivation, base, old-locale, time }: mkDerivation { pname = "time-locale-compat"; - version = "0.1.1.3"; - sha256 = "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i"; + version = "0.1.1.4"; + sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj"; libraryHaskellDepends = [ base old-locale time ]; homepage = "https://github.com/khibino/haskell-time-locale-compat"; - description = "Compatibility of TimeLocale between old-locale and time-1.5"; + description = "Compatibile module for time-format locale"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -204375,28 +206147,26 @@ self: { "timemap" = callPackage ({ mkDerivation, base, containers, criterion, focus, hashable , list-t, QuickCheck, quickcheck-instances, stm, stm-containers - , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers + , tasty, tasty-quickcheck, time, unordered-containers }: mkDerivation { pname = "timemap"; - version = "0.0.6"; - sha256 = "00bg1b0fplnahwsv7bx63v90hq9w0idpf7s9wqhvl3fdjs9nl5zp"; - isLibrary = true; - isExecutable = true; + version = "0.0.7"; + sha256 = "06rx5q1b0r4chiiy9wi9k0q9qc4yxjk794hcq8dr7gpixgcrjjrg"; libraryHaskellDepends = [ base containers focus hashable list-t stm stm-containers time unordered-containers ]; testHaskellDepends = [ base containers focus hashable list-t QuickCheck - quickcheck-instances stm stm-containers tasty tasty-hunit - tasty-quickcheck time unordered-containers + quickcheck-instances stm stm-containers tasty tasty-quickcheck time + unordered-containers ]; benchmarkHaskellDepends = [ base containers criterion focus hashable list-t stm stm-containers time unordered-containers ]; - description = "A mutable hashmap, implicitly indexed by UTCTime"; + homepage = "https://github.com/athanclark/timemap#readme"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204770,8 +206540,8 @@ self: { }: mkDerivation { pname = "tinylog"; - version = "0.14.0"; - sha256 = "1skk59sxz2n96nv8vbc9yxla8m2jkj3ll8z5m0v78w0ih0bmcbrj"; + version = "0.14.1"; + sha256 = "01yz41l45qmc878gzhbchzkvr4ha2cfmvvjv31hwivgwgl8rcgni"; libraryHaskellDepends = [ base bytestring containers double-conversion fast-logger text transformers unix-time @@ -205310,8 +207080,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "2"; - editedCabalFile = "03kkavw01mlgaxgc0ifvldn8pkq2dfncrwqrf0r33ldggfzm6qm3"; + revision = "3"; + editedCabalFile = "1gqlxy3rwrgag4qbjkh1f2kya4gcy1x5ic9xn997nzc6yi334v7m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; homepage = "https://github.com/hvr/token-bucket"; @@ -205917,10 +207687,8 @@ self: { }: mkDerivation { pname = "tracetree"; - version = "0.1.0.1"; - sha256 = "05aigx15kyvy19gdzh9si2avl5a7g8c4yzrcp7sgy1d94dwypl0j"; - revision = "1"; - editedCabalFile = "0yppsjjvq2zpk9k3fpi7q9msww4biz6hn02waschca65s2gbc84y"; + version = "0.1.0.2"; + sha256 = "0ga78nkrfg2hlanqfd65il0yw596n7xy9jx76l7sffs438mx4wvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205949,8 +207717,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.1"; - sha256 = "0dcf3h140pwvyrfb0x6b4brp9bpr2p1krd1pvl014jvqak4q2q7d"; + version = "0.3"; + sha256 = "0n4ypg2g82ajnmvv94sgympvbwji0bkw5kmd4zfzrvzrdxq91yvh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -206019,6 +207787,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transaction" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, mono-traversable + , QuickCheck + }: + mkDerivation { + pname = "transaction"; + version = "0.1.1.3"; + sha256 = "1if04fm2kvkd25ksk1llqqkwaqy8y7pafbywmz70mrr68wrb2r6j"; + libraryHaskellDepends = [ base mono-traversable ]; + testHaskellDepends = [ + base doctest Glob hspec mono-traversable QuickCheck + ]; + homepage = "https://github.com/arowM/haskell-transaction#readme"; + description = "Monadic representation of transactions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transactional-events" = callPackage ({ mkDerivation, base, ListZipper, MonadPrompt, stm }: mkDerivation { @@ -206162,6 +207948,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-base_0_4_5_2" = callPackage + ({ mkDerivation, base, base-orphans, stm, transformers + , transformers-compat + }: + mkDerivation { + pname = "transformers-base"; + version = "0.4.5.2"; + sha256 = "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h"; + libraryHaskellDepends = [ + base base-orphans stm transformers transformers-compat + ]; + homepage = "https://github.com/mvv/transformers-base"; + description = "Lift computations from the bottom of a transformer stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-bifunctors" = callPackage ({ mkDerivation, base, mmorph, transformers }: mkDerivation { @@ -206186,20 +207989,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "transformers-compat_0_6_0_6" = callPackage - ({ mkDerivation, base, deriving-compat, ghc-prim, hspec, QuickCheck - , tagged, transformers - }: + "transformers-compat_0_6_1_6" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; - version = "0.6.0.6"; - sha256 = "0fdnc8qnm42llp3nyfmg7ij6wscrigb43x3f2w1d38dvjkycyags"; - revision = "1"; - editedCabalFile = "0spzhq7c53vrgxlnakavq2fag3zjss76fbmz1hkzgk5bcmk7mlq7"; + version = "0.6.1.6"; + sha256 = "0db1l90pp4f1b829b3gv6xxklc8cnhkqq383rzd7r9b4hyjdvpmx"; libraryHaskellDepends = [ base ghc-prim transformers ]; - testHaskellDepends = [ - base deriving-compat hspec QuickCheck tagged transformers - ]; homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim for the transformers library"; license = stdenv.lib.licenses.bsd3; @@ -206329,6 +208125,8 @@ self: { pname = "transformers-lift"; version = "0.2.0.1"; sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b"; + revision = "1"; + editedCabalFile = "1dy9vg0drkm9ria80hlfx6v72ji2fwmv3ik7lryv7i7hk0bdzk8l"; libraryHaskellDepends = [ base transformers writer-cps-transformers ]; @@ -206727,6 +208525,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tree-traversals" = callPackage + ({ mkDerivation, base, containers, doctest, mtl }: + mkDerivation { + pname = "tree-traversals"; + version = "0.1.0.0"; + sha256 = "0wdy1p94096qdc00w8pmbz6qcawc0ivlhy0sg0b3jir0s2ksdccb"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest mtl ]; + homepage = "https://github.com/rampion/tree-traversals"; + description = "Functions and newtype wrappers for traversing Trees"; + license = stdenv.lib.licenses.cc0; + }) {}; + "tree-view" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -207672,6 +209483,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "turn-loop" = callPackage + ({ mkDerivation, base, containers, stm }: + mkDerivation { + pname = "turn-loop"; + version = "0.1.0"; + sha256 = "180yplkjf0c4n17a5ad2pakjwnh7830rldzmaqjj7gwcl3pg0lc6"; + libraryHaskellDepends = [ base containers stm ]; + homepage = "https://github.com/jxv/turn-loop#readme"; + description = "Manage multiple turned-based sessions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "turni" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -207695,29 +209518,6 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.6"; - sha256 = "1cx25845i4n00xjb5dg9jg1p229nra0j5r2jwpwarra5c092df2p"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process semigroups stm system-fileio - system-filepath temporary text time transformers unix unix-compat - ]; - testHaskellDepends = [ base doctest system-filepath temporary ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_5_7" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, foldl - , hostname, managed, optional-args, optparse-applicative, process - , semigroups, stm, system-fileio, system-filepath, temporary, text - , time, transformers, unix, unix-compat - }: - mkDerivation { - pname = "turtle"; version = "1.5.7"; sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk"; libraryHaskellDepends = [ @@ -207730,7 +209530,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -207814,22 +209613,24 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, lens, megaparsec + , http-client, http-client-tls, http-types, megaparsec, microlens , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.35"; - sha256 = "1rg7yn5072dr8kpd5m3c4p1brq9sbs2npvvyqkjpvfxsbyziblw7"; + version = "1.0.1.36"; + sha256 = "1gmp1936cmz42vf8m3622pjf6gb9c2pi8z0jfki1di9m1p1lbr53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default directory extra - htoml-megaparsec http-client http-client-tls http-types lens - megaparsec optparse-applicative split text unordered-containers + composition-prelude containers data-default extra htoml-megaparsec + http-client http-client-tls http-types megaparsec microlens split + text unordered-containers + ]; + executableHaskellDepends = [ + base bytestring directory optparse-applicative ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; @@ -208879,19 +210680,21 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion - , double-conversion, ghc-prim, hspec, QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq + , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck + , random, temporary, text, weigh }: mkDerivation { pname = "type-of-html"; - version = "1.3.3.0"; - sha256 = "0q3r2imr63nv7l08w6q850xqak4gwzvk43qv1vq8x9qwdaf1nisv"; + version = "1.3.4.0"; + sha256 = "11drppw8xl3wzjj5qks8mqrbl83yrj7c4r01s06v38bc319g8ksf"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion QuickCheck text + base blaze-html bytestring criterion deepseq ghc ghc-paths random + temporary text weigh ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; @@ -209048,6 +210851,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "type-tree" = callPackage + ({ mkDerivation, base, base-compat, Cabal, cabal-doctest + , containers, doctest, mtl, pretty, template-haskell, zenc + }: + mkDerivation { + pname = "type-tree"; + version = "0.2.0.1"; + sha256 = "1gwa8dklc9hipgwcx068p4a49m9hgjh97qp5q3p5yai6jdg24j94"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat containers mtl pretty template-haskell zenc + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/pikajude/type-tree"; + description = "Tree representations of datatypes"; + license = stdenv.lib.licenses.mit; + }) {}; + "type-unary" = callPackage ({ mkDerivation, applicative-numbers, base, constraints, newtype , ty, vector-space @@ -209103,26 +210924,6 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.1.0"; - sha256 = "1l6wpkwnz4lriq1n0hxv3mdvzmrf44ddkb1ys8cyj3ywfn2xh56j"; - libraryHaskellDepends = [ - async base bytestring process stm transformers - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers - ]; - homepage = "https://haskell-lang.org/library/typed-process"; - description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typed-process_0_2_2_0" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers - }: - mkDerivation { - pname = "typed-process"; version = "0.2.2.0"; sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2"; libraryHaskellDepends = [ @@ -209135,7 +210936,6 @@ self: { homepage = "https://haskell-lang.org/library/typed-process"; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -209267,13 +211067,18 @@ self: { }) {}; "typelevel" = callPackage - ({ mkDerivation, base, pretty, pretty-show }: + ({ mkDerivation, base, constraints, convert, exceptions, lens, mtl + , pretty, pretty-show, primitive, transformers + }: mkDerivation { pname = "typelevel"; - version = "1.0.4"; - sha256 = "1hhx8zgsxpd5y2lp72c7dpyp7p678fjp63cqd14wiy9cdqd17j0w"; - libraryHaskellDepends = [ base pretty pretty-show ]; - homepage = "https://github.com/wdanilo/typelevel"; + version = "1.2.2"; + sha256 = "0baigk89rd5cdy35v3abvdwh7g11fnz2rpnzfy4ahr0q1lj395f5"; + libraryHaskellDepends = [ + base constraints convert exceptions lens mtl pretty pretty-show + primitive transformers + ]; + homepage = "https://github.com/luna/typelevel"; description = "Useful type level operations (type families and related operators)"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -209304,8 +211109,8 @@ self: { }: mkDerivation { pname = "typelits-witnesses"; - version = "0.3.0.1"; - sha256 = "0d2537dwz5kiq81amrj2v00bvlwjfkidlz45g1h96zv78mlw1l7c"; + version = "0.3.0.2"; + sha256 = "0k76ir1c6ga44cj3qmjcsnikzz2nnb2kyzkcirb3ila7yfgwc9kf"; libraryHaskellDepends = [ base base-compat constraints reflection transformers ]; @@ -209471,34 +211276,6 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.3.0"; - sha256 = "1h2w9pswfbnzpdm30xpgknhvfb1vs8ipyczpslrbsv6v6xhqh44p"; - libraryHaskellDepends = [ - base binary bytestring containers data-default deepseq - template-haskell time tzdata vector - ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th time tzdata - ]; - benchmarkHaskellDepends = [ - base criterion lens thyme time timezone-olson timezone-series - ]; - preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - homepage = "https://github.com/nilcons/haskell-tz"; - description = "Efficient time zone handling"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "tz_0_1_3_1" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, thyme, time, timezone-olson, timezone-series - , tzdata, vector - }: - mkDerivation { - pname = "tz"; version = "0.1.3.1"; sha256 = "1ygzrkx01y1x729y7x2fs81gpcw69q6ijy4fxq00xsb0gff74m0b"; libraryHaskellDepends = [ @@ -209516,7 +211293,6 @@ self: { homepage = "https://github.com/nilcons/haskell-tz"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tzdata" = callPackage @@ -209939,8 +211715,8 @@ self: { }: mkDerivation { pname = "unagi-bloomfilter"; - version = "0.1.1.0"; - sha256 = "03ssvfcn2a6bwpifajrvd2bncb2ikim2zwg56xbjihn0hg2dinsc"; + version = "0.1.1.2"; + sha256 = "0i1dz2cb8ikgbqan8kg6gwnyyn3sp2g182xkx8anj6lxqjnzcckf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210422,21 +212198,20 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq - , filepath, getopt-generics, optparse-applicative, path, path-io + ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath + , gauge, getopt-generics, optparse-applicative, path, path-io , QuickCheck, split, text }: mkDerivation { pname = "unicode-transforms"; - version = "0.3.3"; - sha256 = "04ga6dhsz9x279w3ik2sjphgmr8s6y0wd0bpg37ymn5mxp68lx2r"; + version = "0.3.4"; + sha256 = "0lh8bj6kxvpkmc14qa34vdrmcsis82mvnq6gs11ddqyjlz5sr7l2"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text ]; benchmarkHaskellDepends = [ - base criterion deepseq filepath optparse-applicative path path-io - text + base deepseq filepath gauge optparse-applicative path path-io text ]; homepage = "http://github.com/harendra-kumar/unicode-transforms"; description = "Unicode normalization"; @@ -210596,6 +212371,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uniprot-kb" = callPackage + ({ mkDerivation, attoparsec, base, hspec, neat-interpolation + , QuickCheck, text + }: + mkDerivation { + pname = "uniprot-kb"; + version = "0.1.1.2"; + sha256 = "15mlmappp5k8lamgmpkmyahi5vimxk3a1821c6cabs28r4d9rywy"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base hspec neat-interpolation QuickCheck text + ]; + homepage = "https://github.com/biocad/uniprot-kb#readme"; + description = "UniProt-KB format parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uniq-deep" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -211187,27 +212979,6 @@ self: { "unliftio" = callPackage ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , process, stm, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.5.0"; - sha256 = "0c08i5vnhjw28i321dpjap1a9jz3g85gq2zm39v8pl6w89ilcq81"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm transformers unix - unliftio-core - ]; - testHaskellDepends = [ - async base deepseq directory filepath hspec process stm - transformers unix unliftio-core - ]; - homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_6_0" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec , process, stm, time, transformers, unix, unliftio-core }: mkDerivation { @@ -211225,7 +212996,6 @@ self: { homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -211242,6 +213012,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio-pool" = callPackage + ({ mkDerivation, base, resource-pool, time, transformers + , unliftio-core + }: + mkDerivation { + pname = "unliftio-pool"; + version = "0.1.0.0"; + sha256 = "13l0shpg0hmfp5n4rqfd6vl2x820w3558msy915qacbxfqvjis4x"; + libraryHaskellDepends = [ + base resource-pool time transformers unliftio-core + ]; + description = "Data.Pool generalized to MonadUnliftIO."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unlit" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -211377,6 +213162,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unpacked-containers" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, ghc-prim }: + mkDerivation { + pname = "unpacked-containers"; + version = "0"; + sha256 = "17hm6r84kark7akn18lsvb0z6q5hcy4ap89nbkhxfhkchrqc6bfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default-class deepseq ghc-prim + ]; + executableHaskellDepends = [ base ]; + doHaddock = false; + homepage = "http://github.com/ekmett/unpacked-containers/"; + description = "Unpacked containers via backpack"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "unroll-ghc-plugin" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -212014,6 +213817,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "urlpath_8_1_0" = callPackage + ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph + , monad-control, monad-control-aligned, monad-logger, mtl + , path-extra, resourcet, split, strict, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "urlpath"; + version = "8.1.0"; + sha256 = "0gv5mjhhmxq5zppda431vddpcl138qglxiyksj588d4zzg3kd8iy"; + libraryHaskellDepends = [ + attoparsec-uri base exceptions mmorph monad-control + monad-control-aligned monad-logger mtl path-extra resourcet split + strict text transformers transformers-base vector + ]; + homepage = "https://github.com/athanclark/urlpath#readme"; + description = "Painfully simple URL deployment"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "urn" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -212071,8 +213895,8 @@ self: { }: mkDerivation { pname = "usb"; - version = "1.3.0.5"; - sha256 = "0r3v6w0nqcwz2vcaz0pdkfb8fs4ry2nlg9pfy77avv7mjwlvp7r1"; + version = "1.3.0.6"; + sha256 = "1ipjcm8kxhi0lhqhypnppn5jk7z70rnrybawxwhdij9gj4jz3bhh"; libraryHaskellDepends = [ base bindings-libusb bytestring containers ghc-prim text vector ]; @@ -212175,8 +213999,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.1"; - sha256 = "12alrvzh1z15md5gbvci58xffw35g4626qr30v7cz6sz4pplfnb9"; + version = "0.1.3.2"; + sha256 = "0ym8r3jg7waypc74liv1v32sc1rv419axgbz97xznssb9wshcv3a"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -213561,6 +215385,8 @@ self: { pname = "vec"; version = "0.1"; sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y"; + revision = "1"; + editedCabalFile = "0ffzb4jps0grlpbq99vx30cp4g7mad87mwcng3s1w6xqa96xr6xh"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens semigroupoids @@ -213940,8 +215766,8 @@ self: { ({ mkDerivation, base, random, vector }: mkDerivation { pname = "vector-shuffling"; - version = "1"; - sha256 = "19brlcbxha2mpmciabjw1npdi2xcpvfhd8wjn2ssfcdl0pd2n2ln"; + version = "1.1"; + sha256 = "04kpp7529jd4avhprfxdy6nfikx3d3ans0knhz3lspms4iky068i"; libraryHaskellDepends = [ base random vector ]; homepage = "https://github.com/metrix-ai/vector-shuffling"; description = "Algorithms for vector shuffling"; @@ -213954,6 +215780,8 @@ self: { pname = "vector-sized"; version = "0.6.1.0"; sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd"; + revision = "1"; + editedCabalFile = "0lcm7gdzqnp5v0rfd9f611yspa493j4azdj3gzy71398z3zda5w4"; libraryHaskellDepends = [ base deepseq finite-typelits vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -214074,6 +215902,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-text" = callPackage + ({ mkDerivation, base, binary, prologue, text, vector + , vector-binary-instances + }: + mkDerivation { + pname = "vector-text"; + version = "1.1.1"; + sha256 = "0hwis2xqj86j3smk9dnq9rpf8hraxzjczpajbkzma50g2kagj5r8"; + libraryHaskellDepends = [ + base binary prologue text vector vector-binary-instances + ]; + homepage = "https://github.com/luna/vector-text"; + description = "Text implementation based on unboxed char vector"; + license = stdenv.lib.licenses.asl20; + }) {}; + "vector-th-unbox" = callPackage ({ mkDerivation, base, data-default, template-haskell, vector }: mkDerivation { @@ -214118,6 +215962,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vectortiles_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hashable, hex, microlens, microlens-platform, mtl + , protocol-buffers, protocol-buffers-descriptor, tasty, tasty-hunit + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "vectortiles"; + version = "1.4.0"; + sha256 = "1h0mx5sl379486panyxpanld8qrlhak9knhz7jzqqv7is3rw8g1r"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable mtl protocol-buffers + protocol-buffers-descriptor text transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers hashable hex mtl protocol-buffers + protocol-buffers-descriptor tasty tasty-hunit text + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion hashable microlens + microlens-platform mtl protocol-buffers protocol-buffers-descriptor + text unordered-containers vector + ]; + homepage = "https://github.com/fosskers/vectortiles"; + description = "GIS Vector Tiles, as defined by Mapbox"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -214225,23 +216100,6 @@ self: { }: mkDerivation { pname = "versions"; - version = "3.3.1"; - sha256 = "0d94gkhx8b1w34mw05sidwvmysyb1z3p985nrrfaqzsp4xjqg0h4"; - libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; - testHaskellDepends = [ - base checkers microlens QuickCheck tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "versions_3_3_2" = callPackage - ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec - , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "versions"; version = "3.3.2"; sha256 = "1w4b6a9dvl69bw132nic40a65y2142z1qzzg1qxgylwarfwqmsfg"; libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; @@ -214251,7 +216109,6 @@ self: { ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vgrep" = callPackage @@ -214344,8 +216201,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.15"; - sha256 = "10ihmdba4rbji13lihmxf2yw77nii63k4mz6a0d03lzcw2bppr1a"; + version = "0.0.0.16"; + sha256 = "123dqm0rardrvvvrj8sjjs9z8yysk9qzwvrs3skqzxrq5pffyarp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -215127,11 +216984,11 @@ self: { ({ mkDerivation, base, ghc-prim, vulkan }: mkDerivation { pname = "vulkan-api"; - version = "0.1.0.1"; - sha256 = "192bid9aqndn7lh3vdvk2mhqc76z5fw2z4v362n2bjhdaadwipld"; + version = "1.1.0.0"; + sha256 = "038iaiy16cyb0g6xhgax8333lz0y4jfmv4r8dqvvmnnmhiak5j8x"; libraryHaskellDepends = [ base ghc-prim ]; librarySystemDepends = [ vulkan ]; - homepage = "https://github.com/achirkin/genvulkan#readme"; + homepage = "https://github.com/achirkin/vulkan#readme"; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -215209,25 +217066,6 @@ self: { }) {}; "wai" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring - , bytestring-builder, hspec, http-types, network, text - , transformers, vault - }: - mkDerivation { - pname = "wai"; - version = "3.2.1.1"; - sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x"; - libraryHaskellDepends = [ - base blaze-builder bytestring bytestring-builder http-types network - text transformers vault - ]; - testHaskellDepends = [ base blaze-builder bytestring hspec ]; - homepage = "https://github.com/yesodweb/wai"; - description = "Web Application Interface"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai_3_2_1_2" = callPackage ({ mkDerivation, base, bytestring, hspec, hspec-discover , http-types, network, text, transformers, vault }: @@ -215243,7 +217081,6 @@ self: { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-accept-language" = callPackage @@ -215298,40 +217135,6 @@ self: { }) {}; "wai-app-static" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, cryptonite, directory, file-embed - , filepath, hspec, http-date, http-types, memory, mime-types - , mockery, network, old-locale, optparse-applicative - , template-haskell, temporary, text, time, transformers - , unix-compat, unordered-containers, wai, wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.6.1"; - sha256 = "0s36i0ca440l78d35isaam98z9x0dc0llx0ry48r901f3vrsq65k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - cryptonite directory file-embed filepath http-date http-types - memory mime-types old-locale optparse-applicative template-haskell - text time transformers unix-compat unordered-containers wai - wai-extra warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - mockery network old-locale temporary text time transformers - unix-compat wai wai-extra zlib - ]; - homepage = "http://www.yesodweb.com/book/web-application-interface"; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-app-static_3_1_6_2" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , containers, cryptonite, directory, file-embed, filepath, hspec , http-date, http-types, memory, mime-types, mockery, network @@ -215363,7 +217166,6 @@ self: { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-cli" = callPackage @@ -215386,22 +217188,6 @@ self: { }) {}; "wai-conduit" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , http-types, transformers, wai - }: - mkDerivation { - pname = "wai-conduit"; - version = "3.0.0.3"; - sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4"; - libraryHaskellDepends = [ - base blaze-builder bytestring conduit http-types transformers wai - ]; - homepage = "https://github.com/yesodweb/wai"; - description = "conduit wrappers for WAI"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-conduit_3_0_0_4" = callPackage ({ mkDerivation, base, bytestring, conduit, http-types , transformers, wai }: @@ -215415,7 +217201,6 @@ self: { homepage = "https://github.com/yesodweb/wai"; description = "conduit wrappers for WAI"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-cors" = callPackage @@ -215685,6 +217470,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-handler-launch_3_0_2_4" = callPackage + ({ mkDerivation, async, base, bytestring, http-types, process + , streaming-commons, transformers, wai, warp + }: + mkDerivation { + pname = "wai-handler-launch"; + version = "3.0.2.4"; + sha256 = "0019vz9ha2mvliz3drjbj62v26mwhl9bl1vqr06ki40865hrr78f"; + libraryHaskellDepends = [ + async base bytestring http-types process streaming-commons + transformers wai warp + ]; + description = "Launch a web app in the default browser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-handler-scgi" = callPackage ({ mkDerivation, base, bytestring, wai, wai-extra }: mkDerivation { @@ -216114,8 +217916,8 @@ self: { }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.6.0"; - sha256 = "19c5sjrgfvc12f020cssr4ydsd7ib9wxabm594mn9z32sq6qv4f8"; + version = "0.6.1.1"; + sha256 = "08lcbyycgr2mb8i00ncph38r0yixx6nn5yfkvv96700wfn0338q4"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions extractable-singleton hashable http-media http-types lucid mmorph @@ -216131,6 +217933,7 @@ self: { transformers transformers-base unordered-containers urlpath wai wai-logger wai-transformers warp ]; + homepage = "https://github.com/athanclark/wai-middleware-content-type#readme"; description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -216381,22 +218184,18 @@ self: { "wai-middleware-static" = callPackage ({ mkDerivation, base, bytestring, containers, cryptonite - , directory, expiring-cache-map, filepath, hpc-coveralls - , http-types, memory, mime-types, mtl, old-locale, semigroups, text - , time, wai + , directory, expiring-cache-map, filepath, http-types, memory + , mime-types, mtl, old-locale, semigroups, text, time, wai }: mkDerivation { pname = "wai-middleware-static"; - version = "0.8.1"; - sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; - revision = "5"; - editedCabalFile = "1lb4whil5x1arjb3503x8j9i3wmf678ii1dx0paqqx7dchs6cfwl"; + version = "0.8.2"; + sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups text time wai ]; - testHaskellDepends = [ base hpc-coveralls ]; homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; @@ -216463,22 +218262,24 @@ self: { }) {}; "wai-middleware-verbs" = callPackage - ({ mkDerivation, base, errors, exceptions, hashable, http-types - , mmorph, monad-logger, mtl, resourcet, transformers - , transformers-base, unordered-containers, wai + ({ mkDerivation, base, bytestring, exceptions, hashable, http-types + , mmorph, monad-control, monad-control-aligned, monad-logger, mtl + , resourcet, transformers, transformers-base, unordered-containers + , wai, wai-transformers }: mkDerivation { pname = "wai-middleware-verbs"; - version = "0.3.2"; - sha256 = "0rma394hfpycaqfyr9bpal2v27559hrm7yd83x7dh13jv9zsj7v9"; - isLibrary = true; - isExecutable = true; + version = "0.4.0.1"; + sha256 = "1x4x41b1gbr2xvfw1q766wcvdl13wwv9spa9zxvjdykg71knnw93"; libraryHaskellDepends = [ - base errors exceptions hashable http-types mmorph monad-logger mtl - resourcet transformers transformers-base unordered-containers wai + base bytestring exceptions hashable http-types mmorph monad-control + monad-control-aligned monad-logger mtl resourcet transformers + transformers-base unordered-containers wai wai-transformers ]; - description = "Route different middleware responses based on the incoming HTTP verb"; + homepage = "https://github.com/athanclark/wai-middleware-verbs#readme"; + description = "Route Wai middlewares based on HTTP verbs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-predicates" = callPackage @@ -216902,31 +218703,6 @@ self: { }) {}; "wai-websockets" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , file-embed, http-types, network, text, transformers, wai - , wai-app-static, warp, websockets - }: - mkDerivation { - pname = "wai-websockets"; - version = "3.0.1.1"; - sha256 = "0ccasczm9x8sx6bpywd8ga3qji2rqkz1l2fy856qz7jdazmazgka"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types network - transformers wai websockets - ]; - executableHaskellDepends = [ - base blaze-builder bytestring case-insensitive file-embed - http-types network text transformers wai wai-app-static warp - websockets - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provide a bridge between WAI and the websockets package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-websockets_3_0_1_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, file-embed , http-types, network, text, transformers, wai, wai-app-static , warp, websockets @@ -216948,7 +218724,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge between WAI and the websockets package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wait-handle" = callPackage @@ -217086,41 +218861,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, case-insensitive, containers, directory, doctest - , gauge, ghc-prim, hashable, hspec, http-client, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.18.1"; - sha256 = "15narz2dawzqmc8sys9cigg2dnn4a681cn07cgnpbvlyadwi5bpn"; - libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - case-insensitive containers directory doctest ghc-prim hashable - hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck silently simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network unix unix-compat - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_18_2" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, doctest , gauge, ghc-prim, hashable, hspec, http-client, http-date @@ -217153,7 +218893,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -217235,20 +218974,17 @@ self: { "warped" = callPackage ({ mkDerivation, aeson, base, blaze-builder, conduit, http-types - , lifted-async, monad-control, preamble, shakers, uuid, wai - , wai-conduit, wai-cors, warp + , lifted-async, monad-control, preamble, uuid, wai, wai-conduit + , wai-cors, warp }: mkDerivation { pname = "warped"; - version = "0.0.3"; - sha256 = "11iw5shjclns2d8baj98scm4jc773fxyzbjwbvvs6scan9d31z7m"; - isLibrary = true; - isExecutable = true; + version = "0.0.4"; + sha256 = "0gvsqabl1kh0vkzqiijkndk77jdc6md2c2p1f8bilrliqq2p21gq"; libraryHaskellDepends = [ aeson base blaze-builder conduit http-types lifted-async monad-control preamble uuid wai wai-conduit wai-cors warp ]; - executableHaskellDepends = [ base shakers ]; homepage = "https://github.com/swift-nav/warped"; description = "Warp and Wai Library"; license = stdenv.lib.licenses.mit; @@ -217523,15 +219259,15 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.1"; - sha256 = "16iv72jyay844668rnzmk3w98ia5cdijg8hpzy7qdhc29n3p2kzf"; + version = "0.1.2"; + sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text transformers unordered-containers wai ]; testHaskellDepends = [ base bytestring HUnit network-uri text ]; - description = "Composable, reversible, efficient web routing based on invertible invariants and bijections"; + description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -217639,10 +219375,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.14"; - sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak"; - revision = "1"; - editedCabalFile = "061kp8rpmbpr9f9n3kja8160z209hwz42yy3kikn6b446rdc4pdr"; + version = "0.27.14.2"; + sha256 = "0jpps7ay2hw41595hlfrx5k4lh9p2nib02n3rhd1vphpbnf392xg"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -217736,8 +219470,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6.2"; - sha256 = "1j661bdl5nb7a02gvsi89dybzaczjynp3d6kxnrgc4jc41rwbgj8"; + version = "0.22.6.3"; + sha256 = "1zamjbvjxryc43wac95cdavbq4czjlfx5kgxykadx8sw63vfnk4x"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -218131,6 +219865,7 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage @@ -218335,23 +220070,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets-simple_0_1_1" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec - , monad-control, profunctors, stm, tasty, tasty-hspec, transformers - , vector, wai-transformers, websockets + "websockets-simple_0_1_2_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, exceptions + , extractable-singleton, hspec, monad-control-aligned, profunctors + , stm, tasty, tasty-hspec, transformers, vector, wai-transformers + , websockets }: mkDerivation { pname = "websockets-simple"; - version = "0.1.1"; - sha256 = "0hakr1vrfj0n3sgax08vsa1bcnddqkizr2fb9pjk9abhw4hn5k2y"; + version = "0.1.2.1"; + sha256 = "1g3cqbdycjx82px06xvh4q3jjnp71llzsw4v0s815933fgfcck54"; libraryHaskellDepends = [ - aeson async base bytestring exceptions monad-control profunctors - stm transformers vector wai-transformers websockets + aeson async base bytestring exceptions extractable-singleton + monad-control-aligned profunctors stm transformers vector + wai-transformers websockets ]; testHaskellDepends = [ - aeson async base bytestring exceptions hspec monad-control - profunctors stm tasty tasty-hspec transformers vector - wai-transformers websockets + aeson async base bytestring exceptions extractable-singleton hspec + monad-control-aligned profunctors stm tasty tasty-hspec + transformers vector wai-transformers websockets ]; homepage = "https://github.com/athanclark/websockets-simple#readme"; description = "Composable websockets clients"; @@ -218365,8 +220102,8 @@ self: { }: mkDerivation { pname = "websockets-snap"; - version = "0.10.2.4"; - sha256 = "003np9jn7ja1p9vays6sk7kmia1bhqjhsz53jy0k2na6fx7rnk99"; + version = "0.10.2.5"; + sha256 = "14kxk6x5pygxlyn6421lkmc3lld5r545zq5qx6098mgn6bg2yknj"; libraryHaskellDepends = [ base bytestring bytestring-builder io-streams mtl snap-core snap-server websockets @@ -218829,6 +220566,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind_0_1_2_0" = callPackage + ({ mkDerivation, base, containers, hspec, microlens, QuickCheck + , semigroups, stm, text, transformers + }: + mkDerivation { + pname = "wild-bind"; + version = "0.1.2.0"; + sha256 = "0c1nb713p11pd89ykwz76i60sk437q9cy48bingiiig1g9dfg3p6"; + libraryHaskellDepends = [ + base containers semigroups text transformers + ]; + testHaskellDepends = [ + base hspec microlens QuickCheck stm transformers + ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "Dynamic key binding framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wild-bind-indicator" = callPackage ({ mkDerivation, base, containers, gtk, text, transformers , wild-bind @@ -218884,6 +220641,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_2" = callPackage + ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl + , semigroups, stm, text, time, transformers, wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.2"; + sha256 = "0vf6jm5gw76hcrwrqmfrq8niwh4z5p2wg0j0rh74wn9vbs6cm8cl"; + libraryHaskellDepends = [ + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 + ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "X11-specific implementation for WildBind"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wilton-ffi" = callPackage ({ mkDerivation, aeson, base, bytestring }: mkDerivation { @@ -218919,8 +220697,8 @@ self: { pname = "windns"; version = "0.1.0.0"; sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c"; - revision = "1"; - editedCabalFile = "0kz6gv4dpppnnnyl57ibxi9gvykmkbmaz22yssx92mq306wbyimv"; + revision = "2"; + editedCabalFile = "19n1nb65mgz9rdp37z7sdmjxwcl2wnlrflqcwbhr99ly2anx0sy7"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library"; @@ -219383,13 +221161,13 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring , conduit, directory, filepath, http-types, lifted-async - , lifted-base, optparse-generic, preamble, process, shakers, time - , uuid, yaml + , lifted-base, optparse-generic, preamble, process, time, uuid + , yaml }: mkDerivation { pname = "wolf"; - version = "0.3.42"; - sha256 = "078pzdwhdxgqd5lszwszzcwxla17a51ikcvvas6791lvwx1ddg0d"; + version = "0.3.43"; + sha256 = "1iy9qbpwnnzq8d7fvpl8iqn8bc3iz44rvxi4ijjj5xd4z1w6i5fv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219397,7 +221175,7 @@ self: { filepath http-types lifted-async lifted-base preamble process time uuid yaml ]; - executableHaskellDepends = [ base optparse-generic shakers ]; + executableHaskellDepends = [ base optparse-generic ]; homepage = "https://github.com/swift-nav/wolf"; description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; @@ -220373,21 +222151,6 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.6"; - sha256 = "1g2k48mngg8fr6cvkimjr39jc83b87lva0320bwdnf19nyz1fy9y"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - homepage = "https://github.com/tfausak/wuss#readme"; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wuss_1_1_8" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; version = "1.1.8"; sha256 = "1isw32n4qdaip350928v7v7cph4p4sb28hva5vd3jvq4309n65df"; libraryHaskellDepends = [ @@ -220396,7 +222159,6 @@ self: { homepage = "https://github.com/tfausak/wuss#readme"; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wx" = callPackage @@ -220652,6 +222414,8 @@ self: { pname = "x509"; version = "1.7.3"; sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21"; + revision = "1"; + editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -220730,6 +222494,8 @@ self: { pname = "x509-validation"; version = "1.6.10"; sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n"; + revision = "1"; + editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring containers cryptonite data-default-class hourglass memory mtl pem x509 x509-store @@ -221319,8 +223085,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.7.1"; - sha256 = "029frrwin3qx9kdh4i32yfyp1nlacr5zsv9msp5x63k2xyw7p0fh"; + version = "0.7.2"; + sha256 = "00qigyz4nc23abawapxhw0sgmj9c5qplkkvyv6xxffanx9kh8mmj"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary-search bytestring conduit containers data-default deepseq errors extra filepath lens mtl @@ -222095,8 +223861,8 @@ self: { }: mkDerivation { pname = "xmlgen"; - version = "0.6.2.1"; - sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh"; + version = "0.6.2.2"; + sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text ]; @@ -222188,15 +223954,16 @@ self: { "xmobar" = callPackage ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring - , containers, dbus, directory, filepath, hinotify, HTTP, iwlib - , libmpd, libXpm, libXrandr, libXrender, mtl, old-locale, parsec - , process, regex-compat, stm, time, timezone-olson, timezone-series - , transformers, unix, utf8-string, wirelesstools, X11, X11-xft + , containers, dbus, directory, filepath, hinotify, hspec, HTTP + , iwlib, libmpd, libXpm, libXrandr, libXrender, mtl, old-locale + , parsec, process, regex-compat, stm, time, timezone-olson + , timezone-series, transformers, unix, utf8-string, wirelesstools + , X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.25"; - sha256 = "0382r4vzqkz76jlp2069rdbwf4gh1a22r9w4rkphcn5qflw0dlb6"; + version = "0.26"; + sha256 = "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; @@ -222209,6 +223976,10 @@ self: { executableSystemDepends = [ libXpm libXrandr libXrender wirelesstools ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec mtl old-locale + parsec process regex-compat stm time transformers unix X11 + ]; homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; @@ -223040,10 +224811,10 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.28"; - sha256 = "0swgkzkfrwj0ac7lssn8rnrdfmh3lcsdn5fbq2iwv55di6jbc0pp"; + version = "0.8.29"; + sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs"; revision = "1"; - editedCabalFile = "0f8vb5v0xfpsc02zqh9pzgv4fir93sgijk342lz5k872gscfjn62"; + editedCabalFile = "0hxmf36ydqr0gdwiagp57df7fxwhfy99r6s7mj861m8rflha0dks"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -223053,7 +224824,6 @@ self: { transformers unordered-containers vector ]; libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ aeson base base-compat bytestring conduit directory hspec HUnit mockery resourcet temporary text transformers unordered-containers @@ -223259,8 +225029,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "3"; - editedCabalFile = "1vh3v5hrd1y1m491g4h9p3c767h7kg3ffgi20vrafrg8i0r7hg3w"; + revision = "4"; + editedCabalFile = "1bqjfmssgg0jd6j5x727clk6wawbbh0hq8v0qpj4d5bfv4931pkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -223773,6 +225543,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_3" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-client-tls, http-conduit, http-types, memory + , mime-mail, network-uri, nonce, persistent, persistent-template + , random, resourcet, safe, shakespeare, template-haskell, text + , time, transformers, unliftio, unliftio-core, unordered-containers + , wai, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.3"; + sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory mime-mail network-uri nonce persistent persistent-template + random resourcet safe shakespeare template-haskell text time + transformers unliftio unliftio-core unordered-containers wai + yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -224078,8 +225879,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.4.0.1"; - sha256 = "0gwl2inbjzwmxdwx51r30yd32xa17rivzmsdf6jnim5q0gyzdh4j"; + version = "0.4.1.0"; + sha256 = "1p0sxgi7cl6lqzkx478zva2byzanna6jicdrgdns2p91cnw5hlh9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224363,6 +226164,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_3" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec + , hspec-expectations, http-types, HUnit, monad-logger, mtl, network + , old-locale, parsec, path-pieces, primitive, QuickCheck, random + , resourcet, safe, semigroups, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.3"; + sha256 = "0k2gwnbrpwwbna03bbi53fppgyn7x5g9167jyjcfyjb8qfn4pwxg"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq deepseq-generics directory fast-logger + http-types monad-logger mtl old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers unix-compat unliftio unordered-containers vector + wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces QuickCheck random resourcet shakespeare + streaming-commons template-haskell text transformers unliftio wai + wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -227703,10 +229545,10 @@ self: { }: mkDerivation { pname = "ztail"; - version = "1.2"; - sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk"; - revision = "4"; - editedCabalFile = "1x8vaflxrmkwqig8wvbbkc761l52y5h45sclnidm5zmwxrv1j3zd"; + version = "1.2.0.1"; + sha256 = "1gnxjk48jlz988k9mk5mc9hrfqj9wq4v7fbkk648ifmassxyx6wb"; + revision = "1"; + editedCabalFile = "1hsiq6k5rncq6qa9gax2d45vnb4q737sh8djch6b2bq6wc2vyg2d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -227718,14 +229560,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ztail_1_2_0_1" = callPackage + "ztail_1_2_0_2" = callPackage ({ mkDerivation, array, base, bytestring, filepath, hinotify , process, regex-posix, time, unix, unordered-containers }: mkDerivation { pname = "ztail"; - version = "1.2.0.1"; - sha256 = "1gnxjk48jlz988k9mk5mc9hrfqj9wq4v7fbkk648ifmassxyx6wb"; + version = "1.2.0.2"; + sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index fef827cd9a11..ff86e06979c1 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -162,6 +162,9 @@ rec { enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; }); disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; }); + enableExecutableProfiling = drv: overrideCabal drv (drv: { enableExecutableProfiling = true; }); + disableExecutableProfiling = drv: overrideCabal drv (drv: { enableExecutableProfiling = false; }); + enableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = true; }); disableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; }); @@ -230,8 +233,6 @@ rec { isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) { - configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; }); /* Build a source distribution tarball instead of using the source files @@ -260,7 +261,7 @@ rec { the cabal file are actually used. The first attrset argument can be used to configure the strictness - of this check and a list of ignored package names that would otherwise + of this check and a list of ignored package names that would otherwise cause false alarms. */ checkUnusedPackages = diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 9912d1bcde28..bde4f85f6784 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -136,13 +136,26 @@ let src = "${component}/${name}.cabal"; }; + # Adds a nix file as an input to the haskell derivation it + # produces. This is useful for callHackage / callCabal2nix to + # prevent the generated default.nix from being garbage collected + # (requiring it to be frequently rebuilt), which can be an + # annoyance. + callPackageKeepDeriver = src: args: + overrideCabal (self.callPackage src args) (orig: { + preConfigure = '' + # Generated from ${src} + ${orig.preConfigure or ""} + ''; + }); + in package-set { inherit pkgs stdenv callPackage; } self // { inherit mkDerivation callPackage haskellSrc2nix hackage2nix; inherit (haskellLib) packageSourceOverrides; - callHackage = name: version: self.callPackage (self.hackage2nix name version); + callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. callCabal2nix = name: src: args: let @@ -155,10 +168,8 @@ in package-set { inherit pkgs stdenv callPackage; } self // { then pkgs.lib.cleanSourceWith { inherit src filter; } else src; }; - in overrideCabal (self.callPackage expr args) (orig: { + in overrideCabal (callPackageKeepDeriver expr args) (orig: { inherit src; - preConfigure = - "# Generated from ${expr}\n${orig.preConfigure or ""}"; }); # : { root : Path diff --git a/pkgs/development/haskell-modules/patches/lzma-tests.patch b/pkgs/development/haskell-modules/patches/lzma-tests.patch index e4e327ab6bbc..db9e62ee3c5f 100644 --- a/pkgs/development/haskell-modules/patches/lzma-tests.patch +++ b/pkgs/development/haskell-modules/patches/lzma-tests.patch @@ -1,13 +1,11 @@ --- a/lzma.cabal +++ b/lzma.cabal -@@ -70,8 +70,8 @@ test-suite lzma-tests - , base - , bytestring +@@ -76,7 +76,7 @@ -- additional dependencies that require version bounds -- build-depends: HUnit >= 1.2 && <1.4 -- , QuickCheck >= 2.8 && <2.9 -+ build-depends: HUnit >= 1.2 && <2 -+ , QuickCheck >= 2.8 && <3 - , tasty >= 0.10 && <0.12 - , tasty-hunit == 0.9.* - , tasty-quickcheck >= 0.8.3.2 && < 0.9 + build-depends: HUnit >= 1.2 && <1.7 + , QuickCheck >= 2.8 && <2.11 +- , tasty >= 0.10 && <0.13 ++ , tasty >= 0.10 && <1.1 + , tasty-hunit >= 0.9 && <0.11 + , tasty-quickcheck >= 0.8.3.2 && <0.10 + diff --git a/pkgs/development/idris-modules/README.md b/pkgs/development/idris-modules/README.md index 005ed3602851..80b7ccefbcfa 100644 --- a/pkgs/development/idris-modules/README.md +++ b/pkgs/development/idris-modules/README.md @@ -1,39 +1 @@ -Idris packages -============== - -This directory contains build rules for idris packages. In addition, -it contains several functions to build and compose those packages. -Everything is exposed to the user via the `idrisPackages` attribute. - -callPackage ------------- - -This is like the normal nixpkgs callPackage function, specialized to -idris packages. - -builtins ---------- - -This is a list of all of the libraries that come packaged with Idris -itself. - -build-idris-package --------------------- - -A function to build an idris package. Its sole argument is a set like -you might pass to `stdenv.mkDerivation`, except `build-idris-package` -sets several attributes for you. See `build-idris-package.nix` for -details. - -build-builtin-package ----------------------- - -A version of `build-idris-package` specialized to builtin libraries. -Mostly for internal use. - -with-packages -------------- - -Bundle idris together with a list of packages. Because idris currently -only supports a single directory in its library path, you must include -all desired libraries here, including `prelude` and `base`. \ No newline at end of file +Moved to [/doc/languages-frameworks/idris.section.md](/doc/languages-frameworks/idris.section.md) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 7aac606fdfb2..b35f6032d5aa 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "clojure-${version}"; - version = "1.9.0.329"; + version = "1.9.0.358"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1g1mi75285z977vrqbihmmmrmdcnznxbw3r6wkzh571sc1yyrlrj"; + sha256 = "0fi5kni6rdqjy6qgklf4xf7p1pgbsrdwd17iy6lrlg2vb8n8nksp"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 967940ca184f..ee524feb4c6c 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -12,8 +12,8 @@ let }; in mkDerivation rec { - version = "18.3.4.7"; - sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l"; + version = "18.3.4.8"; + sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g"; patches = [ rmAndPwdPatch diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index aa8c941eb93b..d0ba1912e9a4 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { - version = "19.3.6.4"; - sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071"; + version = "19.3.6.6"; + sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg"; patches = [ # macOS 10.13 crypto fix from OTP-20.1.2 diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 8e955349f2d7..42aaed0b6590 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl }: mkDerivation rec { - version = "20.2.2"; - sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6"; + version = "20.3.2"; + sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 6c0a9c2d3755..968d9f1e8fb0 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.14"; + version = "2.4.15"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0an5ddfajg8jwdi1zdkpcz1g8ij1iyp0xh7zck2bl84j3pi4dj7r"; + sha256 = "1vaa1wjnaza04hvp1n4kh10hvxx8370liz2ndm908dqv9mxa6k5x"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index afd90397e232..2c9aec5b6952 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -27,12 +27,15 @@ nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; - propagatedBuildInputs = [ gmp boehmgc ] - # XXX: These ones aren't normally needed here, but since - # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add + propagatedBuildInputs = [ + gmp boehmgc + + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. Adding them here will add # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, # see below. - ++ [ libtool libunistring ]; + libtool libunistring + ]; enableParallelBuilding = true; @@ -70,11 +73,12 @@ postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" - + '' # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. - sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + + '' + sed -i "$out/lib/pkgconfig/guile"-*.pc \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index dc6e18ae1afd..3d5c51dc420b 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -28,12 +28,15 @@ nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; - propagatedBuildInputs = [ gmp boehmgc ] - # XXX: These ones aren't normally needed here, but since - # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add + propagatedBuildInputs = [ + gmp boehmgc + + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. Adding them here will add # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, # see below. - ++ [ libtool libunistring ]; + libtool libunistring + ]; enableParallelBuilding = true; @@ -66,11 +69,12 @@ postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" - + '' # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. - sed -i "$out/lib/pkgconfig/guile-2.2.pc" \ + + '' + sed -i "$out/lib/pkgconfig/guile"-*.pc \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index ea3974525a96..929827ce1120 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "joker-${version}"; - version = "0.8.9"; + version = "0.9.1"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "0ph5f3vc6x1qfh3zn3va2xqx3axv1i2ywbhxayk58p55fxblj5c9"; + sha256 = "10flfjnb9mz3dir3882agcs1lyr5qdpd9qfyvphrh08zr3jnb3hz"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 0cdc4770a983..acddbcfd303c 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; }; - nativeBuildInputs = [ readline ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ]; configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) ''; @@ -56,31 +56,6 @@ stdenv.mkDerivation rec { EOF ''; - crossAttrs = let - inherit (hostPlatform) isDarwin isMinGW; - in { - configurePhase = '' - makeFlagsArray=( - INSTALL_TOP=$out - INSTALL_MAN=$out/share/man/man1 - V=${luaversion} - R=${version} - ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' - ''} - ) - '' + stdenv.lib.optionalString isMinGW '' - installFlagsArray=( - TO_BIN="lua.exe luac.exe" - TO_LIB="liblua.a lua52.dll" - INSTALL_DATA="cp -d" - ) - ''; - } // stdenv.lib.optionalAttrs isDarwin { - postPatch = '' - sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile - ''; - }; - meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index ad1dfa8823cb..7f0703c62884 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; }; - nativeBuildInputs = [ readline ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else []; configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version}) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) cat ${./lua-5.3-dso.make} >> src/Makefile sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile @@ -55,31 +55,6 @@ stdenv.mkDerivation rec { EOF ''; - crossAttrs = let - inherit (hostPlatform) isDarwin isMinGW; - in { - configurePhase = '' - makeFlagsArray=( - INSTALL_TOP=$out - INSTALL_MAN=$out/share/man/man1 - V=${luaversion} - R=${version} - ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' - ''} - ) - '' + stdenv.lib.optionalString isMinGW '' - installFlagsArray=( - TO_BIN="lua.exe luac.exe" - TO_LIB="liblua.a lua52.dll" - INSTALL_DATA="cp -d" - ) - ''; - } // stdenv.lib.optionalAttrs isDarwin { - postPatch = '' - sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile - ''; - }; - meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e87d4e89a461..7cb9b4dea7f6 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -338,22 +338,22 @@ let in { php56 = generic { - version = "5.6.34"; - sha256 = "1kgjgkabhrm8ksmh6j3m59vm85n401mcn7inh03hnjzfijflk7z1"; + version = "5.6.35"; + sha256 = "14ivsxdny0s7qm9pf773pafs8xzlzzpmaz039lwymn11rblsfy7f"; }; php70 = generic { - version = "7.0.28"; - sha256 = "0zrw0saqlfv60f3nmff7288wqfhdsfiqns4ys3ii0drzc6s92m5f"; + version = "7.0.29"; + sha256 = "1g1z1nhnmq0idsb9rfb46cdddfimaacw3yal291i2ypzqpal54cq"; }; php71 = generic { - version = "7.1.15"; - sha256 = "1gfw3ab9pvv034l9xk7ry23xsdz9vcwksrvmzkjmsj79713sa5z1"; + version = "7.1.16"; + sha256 = "1rg7n12rd2v1p2yar615kqcdxpvphw3p89lpgajjgwy0qzwjm3il"; }; php72 = generic { - version = "7.2.3"; - sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa"; + version = "7.2.4"; + sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i"; }; } diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix index 1beff0ebd834..911078a5e340 100644 --- a/pkgs/development/interpreters/python/build-python-package-flit.nix +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -10,7 +10,7 @@ attrs // { buildInputs = [ flit ]; buildPhase = attrs.buildPhase or '' runHook preBuild - flit wheel + flit build --format wheel runHook postBuild ''; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 63a70b7496db..cc8f6228f623 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "4"; + minorVersion = "5"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1fna7g8jxzl4kd2pqmmqhva5724c5m920x3fsrpsgskaylmr76qm"; + sha256 = "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index e3aa3e8a6f5c..32d24fa88356 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}"; + wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}"; done ''; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index da271db2ff0e..392b4bf36051 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "6.99.14"; + version = "6.99.14.2"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "00r1l9rd9wj8zfh279n7sak894xxhxqp3rcwg41g0md8yfiysc4h"; + sha256 = "1cjaly5igks18lmmssph4d6b5q1b8qfav2s7x2agx1gybxyghv9n"; }; patches = [ diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 13184ad50e86..2d3509542135 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "150fgnjcmb06r3pa3mbsvb4iwnqlimjwdxgbs6p55zz6g8wbln7a"; + sha256 = "0d3cb6dw8jz7ijriqn3rlwin24gffczp69hl17pzxj1d5w57yj44"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 5017cb39602e..a7bfa545908a 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -19,7 +19,7 @@ in rec { m2Path = "/junit/junit/${version}"; meta = { - homepage = http://junit.org/junit4/; + homepage = https://junit.org/junit4/; description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index df9d126ad719..384178d2c8df 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://www.laszip.org; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 1d7d96f7536d..83a2ffc077c3 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL_gfx-${version}"; - version = "2.0.25"; + version = "2.0.26"; src = fetchurl { url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; - sha256 = "1h2rj34dxi5xlwpvm293v2d91gsirhnpzlmnjns9xwkcdg0fsvjm"; + sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; buildInputs = [ SDL ] ; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index eea18cd56385..f28ab55010b6 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -3,9 +3,7 @@ stdenv.mkDerivation { name = "Xaw3d-1.6.2"; src = fetchurl { - urls = [ - ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.2.tar.bz2 - ]; + url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2; sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index e7a90e405489..a50c92924e9a 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "accounts-qt-${version}"; - version = "1.13"; + version = "1.15"; src = fetchFromGitLab { - sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; - rev = version; + sha256 = "0cnra7g2mcgzh8ykrj1dpb4khkx676pzdr4ia1bvsp0cli48691w"; + rev = "VERSION_${version}"; repo = "libaccounts-qt"; owner = "accounts-sso"; }; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index d1b3b9b98271..f12dfb4635b2 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.45"; + version = "0.6.46"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv"; + sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 3c6f42e5cbf8..f9bb982a7842 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { patchPhase = '' echo "Removing C++-style comments from include/acl.h" sed -e '/^\/\//d' -i include/acl.h + + patchShebangs . ''; configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ZIP=gzip" "ECHO=echo" "SED=sed" "AWK=gawk" ]; diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index 25e6ff6667fe..0e4f1da6e140 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -21,5 +21,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ fuuzetsu ]; + broken = true; # 2018-04-11 }; }) diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index c7f5ac866609..ab3098580950 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib"; + configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no"; # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 3d90eb36f3d4..2276264e03f1 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "0vz7pda7n50d490vv9i044xpi8rhrvs6qxcapwd49wzwrvkg67dk"; + sha256 = "16cgzn8cz3qbfpfh53bhn4ibwp5ddam3vxgz8zaglbj7z1a3pxfv"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix deleted file mode 100755 index 8adbef8f5764..000000000000 --- a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{stdenv, fetchurl, arm-frc-linux-gnueabi-linux-api-headers}: - -let - _target = "arm-frc-linux-gnueabi"; - _basever = "2.21-r0.83"; - srcs = [ - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "117058215440e258027bb9ff18db63c078d55288787dbedfcd5730c06c7a1ae9"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-dev_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "e28b05d498c1160949f51539270035e12c5bb9d75d68df1f5f111a8fc087f3a6"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libcidn1_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "0f7372590abf69da54a9b7db8f944cf6c48d9ac8a091218ee60f84fdd9de2398"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "5a839498507a0b63165cb7a78234d7eb2ee2bb6a046bff586090f2e70e0e2bfb"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "d765d43c8ec95a4c64fa38eddf8cee848fd090d9cc5b9fcda6d2c9b03d2635c5"; - }) - ]; -in -stdenv.mkDerivation rec { - version = "2.21"; - name = "${_target}-eglibc-${version}"; - - sourceRoot = "."; - inherit srcs; - - phases = [ "unpackPhase" "installPhase" ]; - - unpackCmd = '' - ar x $curSrc - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/${_target} - rm -rf lib/eglibc - find . \( -name .install -o -name ..install.cmd \) -delete - cp -r lib $out/${_target} - cp -r usr $out/${_target} - - cp -r ${arm-frc-linux-gnueabi-linux-api-headers}/* $out - ''; - - meta = { - description = "FRC standard C lib"; - longDescription = '' - eglibc library for the NI RoboRio to be used in compiling frc user - programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - - priority = 2; - }; -} diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix deleted file mode 100755 index 29e349e0a820..000000000000 --- a/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{stdenv, fetchurl}: - -let - _target = "arm-frc-linux-gnueabi"; - _basever = "3.19-r0.36"; - src = fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/linux-libc-headers-dev_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "10066ddb9a19bf764a9a67919a7976478041e98c44c19308f076c78ecb07408c"; - }; -in -stdenv.mkDerivation rec { - version = "3.19"; - name = "${_target}-linux-api-headers-${version}"; - - sourceRoot = "."; - inherit src; - - phases = [ "unpackPhase" "installPhase" ]; - - unpackCmd = '' - ar x $curSrc - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/${_target} - find . \( -name .install -o -name ..install.cmd \) -delete - cp -r usr/ $out/${_target} - ''; - - meta = { - description = "FRC linux api headers"; - longDescription = '' - All linux api headers required to compile the arm-frc-linux-gnuaebi-gcc - cross compiler and all user programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - - priority = 1; - }; -} diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix new file mode 100644 index 000000000000..952f7435c069 --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -0,0 +1,44 @@ +{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }: + +stdenv.mkDerivation rec { + name = "arrow-cpp-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + }; + + sourceRoot = "apache-arrow-${version}/cpp"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost python.pkgs.python python.pkgs.numpy ]; + + preConfigure = '' + substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + ''; + + BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; }; + FLATBUFFERS_HOME = flatbuffers; + GTEST_HOME = gtest; + GFLAGS_HOME = gflags; + LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; + RAPIDJSON_HOME = rapidjson; + SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + ZSTD_HOME = zstd; + + cmakeFlags = [ + "-DARROW_PYTHON=ON" + ]; + + meta = { + description = "A cross-language development platform for in-memory data"; + homepage = https://arrow.apache.org/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index ad601359019e..1126b4a7f2c9 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.12.0"; + name = "asio-1.12.1"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "1bfk746kcs3cmvfvxjp3w9y6zpybjj8s002jjd3snrp2syd0nd9c"; + sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index b717101b3e13..6715a59579b5 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,10 +23,7 @@ stdenv.mkDerivation rec { # ToDo: on non-NixOS we create a symlink from there? configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; - NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; - meta = with stdenv.lib; { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index efbc94457bf5..63fd7a4986f9 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib -, fixDarwinDylibNames, libintlOrEmpty, gobjectIntrospection, gnome3 +, fixDarwinDylibNames, gobjectIntrospection, gnome3 }: let @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = libintlOrEmpty - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 0bfeaf81a81d..96fe5b89a18c 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; + postPatch = '' + for script in install-sh include/install-sh; do + patchShebangs $script + done + ''; + meta = with stdenv.lib; { homepage = "http://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 7057b020d429..4e316ff1c991 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 3e1edcdcfbfd..11005d6097af 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.15"; + version = "1.4.24"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "10nk8zbrh2sgw7cp03g8yqylyi29bb99w8v6dbw97pnxf689m635"; + sha256 = "1prkivapmzjcsykxj42h0p27kjhc66hir0h2j6rz0yqdfr4pyhgl"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index be4cf809f0c5..285f4dea802a 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.44"; + name = "babl-0.1.46"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0zfy1jrwdp4ja2f1rqa2m46vx6nilm73f72d4d1c8d65vshgsqzl"; + sha256 = "0nwyhvfca6m35wjcccvwca7fcihzgdfyc012qi703y5d3cxl1hmv"; }; doCheck = true; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index d3b6722b36cd..1e764aff4cc1 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,25 +2,17 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.15.3"; + version = "0.15.7"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2"; + sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb"; }; - # See https://github.com/actor-framework/actor-framework/issues/545 and remove on next release that incorporates this - patches = [ (fetchpatch { - url = "https://github.com/actor-framework/actor-framework/commit/c5a3ee26a6e76b28dd4226f35230b280f291386d.patch"; - sha256 = "1l0323cqyqlp3lvggm709fmfm6lk6av1smdbd420adhi3ksj2vhj"; - }) ]; - nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An open source implementation of the actor model in C++"; homepage = http://actor-framework.org/; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6aa184e4204e..6a7beb1cc1a8 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv -, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg +, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv - ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libintl + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText ApplicationServices diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 561be1ba2819..e45d74345d44 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -7,4 +7,11 @@ callPackage ./generic.nix (args // rec{ url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz"; sha256 = "0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; }; + + # Don't build tests due to badness with ec_ilog + prePatch = '' + substituteInPlace Makefile.in \ + --replace 'SUBDIRS = libcelt tests' \ + 'SUBDIRS = libcelt' + ''; }) diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 4ab554561f73..9d861f2c4328 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -1,5 +1,6 @@ { stdenv, version, src , liboggSupport ? true, libogg ? null # if disabled only the library will be built +, prePatch ? "" , ... }: @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { inherit src; + inherit prePatch; + buildInputs = [] ++ stdenv.lib.optional liboggSupport libogg; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 77e0cb7735d9..1e2017ef0e7f 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -12,11 +12,11 @@ assert runTests -> google-gflags != null; stdenv.mkDerivation rec { name = "ceres-solver-${version}"; - version = "1.12.0"; + version = "1.14.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "15f8mwhcy9f5qggcc9dqwl5y687ykvmlidr686aqdq0ia7azwnvl"; + sha256 = "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 1db991f63fee..ddaf022edfd4 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "check-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; - sha256 = "05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4"; + sha256 = "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix new file mode 100644 index 000000000000..31af37587821 --- /dev/null +++ b/pkgs/development/libraries/clipper/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, ninja, unzip }: + +stdenv.mkDerivation rec { + version = "6.4.2"; + name = "Clipper-${version}"; + src = fetchurl { + url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip"; + sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1"; + }; + + sourceRoot = "cpp"; + + buildInputs = [ ]; + + nativeBuildInputs = [ cmake ninja unzip ]; + + meta = with stdenv.lib; { + longDescription = '' + The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, + and line & polygon offsetting. The library is based on Vatti's clipping algorithm. + ''; + homepage = https://www.angusj.com/delphi/clipper.php; + license = licenses.boost; + maintainers = with maintainers; [ mpickering ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 6c73bd016031..81df7e863193 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.27.1"; + version = "0.28.3"; name = "cmark-${version}"; src = fetchFromGitHub { owner = "jgm"; repo = "cmark"; rev = version; - sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8"; + sha256 = "1lal6n6q7l84njgdcq1xbfxan56qlvr8xaw9m2jbd0jk4y2wkczg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 48b38c22af59..e06c71c15db4 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 +, mesa_noglu , gstreamerSupport ? true, gst_all_1 }: let pname = "cogl"; - version = "1.22.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.22.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ "--enable-introspection" @@ -24,10 +25,9 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection wayland + glib gdk_pixbuf gobjectIntrospection wayland mesa_noglu libGL libXrandr libXfixes libXcomposite libXdamage ] - ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; @@ -37,8 +37,6 @@ in stdenv.mkDerivation rec { = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - #doCheck = true; # all tests fail (no idea why) passthru = { diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index 95af4d94cf5f..3257dfe5d37c 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "confuse-2.7"; + name = "confuse-${version}"; + version = "3.2.1"; src = fetchurl { - url = "mirror://savannah/confuse/${name}.tar.gz"; - sha256 = "0y47r2ashz44wvnxdb18ivpmj8nxhw3y9bf7v9w0g5byhgyp89g3"; + url = "https://github.com/martinh/libconfuse/releases/download/v${version}/${name}.tar.xz"; + sha256 = "0pnjmlj9i0alp407qd7c0vq83sz7gpsjrbdgpcn4xvzjp9r35ii3"; }; meta = { diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index d316b5bf2d1e..aa8b4231a869 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libintlOrEmpty, zlib, gettext }: +{ stdenv, fetchurl, zlib, gettext }: stdenv.mkDerivation rec { name = "cracklib-2.9.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp"; }; - buildInputs = [ libintlOrEmpty zlib gettext ]; + buildInputs = [ zlib gettext ]; meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index aa2af9a2ebc3..55484b85a8e6 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.24"; - sha256 = "06ydmrg76l1kwl3190d72zpiy3qxy248x6gskxbj9qiqfsr4w63i"; + version = "1.12.6"; + sha256 = "05picaq8j60wlwyi84qvw5liw3nd0cws9va3krnc3pms0wm906v2"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/development/libraries/dbus/make-system-conf.xsl index 3d8b823437d6..dd644b4bce7c 100644 --- a/pkgs/development/libraries/dbus/make-system-conf.xsl +++ b/pkgs/development/libraries/dbus/make-system-conf.xsl @@ -27,6 +27,7 @@ <xsl:for-each select="str:tokenize($serviceDirectories)"> <servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir> <includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir> + <includedir><xsl:value-of select="." />/share/dbus-1/system.d</includedir> </xsl:for-each> </busconfig> </xsl:template> diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index d3e2f6c9c983..eaae1f7ecdad 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.10"; + version = "19.9"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0sgxblf4n33b8wgblyblmrkwydvy1yh7fzll1b6c4zgkz675w0m5"; + sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc"; }; postPatch = '' @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.dlib.net; license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 4aa1f279886a..89a34a988906 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; - version = "9.96.1"; + version = "9.96.2"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "1x5wwm62l1231sgxfwx8mj7fc8452j3f509jyxa9wd2krkpvqxmy"; + sha256 = "0qhf93i2ks9v6rk6n4v3fn7xrkqdwgs6rm6wd0gx9sm2wlq4ancd"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 81966f14a568..e0f8e9ff8c76 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -25,10 +25,9 @@ stdenv.mkDerivation rec { substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" ''; - # add libGL to rpath because libepoxy dlopen()s libEGL - postFixup = optionalString stdenv.isLinux '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libGL ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0 - ''; + patches = [ ./libgl-path.patch ]; + + NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; meta = { description = "A library for handling OpenGL function pointer management"; diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch new file mode 100644 index 000000000000..6f50b9d262b5 --- /dev/null +++ b/pkgs/development/libraries/epoxy/libgl-path.patch @@ -0,0 +1,35 @@ +From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 29 Mar 2018 07:21:02 -0500 +Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined. + +--- + src/dispatch_common.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/dispatch_common.c b/src/dispatch_common.c +index bc2fb94..776237b 100644 +--- a/src/dispatch_common.c ++++ b/src/dispatch_common.c +@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail) + pthread_mutex_lock(&api.mutex); + if (!*handle) { + *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL); ++#ifdef LIBGL_PATH ++ if (!*handle) { ++ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; ++ int l = snprintf(pathbuf, sizeof(pathbuf), "%s/%s", LIBGL_PATH, lib_name); ++ if (l < 0 || l >= sizeof(pathbuf)) { ++ // This really shouldn't happen ++ fprintf(stderr, "Error prefixing library pathname\n"); ++ exit(1); ++ } ++ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL); ++ } ++#endif + if (!*handle) { + if (exit_on_fail) { + fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); +-- +2.16.3 + diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index 3f309f06630b..7c0addea5e8b 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "farbfeld-${version}"; - version = "3"; + version = "4"; src = fetchgit { - url = "http://git.suckless.org/farbfeld"; + url = "https://git.suckless.org/farbfeld"; rev = "refs/tags/${version}"; - sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl"; + sha256 = "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870"; }; buildInputs = [ libpng libjpeg ]; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 59dc4721812c..903f43b1e685 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fdk-aac-${version}"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; - sha256 = "1msdkcf559agmpycd4bk0scm2s2h9jyzbnnw1yrfarxlcwm5jr11"; + sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma"; }; configureFlags = [ ] diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 67e364715f09..db39be465485 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -119,7 +119,7 @@ #, utvideo ? null # Ut Video de/encoder , vid-stab ? null # Video stabilization #, vo-aacenc ? null # AAC encoder -#, vo-amrwbenc ? null # AMR-WB encoder +, vo-amrwbenc ? null # AMR-WB encoder , wavpack ? null # Wavpack encoder , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder @@ -380,7 +380,7 @@ stdenv.mkDerivation rec { #(enableFeature (utvideo != null && gplLicensing) "libutvideo") (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") - #(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") + (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") (enableFeature (wavpack != null) "libwavpack") (enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x265 != null && gplLicensing) "libx265") @@ -405,7 +405,8 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr - samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib + samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + zeromq4 zlib ] ++ optional openglExtlib libGLU_combined ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 94cc7688cc8b..67bf7503db98 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -1,14 +1,51 @@ -{stdenv, fetchurl, gmp, mpir, mpfr, openblas, ntl}: +{ stdenv +, fetchurl +, fetchpatch +, gmp +, mpir +, mpfr +, ntl +, openblas ? null +, withBlas ? true +}: + +assert withBlas -> openblas != null; + stdenv.mkDerivation rec { name = "flint-${version}"; - version = "2.5.2"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + version = "2.5.2"; # remove libflint.so.MAJOR patch when updating src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; sha256 = "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb"; }; - buildInputs = [gmp mpir mpfr openblas ntl]; - configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-blas=${openblas} --with-ntl=${ntl}"; + buildInputs = [ + gmp + mpir + mpfr + ntl + ] ++ stdenv.lib.optionals withBlas [ + openblas + ]; + propagatedBuildInputs = [ + mpfr # flint.h includes mpfr.h + ]; + configureFlags = [ + "--with-gmp=${gmp}" + "--with-mpir=${mpir}" + "--with-mpfr=${mpfr}" + "--with-ntl=${ntl}" + ] ++ stdenv.lib.optionals withBlas [ + "--with-blas=${openblas}" + ]; + patches = [ + (fetchpatch { + # Always produce libflint.so.MAJOR; will be included in the next flint version + # See https://github.com/wbhart/flint2/pull/347 + url = "https://github.com/wbhart/flint2/commit/49fbcd8f736f847d3f9667f9f7d5567ef4550ecb.patch"; + sha256 = "09w09bpq85kjf752bd3y3i5lvy59b8xjiy7qmrcxzibx2a21pj73"; + }) + ]; + doCheck = true; meta = { inherit version; description = ''Fast Library for Number Theory''; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 88339e8a8bf3..c4dc57300446 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.02.26.00"; + version = "2018.03.26.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1pdb3nnly0x4x8yy1r13xgh9zhn34c9dq0b3nhxr8gwbzf643j1c"; + sha256 = "137d9b9k2m02r8f2w31qj3gc18hpm5g51bcl60g6vzdqzwzizzyr"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 1109582ad64f..29838fe1ffa1 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl, fetchpatch -, pkgconfig, freetype, expat, libxslt, dejavu_fonts +, pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , hostPlatform }: @@ -18,11 +18,12 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-2.12.1"; + name = "fontconfig-${version}"; + version = "2.12.6"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl"; + sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; }; patches = [ @@ -30,23 +31,12 @@ stdenv.mkDerivation rec { src = ./config-compat.patch; inherit configVersion; }) - (fetchpatch { - name = "glibc-2.25.diff"; - url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c"; - sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz"; - }) ]; - # additionally required for the glibc-2.25 patch; avoid requiring gperf - postPatch = '' - sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf} - sleep 2 - touch src/fcobjshash.h - ''; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gperf ]; buildInputs = [ expat ]; configureFlags = [ diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index b377061fe97e..2dd757bf8216 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fplll"; - version = "5.0.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "${pname}"; repo = "${pname}"; rev = "${version}"; - sha256 = "0rl98rx284giyhj3pf6iydn1a06jis8c8mnsc7kqs4rcmiw4bjpx"; + sha256 = "0931i4q49lzlifsg9zd8a2yzj626i1s2bqhkfxvcxv94c38s0nh1"; }; nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook]; buildInputs = [gmp mpfr]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index d764121e8d6b..b097e5cbb64c 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -6,11 +6,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.70"; + version = "1.00.80"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "1ydh0c89nb6wh6wakbkqad7mdwpymygvgbcrk8c2mp7abgv1jqzp"; + sha256 = "17s15avxcyhfk0zsj8rggizhpd2j2sa41w5xlnshzd2r3piqyl6k"; }; configureFlags = [ diff --git a/pkgs/development/libraries/freetype/cve-2017-8105.patch b/pkgs/development/libraries/freetype/cve-2017-8105.patch deleted file mode 100644 index dc4327a52a88..000000000000 --- a/pkgs/development/libraries/freetype/cve-2017-8105.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=f958c48ee43 - -diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c -index af7b465..7dd4513 100644 ---- a/src/psaux/t1decode.c -+++ b/src/psaux/t1decode.c -@@ -780,10 +780,19 @@ - /* point without adding any point to the outline */ - idx = decoder->num_flex_vectors++; - if ( idx > 0 && idx < 7 ) -+ { -+ /* in malformed fonts it is possible to have other */ -+ /* opcodes in the middle of a flex (which don't */ -+ /* increase `num_flex_vectors'); we thus have to */ -+ /* check whether we can add a point */ -+ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) ) -+ goto Syntax_Error; -+ - t1_builder_add_point( builder, - x, - y, - (FT_Byte)( idx == 3 || idx == 6 ) ); -+ } - } - break; - - diff --git a/pkgs/development/libraries/freetype/cve-2017-8287.patch b/pkgs/development/libraries/freetype/cve-2017-8287.patch deleted file mode 100644 index 7ccf4f3278b7..000000000000 --- a/pkgs/development/libraries/freetype/cve-2017-8287.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3774fc08b - -diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c -index d18e821..0baf836 100644 ---- a/src/psaux/psobjs.c -+++ b/src/psaux/psobjs.c -@@ -1718,6 +1718,14 @@ - first = outline->n_contours <= 1 - ? 0 : outline->contours[outline->n_contours - 2] + 1; - -+ /* in malformed fonts it can happen that a contour was started */ -+ /* but no points were added */ -+ if ( outline->n_contours && first == outline->n_points ) -+ { -+ outline->n_contours--; -+ return; -+ } -+ - /* We must not include the last point in the path if it */ - /* is located on the first point. */ - if ( outline->n_points > 1 ) - diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8f16f85cabf7..3fccce02def4 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, copyPathsToStore , hostPlatform -, pkgconfig, which +, pkgconfig, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -11,10 +11,10 @@ let inherit (stdenv.lib) optional optionals optionalString; - version = "2.7.1"; name = "freetype-" + version; -in stdenv.mkDerivation { - inherit name; +in stdenv.mkDerivation rec { + name = "freetype-${version}"; + version = "2.9"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,24 +33,17 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs"; + sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which ] + nativeBuildInputs = [ pkgconfig which makeWrapper ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; patches = - [ - ./pcf-introduce-driver.patch - ./pcf-config-long-family-names.patch - ./disable-pcf-long-family-names.patch - ./enable-table-validation.patch - # remove the two CVE patches after updating to >= 2.8 - ./cve-2017-8105.patch - ./cve-2017-8287.patch + [ ./enable-table-validation.patch ] ++ optional useEncumberedCode ./enable-subpixel-rendering.patch; @@ -65,7 +58,10 @@ in stdenv.mkDerivation { doCheck = true; - postInstall = glib.flattenInclude; + postInstall = glib.flattenInclude + '' + wrapProgram "$dev/bin/freetype-config" \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" + ''; crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead diff --git a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch deleted file mode 100644 index 95ed83c60f8f..000000000000 --- a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch +++ /dev/null @@ -1,553 +0,0 @@ -diff --git a/devel/ftoption.h b/devel/ftoption.h -index 3b63931..b8b0a8d 100644 ---- a/devel/ftoption.h -+++ b/devel/ftoption.h -@@ -82,8 +82,8 @@ FT_BEGIN_HEADER - /* to control the various font drivers and modules. The controllable */ - /* properties are listed in the section `Controlling FreeType Modules' */ - /* in the reference's table of contents; currently there are properties */ -- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ -- /* TrueType (file `ftttdrv.h'). */ -+ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ -+ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ - /* */ - /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ - /* multiple lines for better readability). */ -@@ -835,6 +835,33 @@ FT_BEGIN_HEADER - /*************************************************************************/ - /*************************************************************************/ - /**** ****/ -+ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ -+ /**** ****/ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ -+ -+ /*************************************************************************/ -+ /* */ -+ /* There are many PCF fonts just called `Fixed' which look completely */ -+ /* different, and which have nothing to do with each other. When */ -+ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ -+ /* random, the style changes often if one changes the size and one */ -+ /* cannot select some fonts at all. This option makes the PCF module */ -+ /* prepend the foundry name (plus a space) to the family name. */ -+ /* */ -+ /* We also check whether we have `wide' characters; all put together, we */ -+ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ -+ /* */ -+ /* If this option is activated, it can be controlled with the */ -+ /* `no-long-family-names' property of the pcf driver module. */ -+ /* */ -+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ /**** ****/ - /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ - /**** ****/ - /*************************************************************************/ -diff --git a/docs/CHANGES b/docs/CHANGES -index cb3b327..3823395 100644 ---- a/docs/CHANGES -+++ b/docs/CHANGES -@@ -1,4 +1,20 @@ - -+CHANGES BETWEEN 2.7.1 and 2.7.2 -+ -+ I. IMPORTANT CHANGES -+ -+ - The PCF change to show more `colourful' family names (introduced -+ in version 2.7.1) was too radical; it can now be configured with -+ PCF_CONFIG_OPTION_LONG_FAMILY_NAMES at compile time. If -+ activated, it can be switched off at run time with the new pcf -+ property `no-long-family-names'. If the `FREETYPE_PROPERTIES' -+ environment variable is available, you can say -+ -+ FREETYPE_PROPERTIES=pcf:no-long-family-names=1 -+ -+ -+====================================================================== -+ - CHANGES BETWEEN 2.7 and 2.7.1 - - I. IMPORTANT CHANGES -diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h -index 950d36c..d491af5 100644 ---- a/include/freetype/config/ftheader.h -+++ b/include/freetype/config/ftheader.h -@@ -357,6 +357,19 @@ - /************************************************************************* - * - * @macro: -+ * FT_PCF_DRIVER_H -+ * -+ * @description: -+ * A macro used in #include statements to name the file containing -+ * structures and macros related to the PCF driver module. -+ * -+ */ -+#define FT_PCF_DRIVER_H <freetype/ftpcfdrv.h> -+ -+ -+ /************************************************************************* -+ * -+ * @macro: - * FT_TYPE1_TABLES_H - * - * @description: -diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index f5bc540..5676074 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -82,8 +82,8 @@ FT_BEGIN_HEADER - /* to control the various font drivers and modules. The controllable */ - /* properties are listed in the section `Controlling FreeType Modules' */ - /* in the reference's table of contents; currently there are properties */ -- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ -- /* TrueType (file `ftttdrv.h'). */ -+ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ -+ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ - /* */ - /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ - /* multiple lines for better readability). */ -@@ -835,6 +835,33 @@ FT_BEGIN_HEADER - /*************************************************************************/ - /*************************************************************************/ - /**** ****/ -+ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ -+ /**** ****/ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ -+ -+ /*************************************************************************/ -+ /* */ -+ /* There are many PCF fonts just called `Fixed' which look completely */ -+ /* different, and which have nothing to do with each other. When */ -+ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ -+ /* random, the style changes often if one changes the size and one */ -+ /* cannot select some fonts at all. This option makes the PCF module */ -+ /* prepend the foundry name (plus a space) to the family name. */ -+ /* */ -+ /* We also check whether we have `wide' characters; all put together, we */ -+ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ -+ /* */ -+ /* If this option is activated, it can be controlled with the */ -+ /* `no-long-family-names' property of the pcf driver module. */ -+ /* */ -+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ /**** ****/ - /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ - /**** ****/ - /*************************************************************************/ -diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h -index ab43895..a0a121b 100644 ---- a/include/freetype/ftchapters.h -+++ b/include/freetype/ftchapters.h -@@ -77,6 +77,7 @@ - /* auto_hinter */ - /* cff_driver */ - /* tt_driver */ -+/* pcf_driver */ - /* */ - /***************************************************************************/ - -diff --git a/include/freetype/ftpcfdrv.h b/include/freetype/ftpcfdrv.h -new file mode 100644 -index 0000000..6622c93 ---- /dev/null -+++ b/include/freetype/ftpcfdrv.h -@@ -0,0 +1,105 @@ -+/***************************************************************************/ -+/* */ -+/* ftpcfdrv.h */ -+/* */ -+/* FreeType API for controlling the PCF driver (specification only). */ -+/* */ -+/* Copyright 2017 by */ -+/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -+/* */ -+/* This file is part of the FreeType project, and may only be used, */ -+/* modified, and distributed under the terms of the FreeType project */ -+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -+/* this file you indicate that you have read the license and */ -+/* understand and accept it fully. */ -+/* */ -+/***************************************************************************/ -+ -+ -+#ifndef FTPCFDRV_H_ -+#define FTPCFDRV_H_ -+ -+#include <ft2build.h> -+#include FT_FREETYPE_H -+ -+#ifdef FREETYPE_H -+#error "freetype.h of FreeType 1 has been loaded!" -+#error "Please fix the directory search order for header files" -+#error "so that freetype.h of FreeType 2 is found first." -+#endif -+ -+ -+FT_BEGIN_HEADER -+ -+ -+ /************************************************************************** -+ * -+ * @section: -+ * pcf_driver -+ * -+ * @title: -+ * The PCF driver -+ * -+ * @abstract: -+ * Controlling the PCF driver module. -+ * -+ * @description: -+ * While FreeType's PCF driver doesn't expose API functions by itself, -+ * it is possible to control its behaviour with @FT_Property_Set and -+ * @FT_Property_Get. Right now, there is a single property -+ * `no-long-family-names' available if FreeType is compiled with -+ * PCF_CONFIG_OPTION_LONG_FAMILY_NAMES. -+ * -+ * The PCF driver's module name is `pcf'. -+ * -+ */ -+ -+ -+ /************************************************************************** -+ * -+ * @property: -+ * no-long-family-names -+ * -+ * @description: -+ * If PCF_CONFIG_OPTION_LONG_FAMILY_NAMES is active while compiling -+ * FreeType, the PCF driver constructs long family names. -+ * -+ * There are many PCF fonts just called `Fixed' which look completely -+ * different, and which have nothing to do with each other. When -+ * selecting `Fixed' in KDE or Gnome one gets results that appear rather -+ * random, the style changes often if one changes the size and one -+ * cannot select some fonts at all. The improve this situation, the PCF -+ * module prepends the foundry name (plus a space) to the family name. -+ * It also checks whether there are `wide' characters; all put together, -+ * family names like `Sony Fixed' or `Misc Fixed Wide' are constructed. -+ * -+ * If `no-long-family-names' is set, this feature gets switched off. -+ * -+ * { -+ * FT_Library library; -+ * FT_Bool no_long_family_names = TRUE; -+ * -+ * -+ * FT_Init_FreeType( &library ); -+ * -+ * FT_Property_Set( library, "pcf", -+ * "no-long-family-names", -+ * &no_long_family_names ); -+ * } -+ * -+ * @note: -+ * This property can be used with @FT_Property_Get also. -+ * -+ * This property can be set via the `FREETYPE_PROPERTIES' environment -+ * variable (using values 1 and 0 for `on' and `off', respectively). -+ * -+ */ -+ -+ -+FT_END_HEADER -+ -+ -+#endif /* FTPCFDRV_H_ */ -+ -+ -+/* END */ -diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h -index 830cabe..f0390cb 100644 ---- a/src/pcf/pcf.h -+++ b/src/pcf/pcf.h -@@ -167,6 +167,8 @@ FT_BEGIN_HEADER - { - FT_DriverRec root; - -+ FT_Bool no_long_family_names; -+ - } PCF_DriverRec, *PCF_Driver; - - -diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c -index 8f4a90d..bc65423 100644 ---- a/src/pcf/pcfdrivr.c -+++ b/src/pcf/pcfdrivr.c -@@ -49,6 +49,8 @@ THE SOFTWARE. - - #include FT_SERVICE_BDF_H - #include FT_SERVICE_FONT_FORMAT_H -+#include FT_SERVICE_PROPERTIES_H -+#include FT_PCF_DRIVER_H - - - /*************************************************************************/ -@@ -667,6 +669,110 @@ THE SOFTWARE. - }; - - -+ /* -+ * PROPERTY SERVICE -+ * -+ */ -+ static FT_Error -+ pcf_property_set( FT_Module module, /* PCF_Driver */ -+ const char* property_name, -+ const void* value, -+ FT_Bool value_is_string ) -+ { -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ FT_Error error = FT_Err_Ok; -+ PCF_Driver driver = (PCF_Driver)module; -+ -+#ifndef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES -+ FT_UNUSED( value_is_string ); -+#endif -+ -+ -+ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) -+ { -+#ifdef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES -+ if ( value_is_string ) -+ { -+ const char* s = (const char*)value; -+ long lfn = ft_strtol( s, NULL, 10 ); -+ -+ -+ if ( lfn == 0 ) -+ driver->no_long_family_names = 0; -+ else if ( lfn == 1 ) -+ driver->no_long_family_names = 1; -+ else -+ return FT_THROW( Invalid_Argument ); -+ } -+ else -+#endif -+ { -+ FT_Bool* no_long_family_names = (FT_Bool*)value; -+ -+ -+ driver->no_long_family_names = *no_long_family_names; -+ } -+ -+ return error; -+ } -+ -+#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_UNUSED( module ); -+ FT_UNUSED( value ); -+ FT_UNUSED( value_is_string ); -+ -+#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_TRACE0(( "pcf_property_set: missing property `%s'\n", -+ property_name )); -+ return FT_THROW( Missing_Property ); -+ } -+ -+ -+ static FT_Error -+ pcf_property_get( FT_Module module, /* PCF_Driver */ -+ const char* property_name, -+ const void* value ) -+ { -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ FT_Error error = FT_Err_Ok; -+ PCF_Driver driver = (PCF_Driver)module; -+ -+ -+ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) -+ { -+ FT_Bool no_long_family_names = driver->no_long_family_names; -+ FT_Bool* val = (FT_Bool*)value; -+ -+ -+ *val = no_long_family_names; -+ -+ return error; -+ } -+ -+#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_UNUSED( module ); -+ FT_UNUSED( value ); -+ -+#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_TRACE0(( "pcf_property_get: missing property `%s'\n", -+ property_name )); -+ return FT_THROW( Missing_Property ); -+ } -+ -+ -+ FT_DEFINE_SERVICE_PROPERTIESREC( -+ pcf_service_properties, -+ -+ (FT_Properties_SetFunc)pcf_property_set, /* set_property */ -+ (FT_Properties_GetFunc)pcf_property_get ) /* get_property */ -+ -+ - /* - * - * SERVICE LIST -@@ -677,6 +783,7 @@ THE SOFTWARE. - { - { FT_SERVICE_ID_BDF, &pcf_service_bdf }, - { FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_PCF }, -+ { FT_SERVICE_ID_PROPERTIES, &pcf_service_properties }, - { NULL, NULL } - }; - -@@ -694,7 +801,14 @@ THE SOFTWARE. - FT_CALLBACK_DEF( FT_Error ) - pcf_driver_init( FT_Module module ) /* PCF_Driver */ - { -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ PCF_Driver driver = (PCF_Driver)module; -+ -+ -+ driver->no_long_family_names = 0; -+#else - FT_UNUSED( module ); -+#endif - - return FT_Err_Ok; - } -diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c -index 38ba110..3eacf2b 100644 ---- a/src/pcf/pcfread.c -+++ b/src/pcf/pcfread.c -@@ -1393,57 +1393,75 @@ THE SOFTWARE. - prop = pcf_find_property( face, "FAMILY_NAME" ); - if ( prop && prop->isString ) - { -- /* Prepend the foundry name plus a space to the family name. */ -- /* There are many fonts just called `Fixed' which look completely */ -- /* different, and which have nothing to do with each other. When */ -- /* selecting `Fixed' in KDE or Gnome one gets results that appear */ -- /* rather random, the style changes often if one changes the size */ -- /* and one cannot select some fonts at all. */ -- /* */ -- /* We also check whether we have `wide' characters; all put */ -- /* together, we get family names like `Sony Fixed' or `Misc Fixed */ -- /* Wide'. */ -- PCF_Property foundry_prop, point_size_prop, average_width_prop; -- -- int l = ft_strlen( prop->value.atom ) + 1; -- int wide = 0; -- -- -- foundry_prop = pcf_find_property( face, "FOUNDRY" ); -- point_size_prop = pcf_find_property( face, "POINT_SIZE" ); -- average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); -- -- if ( point_size_prop && average_width_prop ) -+ -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ PCF_Driver driver = (PCF_Driver)FT_FACE_DRIVER( face ); -+ -+ -+ if ( !driver->no_long_family_names ) - { -- if ( average_width_prop->value.l >= point_size_prop->value.l ) -+ /* Prepend the foundry name plus a space to the family name. */ -+ /* There are many fonts just called `Fixed' which look */ -+ /* completely different, and which have nothing to do with each */ -+ /* other. When selecting `Fixed' in KDE or Gnome one gets */ -+ /* results that appear rather random, the style changes often if */ -+ /* one changes the size and one cannot select some fonts at all. */ -+ /* */ -+ /* We also check whether we have `wide' characters; all put */ -+ /* together, we get family names like `Sony Fixed' or `Misc */ -+ /* Fixed Wide'. */ -+ -+ PCF_Property foundry_prop, point_size_prop, average_width_prop; -+ -+ int l = ft_strlen( prop->value.atom ) + 1; -+ int wide = 0; -+ -+ -+ foundry_prop = pcf_find_property( face, "FOUNDRY" ); -+ point_size_prop = pcf_find_property( face, "POINT_SIZE" ); -+ average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); -+ -+ if ( point_size_prop && average_width_prop ) - { -- /* This font is at least square shaped or even wider */ -- wide = 1; -- l += ft_strlen( " Wide" ); -+ if ( average_width_prop->value.l >= point_size_prop->value.l ) -+ { -+ /* This font is at least square shaped or even wider */ -+ wide = 1; -+ l += ft_strlen( " Wide" ); -+ } - } -- } - -- if ( foundry_prop && foundry_prop->isString ) -- { -- l += ft_strlen( foundry_prop->value.atom ) + 1; -+ if ( foundry_prop && foundry_prop->isString ) -+ { -+ l += ft_strlen( foundry_prop->value.atom ) + 1; - -- if ( FT_NEW_ARRAY( root->family_name, l ) ) -- goto Exit; -+ if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ goto Exit; -+ -+ ft_strcpy( root->family_name, foundry_prop->value.atom ); -+ ft_strcat( root->family_name, " " ); -+ ft_strcat( root->family_name, prop->value.atom ); -+ } -+ else -+ { -+ if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ goto Exit; - -- ft_strcpy( root->family_name, foundry_prop->value.atom ); -- ft_strcat( root->family_name, " " ); -- ft_strcat( root->family_name, prop->value.atom ); -+ ft_strcpy( root->family_name, prop->value.atom ); -+ } -+ -+ if ( wide ) -+ ft_strcat( root->family_name, " Wide" ); - } - else -+ -+#endif /* PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ - { -- if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ if ( FT_STRDUP( root->family_name, prop->value.atom ) ) - goto Exit; -- -- ft_strcpy( root->family_name, prop->value.atom ); - } -- -- if ( wide ) -- ft_strcat( root->family_name, " Wide" ); - } - else - root->family_name = NULL; --- -cgit v1.0-41-gc330 - diff --git a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch deleted file mode 100644 index c1685c5116cc..000000000000 --- a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h -index c726e5e..830cabe 100644 ---- a/src/pcf/pcf.h -+++ b/src/pcf/pcf.h -@@ -163,6 +163,13 @@ FT_BEGIN_HEADER - } PCF_FaceRec, *PCF_Face; - - -+ typedef struct PCF_DriverRec_ -+ { -+ FT_DriverRec root; -+ -+ } PCF_DriverRec, *PCF_Driver; -+ -+ - /* macros for pcf font format */ - - #define LSBFirst 0 -diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c -index 10d5c20..8f4a90d 100644 ---- a/src/pcf/pcfdrivr.c -+++ b/src/pcf/pcfdrivr.c -@@ -691,22 +691,38 @@ THE SOFTWARE. - } - - -+ FT_CALLBACK_DEF( FT_Error ) -+ pcf_driver_init( FT_Module module ) /* PCF_Driver */ -+ { -+ FT_UNUSED( module ); -+ -+ return FT_Err_Ok; -+ } -+ -+ -+ FT_CALLBACK_DEF( void ) -+ pcf_driver_done( FT_Module module ) /* PCF_Driver */ -+ { -+ FT_UNUSED( module ); -+ } -+ -+ - FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec pcf_driver_class = - { - { - FT_MODULE_FONT_DRIVER | - FT_MODULE_DRIVER_NO_OUTLINES, -- sizeof ( FT_DriverRec ), - -+ sizeof ( PCF_DriverRec ), - "pcf", - 0x10000L, - 0x20000L, - -- NULL, /* module-specific interface */ -+ NULL, /* module-specific interface */ - -- NULL, /* FT_Module_Constructor module_init */ -- NULL, /* FT_Module_Destructor module_done */ -+ pcf_driver_init, /* FT_Module_Constructor module_init */ -+ pcf_driver_done, /* FT_Module_Destructor module_done */ - pcf_driver_requester /* FT_Module_Requester get_interface */ - }, - --- -cgit v1.0-41-gc330 - diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 2dd32b6f1100..2af7bbce18bc 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { - url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; + url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 54174e7cfe46..562d79b00921 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.2.4"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b"; + sha256 = "0y1237m2wilxgrsd0cdjpbf1zj9z954sd8518g53hlmkmk8v27j4"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 310aaa430daf..3fd0bb082440 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.14"; + name = "gdbm-1.14.1"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "02dakgrq93xwgln8qfv3vs5jyz5yvds5nyzkx6rhg9v585x478dd"; + sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 6da29ef2a3c4..47f9e9c66760 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.4"; + version = "2.8.5"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1wjs9sfdi1v4bm750xl26mik5zyvmlk88jy2zf2jsm9y3qmcyfff"; + sha256 = "0aiwmxwa67zsb2sbadf8r2p9018qhc8gycb04kfrsf7rskz3x2h5"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index a1a9b10fca63..6bfa6bdc2fb9 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }: +, jasper, gobjectIntrospection, doCheck ? false }: let pname = "gdk-pixbuf"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty; + buildInputs = [ libX11 gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig ]; @@ -61,4 +61,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 5d683de404d9..83ec0edfb49f 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gecode-${version}"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { url = "http://www.gecode.org/download/${name}.tar.gz"; - sha256 = "0yz7m4msp7g2jzsn216q74d9n7rv6qh8abcv0jdc1n7y2nhjzzzl"; + sha256 = "0dp7bm6k790jx669y4jr0ffi5cdfpwsqm1ykj2c0zh56jsgs6hfs"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 03f6054791e4..fee630c32a81 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3 }: +, libwebp, gnome3, libintl }: stdenv.mkDerivation rec { - name = "gegl-0.3.28"; + name = "gegl-0.3.30"; src = fetchurl { url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm"; + sha256 = "0lg5j5kn24qvyb6fn7khxf3jadkacbpnb9nrqzy7w665s8xakd7q"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - hardeningDisable = [ "format" ]; # needs fonts otherwise don't know how to pass them @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc - nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; meta = with stdenv.lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 304d8110ad46..8c93428a0780 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk2, bzip2, intltool +, librsvg, pango, gtk2, bzip2, intltool, libintl , OpenGL ? null }: stdenv.mkDerivation rec { @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool ] + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index b70163789dec..495a113391e3 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip +{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip , dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection }: @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { pkgconfig intltool wrapGAppsHook gobjectIntrospection ]; - buildInputs = libintlOrEmpty ++ - [ glib json-glib libsoup geoip + buildInputs = [ glib json-glib libsoup geoip dbus dbus-glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; @@ -37,8 +36,6 @@ stdenv.mkDerivation rec { "--disable-modem-gps-source" "--disable-nmea-source" ]; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - postInstall = '' sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" ''; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index de7111f6be36..24e3b4842faf 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, python }: stdenv.mkDerivation rec { - name = "geos-3.6.1"; + name = "geos-3.6.2"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja"; + sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 382bdb17247c..779534460df2 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "getdns"; name = "${pname}-${version}"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://getdnsapi.net/releases/${pname}-1-3-0/${pname}-${version}.tar.gz"; - sha256 = "920fa2e07c72fd0e5854db1820fa777108009fc5cb702f9aa5155ef58b12adb1"; + url = "https://getdnsapi.net/releases/${pname}-1-4-1/${pname}-${version}.tar.gz"; + sha256 = "07n5n5m4dnnh2xkh7wrnlx8s8myrvjf2nbs7n5m5nq8gg3f36li4"; }; nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 9c3024ce25fb..6dec7747c7e8 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; setupHook = ./gettext-setup-hook.sh; + gettextNeedsLdflags = hostPlatform.libc != "glibc" && !hostPlatform.isMusl; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 5932ef6a44f9..074d313e48aa 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -5,3 +5,24 @@ gettextDataDirsHook() { } addEnvHooks "$hostOffset" gettextDataDirsHook + +# libintl must be listed in load flags on non-Glibc +# it doesn't hurt to have it in Glibc either though +gettextLdflags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -lintl" +} + +if [ ! -z "@gettextNeedsLdflags@" ]; then + addEnvHooks "$hostOffset" gettextLdflags +fi diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix deleted file mode 100644 index d79b76913358..000000000000 --- a/pkgs/development/libraries/gflags/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, fetchurl, cmake }: - -stdenv.mkDerivation - { name = "gflags-2.2.1"; - src = fetchurl - { url = "https://github.com/gflags/gflags/archive/v2.2.1.tar.gz"; - sha256 = "03lxc2ah8i392kh1naq99iip34k4fpv22kwflyx3byd2ssycs9xf"; - }; - nativeBuildInputs = [ cmake ]; - } diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix new file mode 100644 index 000000000000..339e0d8d60b9 --- /dev/null +++ b/pkgs/development/libraries/glbinding/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "glbinding"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "cginternals"; + repo = pname; + rev = "v${version}"; + sha256 = "1yic3p2iqzxc7wrjnqclx7vcaaqx5fiysq9rqbi6v390jqkg3zlz"; + }; + + buildInputs = [ cmake libGLU xlibsWrapper ]; + + meta = with stdenv.lib; { + homepage = https://github.com/cginternals/glbinding/; + description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; + license = licenses.mit; + maintainers = [ maintainers.mt-caret ]; + }; +} diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index eebf4dded4ad..a8add880090f 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-2.0.0"; + name = "glew-2.1.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5"; + sha256 = "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 2e0e8cbb910e..c3bcb3aa1c45 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules"; + PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules"; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file @@ -47,4 +47,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2c070ff3fa8c..d2dc9a8c637b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ -{ stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python -, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf, gnome3 +{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python +, libiconv, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null @@ -66,17 +66,13 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; - nativeBuildInputs = [ pkgconfig gettext perl python ]; + nativeBuildInputs = [ pkgconfig perl python ]; - propagatedBuildInputs = [ zlib libffi libiconv ] - ++ libintlOrEmpty; + propagatedBuildInputs = [ zlib libffi gettext libiconv ]; # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - # glibc inclues GNU libiconv, but Darwin's iconv function is good enonugh. - ++ optional (stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isDarwin) - "--with-libiconv=gnu" ++ optional stdenv.isSunOS "--disable-dtrace" # Can't run this test when cross-compiling ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) @@ -84,8 +80,7 @@ stdenv.mkDerivation rec { # GElf only supports elf64 hosts ++ optional (!stdenv.hostPlatform.is64bit) "--disable-libelf"; - NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl" - ++ optional stdenv.isSunOS "-DBSD_COMP"; + NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP"; preConfigure = optionalString stdenv.isSunOS '' sed -i -e 's|inotify.h|foobar-inotify.h|g' configure diff --git a/pkgs/development/libraries/glibc/2.27.nix b/pkgs/development/libraries/glibc/2.27.nix deleted file mode 100644 index bb057ae899e7..000000000000 --- a/pkgs/development/libraries/glibc/2.27.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv, callPackage -, withLinuxHeaders ? true -, installLocales ? true -, profilingLibraries ? false -, withGd ? false -}: - -assert stdenv.cc.isGNU; - -callPackage ./common-2.27.nix { inherit stdenv; } { - name = "glibc" + stdenv.lib.optionalString withGd "-gd"; - - inherit withLinuxHeaders profilingLibraries installLocales withGd; - - NIX_NO_SELF_RPATH = true; - - postConfigure = '' - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS - - # Apparently --bindir is not respected. - makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") - ''; - - # The stackprotector and fortify hardening flags are autodetected by glibc - # and enabled by default if supported. Setting it for every gcc invocation - # does not work. - hardeningDisable = [ "stackprotector" "fortify" ]; - - # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for - # any program we run, because the gcc will have been placed at a new - # store path than that determined when built (as a source for the - # bootstrap-tools tarball) - # Building from a proper gcc staying in the path where it was installed, - # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without - # any special hack. - preInstall = '' - if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then - mkdir -p $out/lib - cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 - # the .so It used to be a symlink, but now it is a script - cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so - fi - ''; - - postInstall = '' - if test -n "$installLocales"; then - make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - fi - - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - - if test -n "$linuxHeaders"; then - # Include the Linux kernel headers in Glibc, except the `scsi' - # subdirectory, which Glibc provides itself. - (cd $dev/include && \ - ln -sv $(ls -d $linuxHeaders/include/* | grep -v scsi\$) .) - fi - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi - - # Get rid of more unnecessary stuff. - rm -rf $out/var $bin/bin/sln - - # For some reason these aren't stripped otherwise and retain reference - # to bootstrap-tools; on cross-arm this stripping would break objects. - if [ -z "$crossConfig" ]; then - for i in "$out"/lib/*.a; do - [ "$i" = "$out/lib/libm.a" ] || strip -S "$i" - done - fi - - # Put libraries for static linking in a separate output. Note - # that libc_nonshared.a and libpthread_nonshared.a are required - # for dynamically-linked applications. - mkdir -p $static/lib - mv $out/lib/*.a $static/lib - mv $static/lib/lib*_nonshared.a $out/lib - # Some of *.a files are linker scripts where moving broke the paths. - sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ - -i "$static"/lib/*.a - - # Work around a Nix bug: hard links across outputs cause a build failure. - cp $bin/bin/getconf $bin/bin/getconf_ - mv $bin/bin/getconf_ $bin/bin/getconf - ''; - - separateDebugInfo = true; - - meta.description = "The GNU C Library"; - } diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix deleted file mode 100644 index 4a5b31245c1c..000000000000 --- a/pkgs/development/libraries/glibc/common-2.27.nix +++ /dev/null @@ -1,216 +0,0 @@ -/* Build configuration used to build glibc, Info files, and locale - information. */ - -{ stdenv, lib -, buildPlatform, hostPlatform -, buildPackages -, fetchurl, fetchpatch ? null -, linuxHeaders ? null -, gd ? null, libpng ? null -, bison -}: - -{ name -, withLinuxHeaders ? false -, profilingLibraries ? false -, installLocales ? false -, withGd ? false -, meta -, ... -} @ args: - -let - version = "2.27"; - patchSuffix = ""; - sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji"; - cross = if buildPlatform != hostPlatform then hostPlatform else null; -in - -assert withLinuxHeaders -> linuxHeaders != null; -assert withGd -> gd != null && libpng != null; - -stdenv.mkDerivation ({ - inherit installLocales; - linuxHeaders = if withLinuxHeaders then linuxHeaders else null; - - # The host/target system. - crossConfig = if cross != null then cross.config else null; - - inherit (stdenv) is64bit; - - enableParallelBuilding = true; - - patches = - [ - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - - /* Allow NixOS and Nix to handle the locale-archive. */ - ./nix-locale-archive-2.27.patch - - /* Don't use /etc/ld.so.cache, for non-NixOS systems. */ - ./dont-use-system-ld-so-cache-2.27.patch - - /* Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload. */ - ./dont-use-system-ld-so-preload.patch - - /* The command "getconf CS_PATH" returns the default search path - "/bin:/usr/bin", which is inappropriate on NixOS machines. This - patch extends the search path by "/run/current-system/sw/bin". */ - ./fix_path_attribute_in_getconf.patch - - /* Allow running with RHEL 6 -like kernels. The patch adds an exception - for glibc to accept 2.6.32 and to tag the ELFs as 2.6.32-compatible - (otherwise the loader would refuse libc). - Note that glibc will fully work only on their heavily patched kernels - and we lose early mismatch detection on 2.6.32. - - On major glibc updates we should check that the patched kernel supports - all the required features. ATM it's verified up to glibc-2.26-131. - # HOWTO: check glibc sources for changes in kernel requirements - git log -p glibc-2.25.. sysdeps/unix/sysv/linux/x86_64/kernel-features.h sysdeps/unix/sysv/linux/kernel-features.h - # get kernel sources (update the URL) - mkdir tmp && cd tmp - curl http://vault.centos.org/6.9/os/Source/SPackages/kernel-2.6.32-696.el6.src.rpm | rpm2cpio - | cpio -idmv - tar xf linux-*.bz2 - # check syscall presence, for example - less linux-*?/arch/x86/kernel/syscall_table_32.S - */ - ./allow-kernel-2.6.32.patch - ] - ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch - ++ lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - name = "fix-with-musl.patch"; - url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw"; - sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2"; - }); - - postPatch = - '' - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 - sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - ''; - - configureFlags = - [ "-C" - "--enable-add-ons" - "--enable-obsolete-nsl" - "--enable-obsolete-rpc" - "--sysconfdir=/etc" - "--enable-stackguard-randomization" - (if withLinuxHeaders - then "--with-headers=${linuxHeaders}/include" - else "--without-headers") - (if profilingLibraries - then "--enable-profile" - else "--disable-profile") - ] ++ lib.optionals withLinuxHeaders [ - "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 - ] ++ lib.optionals (cross != null) [ - (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") - ] ++ lib.optionals (cross != null) [ - "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - - # To avoid linking with -lgcc_s (dynamic link) - # so the glibc does not depend on its compiler store path - "libc_cv_as_needed=no" - ] ++ lib.optional withGd "--with-gd"; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - outputs = [ "out" "bin" "dev" "static" ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; - buildInputs = lib.optionals withGd [ gd libpng ]; - - # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to - # prevent a retained dependency on the bootstrap tools in the stdenv-linux - # bootstrap. - BASH_SHELL = "/bin/sh"; -} - -// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // - -{ - name = name + "-${version}${patchSuffix}"; - - src = fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; - inherit sha256; - }; - - # Remove absolute paths from `configure' & co.; build out-of-tree. - preConfigure = '' - export PWD_P=$(type -tP pwd) - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - mkdir ../build - cd ../build - - configureScript="`pwd`/../$sourceRoot/configure" - - ${lib.optionalString (stdenv.cc.libc != null) - ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"'' - } - - - '' + lib.optionalString (cross != null) '' - sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" - - cat > config.cache << "EOF" - libc_cv_forced_unwind=yes - libc_cv_c_cleanup=yes - libc_cv_gnu89_inline=yes - EOF - ''; - - preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... - - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; - - license = lib.licenses.lgpl2Plus; - - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - } // meta; - - passthru = { inherit version; }; -} - -// lib.optionalAttrs (cross != null) { - preInstall = null; # clobber the native hook - - dontStrip = true; - - separateDebugInfo = false; # this is currently broken for crossDrv - - # To avoid a dependency on the build system 'bash'. - preFixup = '' - rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace} - ''; -}) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index c8e5b4562856..517c98e9f644 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -7,6 +7,7 @@ , fetchurl, fetchpatch ? null , linuxHeaders ? null , gd ? null, libpng ? null +, bison }: { name @@ -19,9 +20,9 @@ } @ args: let - version = "2.26"; - patchSuffix = "-131"; - sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5"; + version = "2.27"; + patchSuffix = ""; + sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -29,7 +30,7 @@ assert withLinuxHeaders -> linuxHeaders != null; assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ - inherit installLocales; + inherit version installLocales; linuxHeaders = if withLinuxHeaders then linuxHeaders else null; # The host/target system. @@ -41,17 +42,6 @@ stdenv.mkDerivation ({ patches = [ - /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git - $ git co release/2.25/master; git describe - glibc-2.25-49-gbc5ace67fe - $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz - */ - ./2.26-75.patch.gz - ./2.26-75to115.diff.gz - # contains fix for CVE-2018-1000001 as the last commit: - # https://sourceware.org/git/?p=glibc.git;a=commit;h=fabef2edbc - ./2.26-115to131.diff.gz - /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch @@ -97,24 +87,14 @@ stdenv.mkDerivation ({ }); postPatch = - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 '' + # Needed for glibc to build with the gnumake 3.82 + # http://comments.gmane.org/gmane.linux.lfs.support/31227 sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - '' - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - + '' + + # nscd needs libgcc, and we don't want it dynamically linked + # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - '' - # Replace the date and time in nscd by a prefix of $out. - # It is used as a protocol compatibility check. - # Note: the size of the struct changes, but using only a part - # would break hash-rewriting. When receiving stats it does check - # that the struct sizes match and can't cause overflow or something. - + '' - cat ${./glibc-remove-datetime-from-nscd.patch} \ - | sed "s,@out@,$out," | patch -p1 ''; configureFlags = @@ -150,6 +130,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison ]; buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache-2.27.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache-2.27.patch deleted file mode 100644 index f84b1049adf8..000000000000 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache-2.27.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c ---- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500 -@@ -51,7 +51,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ -diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile ---- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500 -@@ -559,13 +559,13 @@ - - $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) - --SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c += $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ -+PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c += $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' - libof-ldconfig = ldconfig --CFLAGS-dl-cache.c += $(SYSCONF-FLAGS) --CFLAGS-cache.c += $(SYSCONF-FLAGS) --CFLAGS-rtld.c += $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c += $(PREFIX-FLAGS) -+CFLAGS-cache.c += $(PREFIX-FLAGS) -+CFLAGS-rtld.c += $(PREFIX-FLAGS) - - cpp-srcs-left := $(all-rtld-routines:=.os) - lib := rtld -diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h ---- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500 -@@ -28,7 +28,7 @@ - #endif - - #ifndef LD_SO_CACHE --# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" -+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" - #endif - - #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch index fc14553c3ee0..f84b1049adf8 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch @@ -1,7 +1,7 @@ -diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c ---- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400 -@@ -50,7 +50,7 @@ +diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c +--- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500 +@@ -51,7 +51,7 @@ #endif #ifndef LD_SO_CONF @@ -10,31 +10,31 @@ diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c #endif /* Get libc version number. */ -diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile ---- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 -@@ -415,12 +415,12 @@ +diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile +--- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500 +@@ -559,13 +559,13 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) -SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +-CFLAGS-ldconfig.c += $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ ++CFLAGS-ldconfig.c += $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ -D'SLIBDIR="$(slibdir)"' libof-ldconfig = ldconfig --CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) --CFLAGS-cache.c = $(SYSCONF-FLAGS) --CFLAGS-rtld.c = $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c = $(PREFIX-FLAGS) -+CFLAGS-cache.c = $(PREFIX-FLAGS) -+CFLAGS-rtld.c = $(PREFIX-FLAGS) +-CFLAGS-dl-cache.c += $(SYSCONF-FLAGS) +-CFLAGS-cache.c += $(SYSCONF-FLAGS) +-CFLAGS-rtld.c += $(SYSCONF-FLAGS) ++CFLAGS-dl-cache.c += $(PREFIX-FLAGS) ++CFLAGS-cache.c += $(PREFIX-FLAGS) ++CFLAGS-rtld.c += $(PREFIX-FLAGS) cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld -diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h ---- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 +diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h +--- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500 @@ -28,7 +28,7 @@ #endif diff --git a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch deleted file mode 100644 index 39312951fcf9..000000000000 --- a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c ---- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 -@@ -123,6 +123,23 @@ - return MAX (namehash_end, MAX (string_end, locrectab_end)); - } - -+static int -+open_locale_archive (void) -+{ -+ int fd = -1; -+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (versioned_path) -+ fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (path && fd < 0) -+ fd = __open_nocancel (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (fd < 0) -+ fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (fd < 0) -+ fd = __open_nocancel ("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ return fd; -+} -+ - - /* Find the locale *NAMEP in the locale archive, and return the - internalized data structure for its CATEGORY data. If this locale has -@@ -202,7 +219,7 @@ - archmapped = &headmap; - - /* The archive has never been opened. */ -- fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; -@@ -397,8 +414,7 @@ - if (fd == -1) - { - struct stat64 st; -- fd = __open_nocancel (archfname, -- O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; -diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c ---- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 -@@ -633,6 +633,24 @@ - - - static int -+open_locale_archive (void) -+{ -+ int fd = -1; -+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (versioned_path) -+ fd = open64 (versioned_path, O_RDONLY); -+ if (path && fd < 0) -+ fd = open64 (path, O_RDONLY); -+ if (fd < 0) -+ fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ if (fd < 0) -+ fd = open64 ("/usr/lib/locale/locale-archive", O_RDONLY); -+ return fd; -+} -+ -+ -+static int - write_archive_locales (void **all_datap, char *linebuf) - { - struct stat64 st; -@@ -644,7 +662,7 @@ - int fd, ret = 0; - uint32_t cnt; - -- fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_locale_archive (); - if (fd < 0) - return 0; - -diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c ---- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 -@@ -117,6 +117,22 @@ - } - - -+static int -+open_locale_archive (const char * archivefname, int flags) -+{ -+ int fd = -1; -+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (versioned_path) -+ fd = open64 (versioned_path, flags); -+ if (path && fd < 0) -+ fd = open64 (path, flags); -+ if (fd < 0) -+ fd = open64 (archivefname, flags); -+ return fd; -+} -+ -+ - static void - create_archive (const char *archivefname, struct locarhandle *ah) - { -@@ -578,7 +594,7 @@ - while (1) - { - /* Open the archive. We must have exclusive write access. */ -- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); - if (fd == -1) - { - /* Maybe the file does not yet exist? If we are opening diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch index eeaf21901a39..39312951fcf9 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -1,114 +1,118 @@ -diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.c ---- glibc-2.16.0-orig/locale/loadarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/loadarchive.c 2012-09-18 11:57:57.277515212 -0400 -@@ -123,6 +123,25 @@ +diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c +--- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 +@@ -123,6 +123,23 @@ + return MAX (namehash_end, MAX (string_end, locrectab_end)); } - +static int +open_locale_archive (void) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ const char *usualpath = "/usr/lib/locale/locale-archive"; -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (path2 && fd < 0) -+ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (path && fd < 0) ++ fd = __open_nocancel (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (fd < 0) -+ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = __open_nocancel ("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC); + return fd; +} + -+ + /* Find the locale *NAMEP in the locale archive, and return the internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -@@ -202,7 +221,7 @@ +@@ -202,7 +219,7 @@ archmapped = &headmap; /* The archive has never been opened. */ -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); +- fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = open_locale_archive (); if (fd < 0) /* Cannot open the archive, for whatever reason. */ return NULL; -@@ -393,8 +412,7 @@ +@@ -397,8 +414,7 @@ if (fd == -1) { struct stat64 st; -- fd = open_not_cancel_2 (archfname, -- O_RDONLY|O_LARGEFILE|O_CLOEXEC); +- fd = __open_nocancel (archfname, +- O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = open_locale_archive (); if (fd == -1) /* Cannot open the archive, for whatever reason. */ return NULL; -diff -ru glibc-2.16.0-orig/locale/programs/locale.c glibc-2.16.0/locale/programs/locale.c ---- glibc-2.16.0-orig/locale/programs/locale.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locale.c 2012-09-18 11:53:03.719920947 -0400 -@@ -628,6 +628,20 @@ - ((const struct nameent *) b)->name); - } +diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c +--- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 +@@ -633,6 +633,24 @@ -+static int -+open_nix_locale_archive (const char * fname, int access) + + static int ++open_locale_archive (void) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = open64 (versioned_path, O_RDONLY); ++ if (path && fd < 0) ++ fd = open64 (path, O_RDONLY); ++ if (fd < 0) ++ fd = open64 (ARCHIVE_NAME, O_RDONLY); + if (fd < 0) -+ fd = open64 (fname, access); ++ fd = open64 ("/usr/lib/locale/locale-archive", O_RDONLY); + return fd; +} - - static int ++ ++ ++static int write_archive_locales (void **all_datap, char *linebuf) -@@ -641,7 +655,7 @@ + { + struct stat64 st; +@@ -644,7 +662,7 @@ int fd, ret = 0; uint32_t cnt; - fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); ++ fd = open_locale_archive (); if (fd < 0) return 0; -diff -ru glibc-2.16.0-orig/locale/programs/locarchive.c glibc-2.16.0/locale/programs/locarchive.c ---- glibc-2.16.0-orig/locale/programs/locarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locarchive.c 2012-09-18 11:53:03.720920942 -0400 -@@ -509,6 +509,20 @@ - *ah = new_ah; +diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c +--- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 +@@ -117,6 +117,22 @@ } + +static int -+open_nix_locale_archive (const char * fname, int access) ++open_locale_archive (const char * archivefname, int flags) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = open64 (versioned_path, flags); ++ if (path && fd < 0) ++ fd = open64 (path, flags); + if (fd < 0) -+ fd = open64 (fname, access); ++ fd = open64 (archivefname, flags); + return fd; +} - - void - open_archive (struct locarhandle *ah, bool readonly) -@@ -528,7 +542,7 @@ ++ ++ + static void + create_archive (const char *archivefname, struct locarhandle *ah) + { +@@ -578,7 +594,7 @@ while (1) { /* Open the archive. We must have exclusive write access. */ - fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); ++ fd = open_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); if (fd == -1) { - /* Maybe the file does not yet exist. */ + /* Maybe the file does not yet exist? If we are opening diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 5b55a09db625..3ef279616f75 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; description = "Library for interacting with smart card devices"; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index a46abe3b4f7c..940b4e2aee4e 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-efi-${version}"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; - sha256 = "149cyadpn2jm4zxfn1qmpm520iqssp9p07d650rs5ghgv015jl91"; + sha256 = "08mpw8s79azip9jbzm6msq0999pnkqzd82axydrcyyynm276s03n"; }; buildInputs = [ pciutils ]; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 8769584a9f21..984603827c8d 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv - ++ lib.optional stdenv.isDarwin gettext + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile ++ buildInputs; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 3c884bb1224a..f79511897fbe 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python -, libintlOrEmpty, cctools, cairo, gnome3 +, libintl, cctools, cairo, gnome3 , substituteAll, nixStoreDir ? builtins.storeDir , x11Support ? true }: @@ -24,9 +24,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; outputMan = "dev"; # tiny pages - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; buildInputs = [ flex bison python setupHook/*move .gir*/ ] - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin cctools; propagatedBuildInputs = [ libffi glib ]; diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix new file mode 100644 index 000000000000..940882b1742d --- /dev/null +++ b/pkgs/development/libraries/godot_headers/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "godot_headers"; + version = "2018-02-09"; + src = fetchFromGitHub { + owner = "GodotNativeTools"; + repo = "godot_headers"; + rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae"; + sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh"; + }; + buildPhase = "true"; + installPhase = '' + mkdir $out + cp -r . $out/include + ''; + meta = { + homepage = "https://github.com/GodotNativeTools/godot_headers/"; + description = "Headers for the Godot API supplied by the GDNative module"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.twey ]; + }; +} diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index f67129c007ec..6cdd19f307df 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.38"; + name = "goffice-0.10.39"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "443199d7a9833fddaadfc4f9065c289e639eed480de316f37da816e396bb9764"; + sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index 1a3a16587274..dbcb0342156b 100644 --- a/pkgs/development/libraries/google-gflags/default.nix +++ b/pkgs/development/libraries/google-gflags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "google-gflags-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "gflags"; repo = "gflags"; rev = "v${version}"; - sha256 = "1y5808ky8qhjwv1nf134czz0h2p2faqvjhxa9zxf8mg8hn4ns9wp"; + sha256 = "12wkihc4f07qmhyqk3cjylj8v5xz2bjrq75p7aq1vvvj60fbp58k"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 1e59e8f1d65a..68762e344bdb 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,10 +1,17 @@ { stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan -, qtbase ? null }: +, file, which +, autoreconfHook +, git +, texinfo5 +, qtbase ? null +, withPython ? false, swig2 ? null, python ? null +}: let inherit (stdenv) lib system; in stdenv.mkDerivation rec { - name = "gpgme-1.10.0"; + name = "gpgme-${version}"; + version = "1.10.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; @@ -18,11 +25,17 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ pkgconfig gnupg ]; + nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ] + ++ lib.optionals withPython [ python swig2 which ]; + + postPatch ='' + substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + ''; configureFlags = [ "--enable-fixed-path=${gnupg}/bin" - ]; + "--with-libgpg-error-prefix=${libgpgerror.dev}" + ] ++ lib.optional withPython "--enable-languages=python"; NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix new file mode 100644 index 000000000000..9e893932a64c --- /dev/null +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsettings-qt-${version}"; + version = "0.1.20170824"; + + src = fetchbzr { + url = http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk; + rev = "85"; + sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + gobjectIntrospection + ]; + + buildInputs = [ + glib + qtdeclarative + ]; + + patchPhase = '' + # force ordered build of subdirs + sed -i -e "\$aCONFIG += ordered" gsettings-qt.pro + + # It seems that there is a bug in qtdeclarative: qmlplugindump fails + # because it can not find or load the Qt platform plugin "minimal". + # A workaround is to set QT_PLUGIN_PATH and QML2_IMPORT_PATH explicitly. + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${qtdeclarative.bin}/${qtbase.qtQmlPrefix} + + substituteInPlace GSettings/gsettings-qt.pro \ + --replace '$$[QT_INSTALL_QML]' "$out/$qtQmlPrefix" \ + --replace '$$[QT_INSTALL_BINS]/qmlplugindump' "qmlplugindump" + + substituteInPlace src/gsettings-qt.pro \ + --replace '$$[QT_INSTALL_LIBS]' "$out/lib" \ + --replace '$$[QT_INSTALL_HEADERS]' "$out/include" + ''; + + preInstall = '' + # do not install tests + for f in tests/Makefile{,.cpptest}; do + substituteInPlace $f \ + --replace "install: install_target" "install: " + done + ''; + + meta = with stdenv.lib; { + description = "Qt/QML bindings for GSettings"; + homepage = https://launchpad.net/gsettings-qt; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index afd6391d719b..f1eed726eb2b 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html ]; - doCheck = stdenv.system != "i686-linux"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + doCheck = stdenv.system != "i686-linux" && stdenv.system != "aarch64-linux"; meta = { description = "The GNU Scientific Library, a large numerical library"; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 55e20065732c..d48ba9082af2 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gssdp-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz"; - sha256 = "1qfj4gir1qf6v86z70ryzmjb75ns30q6zi5p89vhd3621gs6f7b0"; + sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d4cc2f43aaa6..73cbaa0f8070 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc +{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext +, pkgconfig, python, gst-plugins-base, orc , faacSupport ? false, faac ? null -, gtkSupport ? false, gtk3 ? null , faad2, libass, libkate, libmms -, libmodplug, mpeg2dec, mpg123 +, libmodplug, mpeg2dec , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools -, libGLU_combined, libintlOrEmpty, libgme +, libGLU_combined, libintl, libgme , openssl, x265, libxml2 }: assert faacSupport -> faac != null; -assert gtkSupport -> gtk3 != null; let inherit (stdenv.lib) optional optionalString; @@ -23,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.12.3"; + name = "gst-plugins-bad-1.14.0"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -38,36 +37,38 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; - # TODO: Fix Cocoa build. The problem was ARC, which might be related to too - # old version of Apple SDK's. - configureFlags = optional stdenv.isDarwin "--disable-cocoa"; - - patchPhase = '' - sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/* + preConfigure = '' + patchShebangs . ''; + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370409"; + sha256 = "0hy0rcn35alq65yqwri4fqjz2hf3nyyg5c7rnndk51msmqjxpprk"; + }) + ./fix_pkgconfig_includedir.patch + ]; + src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "1v5z3i5ha20gmbb3r9dwsaaspv5fm1jfzlzwlzqx1gjj31v5kl1n"; + sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ meson ninja pkgconfig python gettext ]; buildInputs = [ gst-plugins-base orc - faad2 gtk3 libass libkate libmms - libmodplug mpeg2dec mpg123 + faad2 libass libkate libmms + libmodplug mpeg2dec openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 + libintl ] - ++ libintlOrEmpty ++ optional faacSupport faac - # for gtksink - ++ optional gtkSupport gtk3 ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin @@ -75,7 +76,5 @@ stdenv.mkDerivation rec { # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin ++ optional (!stdenv.isDarwin) mjpegtools; - LDFLAGS = optionalString stdenv.isDarwin "-lintl"; - enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..c687fffc9c08 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index 271f327f3..7e2afa754 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', join_paths(get_option('prefix'))) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 2cd0c14c1f34..b3a4f445289e 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection -, orc, alsaLib, libXv, pango, libtheora -, cdparanoia, libvisual, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, meson +, ninja, gettext, gobjectIntrospection, python +, gstreamer, orc, alsaLib, libXv, pango, libtheora +, wayland, cdparanoia, libvisual, libintl }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.12.3"; + name = "gst-plugins-base-1.14.0"; meta = { description = "Base plugins and helper libraries"; @@ -15,32 +16,34 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "19ffwdch7m777ragmwpy6prqmfb742ym1n3ki40s0zyki627plyk"; + sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig python gobjectIntrospection + pkgconfig python meson ninja gettext gobjectIntrospection ]; buildInputs = [ - orc libXv pango libtheora cdparanoia + orc libXv pango libtheora cdparanoia libintl wayland ] - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isLinux alsaLib ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual; propagatedBuildInputs = [ gstreamer ]; - configureFlags = if stdenv.isDarwin then [ - # Does not currently build on Darwin - "--disable-libvisual" - # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia - "--disable-cdparanoia" - ] else null; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + preConfigure = '' + patchShebangs . + ''; enableParallelBuilding = true; + + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370414"; + sha256 = "07x43xis0sr0hfchf36ap0cibx0lkfpqyszb3r3w9dzz301fk04z"; + }) + ./fix_pkgconfig_includedir.patch + ]; } diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..04486a4647f9 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index 04abfbee5..88c86b431 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + pkgconf.set('LIBM', libm.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index ee9438d3c29b..ab3f78767a1c 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection -, glib, makeWrapper -, darwin +{ stdenv, fetchurl, fetchpatch, meson, ninja +, pkgconfig, gettext, gobjectIntrospection +, bison, flex, python3, glib, makeWrapper +, libcap,libunwind, darwin }: stdenv.mkDerivation rec { - name = "gstreamer-1.12.3"; + name = "gstreamer-1.14.0"; meta = { description = "Open source multimedia framework"; @@ -16,31 +17,37 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "0vi1g8rmmsnd630ds3jwv2iph46ll8y07fzf04mz15q88j9g926k"; + sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw"; }; + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370411"; + sha256 = "16plzzmkk906k4892zq68j3c9z8vdma5nxzlviq20jfv04ykhmk2"; + }) + ./fix_pkgconfig_includedir.patch + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; nativeBuildInputs = [ - pkgconfig perl bison flex python gobjectIntrospection makeWrapper + meson ninja pkgconfig gettext bison flex python3 makeWrapper gobjectIntrospection ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; + buildInputs = [ libcap libunwind ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; propagatedBuildInputs = [ glib ]; - enableParallelBuilding = true; - - preConfigure = '' - configureFlagsArray+=("--exec-prefix=$dev") - ''; - postInstall = '' for prog in "$dev/bin/"*; do wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; + preConfigure= '' + patchShebangs . + ''; + preFixup = '' moveToOutput "share/bash-completion" "$dev" ''; diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..c388a82fa2a8 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index edb0586c2..7ed46dfce 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', join_paths(get_option('prefix'))) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', apiversion) + pkgconf.set('VERSION', gst_version) + pkgconf.set('LIBM', mathlib.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 76cffa89dbc5..9aec87634040 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ callPackage, libva-full }: +{ callPackage }: rec { gstreamer = callPackage ./core { }; @@ -13,17 +13,14 @@ rec { gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; - gst-libav = callPackage ./libav { inherit gst-plugins-base; }; + gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base; }; - gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; + gst-libav = callPackage ./libav { inherit gst-plugins-base; }; - # TODO: gnonlin is deprecated in gst-editing-services, better switch to nle - # (Non Linear Engine). - gst-editing-services = callPackage ./ges { inherit gnonlin; }; + gst-editing-services = callPackage ./ges { inherit gst-plugins-base; }; gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; - libva = libva-full; # looks also for libva-{x11,wayland} }; gst-validate = callPackage ./validate { inherit gst-plugins-base; }; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index c38ab12ec964..895f298c8269 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, python, gobjectIntrospection -, gnonlin, libxml2, flex, perl +{ stdenv, fetchurl, fetchpatch, meson, ninja +, pkgconfig, python, gst-plugins-base, libxml2 +, flex, perl, gettext, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.12.3"; + name = "gstreamer-editing-services-1.14.0"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,12 +15,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0xjz8r0wbzc0kwi9q8akv7w71ii1n2y2dmb0q2p5k4h78382ybh3"; + sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection python flex perl ]; - propagatedBuildInputs = [ gnonlin libxml2 ]; + propagatedBuildInputs = [ gst-plugins-base libxml2 ]; + + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370413"; + sha256 = "1xcgbs18g6n5p7z7kqj7ffakwmkxq7ijajyvhyl7p3zvqll9dc7x"; + }) + ./fix_pkgconfig_includedir.patch + ]; } diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..1e12f3bbfbea --- /dev/null +++ b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index a612b21b..c017eaff 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', apiversion) + pkgconf.set('VERSION', gst_version) + diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix deleted file mode 100644 index c04b64ae3c6a..000000000000 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig -, gst-plugins-base -}: - -stdenv.mkDerivation rec { - name = "gnonlin-1.4.0"; - - meta = with stdenv.lib; { - description = "Gstreamer Non-Linear Multimedia Editing Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - Gnonlin is a library built on top of GStreamer which provides - support for writing non-linear audio and video editing - applications. It introduces the concept of a timeline. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; - - src = fetchurl { - url = "${meta.homepage}/src/gnonlin/${name}.tar.xz"; - sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ gst-plugins-base ]; -} diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index e4e4f3b394db..5c10221b27d7 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, python -, gst-plugins-base, orc, bzip2 +{ stdenv, fetchurl, meson, ninja, pkgconfig, python +, gst-plugins-base, orc, bzip2, gettext , libv4l, libdv, libavc1394, libiec61883 , libvpx, speex, flac, taglib, libshout , cairo, gdk_pixbuf, aalib, libcaca -, libsoup, libpulseaudio, libintlOrEmpty -, darwin +, libsoup, libpulseaudio, libintl +, darwin, lame, mpg123, twolame +, gtkSupport ? false, gtk3 ? null }: +assert gtkSupport -> gtk3 != null; + let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.12.3"; + name = "gst-plugins-good-1.14.0"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -27,27 +30,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "00sznj1sl97fqpn6j8ngps04clvxp8h8yhw6lvszx4b855wz9rqk"; + sha256 = "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + patches = [ ./fix_pkgconfig_includedir.patch ]; + + nativeBuildInputs = [ pkgconfig python meson ninja gettext ]; buildInputs = [ gst-plugins-base orc bzip2 libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca - libsoup libshout + libsoup libshout lame mpg123 twolame libintl ] - ++ libintlOrEmpty ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; - preFixup = '' - mkdir -p "$dev/lib/gstreamer-1.0" - mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0" - ''; - - LDFLAGS = optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..f68ad603a37c --- /dev/null +++ b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index b3bf0d4d4..3e6e576c0 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index bee80cb24ecf..14e27ab6068c 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "C++ interface for GStreamer"; homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; license = licenses.lgpl21Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 2c2e1b0da122..8371b2780409 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc -, libintlOrEmpty +, libintl , ApplicationServices , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # TODO : v4l, libvisual buildInputs = - [ pkgconfig glib cairo orc ] + [ pkgconfig glib cairo orc libintl ] # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) @@ -37,11 +37,8 @@ stdenv.mkDerivation rec { liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - propagatedBuildInputs = [ gstreamer ]; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index d533f798d999..75583624f545 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc -, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty +, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). minimalDeps ? false @@ -23,15 +23,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-experimental" "--disable-oss" ]; buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base ] + [ pkgconfig glib gstreamer gst-plugins-base libintl ] ++ lib.optional stdenv.isLinux libpulseaudio - ++ libintlOrEmpty ++ lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ]; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - enableParallelBuilding = true; postInstall = lib.optionalString (!minimalDeps) '' diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 5c289fb39114..ac680f8432ab 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }: +, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-0.10.19"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index 55d34a3fada3..e46ecfb76127 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty }: +{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintl }: stdenv.mkDerivation rec { name = "gstreamer-0.10.36"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; buildInputs = [ perl bison flex ]; - propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; + propagatedBuildInputs = [ glib libxml2 ]; patchPhase = '' sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 9969c5e604ff..564b37fab794 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python, yasm -, gst-plugins-base, orc, bzip2 -, withSystemLibav ? true, libav ? null +{ stdenv, fetchurl, meson, ninja, pkgconfig +, python, yasm, gst-plugins-base, orc, bzip2 +, gettext, withSystemLibav ? true, libav ? null }: # Note that since gst-libav-1.6, libav is actually ffmpeg. See @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.12.3"; + name = "gst-libav-1.14.0"; meta = { homepage = https://gstreamer.freedesktop.org; @@ -19,16 +19,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "0l4nc6ikdx49l7bdrk3bd9p3pzry8a328r22zg48gyzpnv5ghph1"; + sha256 = "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv"; }; outputs = [ "out" "dev" ]; - configureFlags = stdenv.lib.optionalString withSystemLibav - "--with-system-libav"; - nativeBuildInputs = with stdenv.lib; - [ pkgconfig python ] + [ meson ninja gettext pkgconfig python ] ++ optional (!withSystemLibav) yasm ; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix new file mode 100644 index 000000000000..9ff799b0a27b --- /dev/null +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig +, gst-plugins-base, gettext, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + name = "gst-rtsp-server-1.14.0"; + + meta = with stdenv.lib; { + description = "Gstreamer RTSP server"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a library on top of GStreamer for building an RTSP server. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bkchr ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; + sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ meson ninja gettext gobjectIntrospection pkgconfig ]; + + buildInputs = [ gst-plugins-base ]; +} diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index cdaa88ce350f..a5449abb9f7d 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, python -, gst-plugins-base, orc +{ stdenv, fetchurl, meson, ninja, pkgconfig, python +, gst-plugins-base, orc, gettext , a52dec, libcdio, libdvdread -, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 +, libmad, libmpeg2, x264, libintl }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.12.3"; + name = "gst-plugins-ugly-1.14.0"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,18 +22,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0lh00rg26iy5lr5al23lxsyncjqkgzph1bzkrgp8x9sfr62ab378"; + sha256 = "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig python ]; buildInputs = [ gst-plugins-base orc a52dec libcdio libdvdread - lame libmad libmpeg2 x264 mpg123 - ] ++ libintlOrEmpty; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + libmad libmpeg2 x264 + libintl + ]; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 8351cfd65b1e..11b451e76fdf 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland +{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland , libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm , libvpx, python }: stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.12.4"; + version = "1.14.0"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "1jg9nvc8000yi2bcl3wn2yh2hwl7yvlwldj6778w8c0z5qj7fb8w"; + sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ meson ninja pkgconfig bzip2 ]; buildInputs = [ gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev @@ -22,11 +22,10 @@ stdenv.mkDerivation rec { xorg.libICE libGLU_combined nasm libvpx python ]; - preConfigure = " + preConfigure = '' export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0 mkdir -p $GST_PLUGIN_PATH_1_0 - "; - configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; + ''; meta = { homepage = https://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 1cb5e4f968ef..bd33d9c52807 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.12.3"; + name = "gst-validate-1.14.0"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "17j812pkzgbyn9ys3b305yl5mrf9nbm8whwj4iqdskr742fr8fai"; + sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 8a3ce884dfd7..d35e47f312f9 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg -, gdk_pixbuf, libintlOrEmpty, xlibsWrapper, gobjectIntrospection +, gdk_pixbuf, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null , gdktarget ? "x11" @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = optionalString (libintlOrEmpty != []) "-lintl"; - setupHook = ./setup-hook.sh; nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; @@ -38,7 +36,6 @@ stdenv.mkDerivation rec { libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] - ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ] ++ optionals stdenv.isDarwin [ AppKit Cocoa ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index c96139ddb576..dc6a519dfade 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection , xorg, epoxy, json-glib, libxkbcommon, gmp -, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols +, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null , darwin, gnome3 @@ -40,14 +40,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] - ++ optionals waylandSupport [ wayland wayland-protocols ] + ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; - # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 608c6e7eacd2..673eb1e52c44 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -32,6 +32,8 @@ in stdenv.mkDerivation rec { patches = [ ./3.x-nix_share_path.patch ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + enableParallelBuilding = true; doCheck = stdenv.isLinux; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 59b3a34f7bdd..770f743fd260 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + buildInputs = [ glib gettext ]; meta = { homepage = http://gts.sourceforge.net/; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index b0b2d21e2bd4..238edddaf3ad 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -5,27 +5,38 @@ , gnomeSupport ? false, gnome, makeWrapper , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh , libsecret, libgdata +# Remove when switching back to meson +, autoreconfHook, lzma, bzip2 }: +# TODO: switch to meson when upstream fixes a non-deterministic build failure +# See https://bugzilla.gnome.org/show_bug.cgi?id=794549 + +# Meson specific things are commented out and annotated, so switching back +# should simply require deleting autotools specific things and adding back meson +# flags etc. + let pname = "gvfs"; - version = "1.36.0"; + version = "1.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy"; + sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q"; }; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; + # Uncomment when switching back to meson + # postPatch = '' + # chmod +x meson_post_install.py # patchShebangs requires executable file + # patchShebangs meson_post_install.py + # ''; nativeBuildInputs = [ - meson ninja + autoreconfHook # Remove when switching to meson + # meson ninja pkgconfig gettext makeWrapper libxml2 libxslt docbook_xsl docbook_xml_dtd_42 ]; @@ -35,24 +46,30 @@ stdenv.mkDerivation rec { libgphoto2 avahi libarchive fuse libcdio samba libmtp libcap polkit libimobiledevice libbluray libcdio-paranoia libnfs openssh + # Remove when switching back to meson + lzma bzip2 # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ libsoup gcr gnome-online-accounts libsecret libgdata ]); - mesonFlags = [ - "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules" - "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" - "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" - "-Dtmpfilesdir=no" - ] ++ stdenv.lib.optionals (!gnomeSupport) [ - "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" - "-Dgoogle=false" - ] ++ stdenv.lib.optionals (samba == null) [ - # Xfce don't want samba - "-Dsmb=false" - ]; + # Remove when switching back to meson + configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr"; + + # Uncomment when switching back to meson + # mesonFlags = [ + # "-Dgio_module_dir=lib/gio/modules" + # "-Dsystemduserunitdir=lib/systemd/user" + # "-Ddbus_service_dir=share/dbus-1/services" + # "-Dtmpfilesdir=no" + # ] ++ stdenv.lib.optionals (!gnomeSupport) [ + # "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" + # "-Dgoogle=false" + # ] ++ stdenv.lib.optionals (samba == null) [ + # # Xfce don't want samba + # "-Dsmb=false" + # ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index bb68ae94a7f0..d098dd8fd146 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it }: let - version = "1.7.5"; + version = "1.7.6"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"; + sha256 = "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys"; }; outputs = [ "out" "dev" ]; @@ -25,9 +25,8 @@ stdenv.mkDerivation { ( "--with-icu=" + (if withIcu then "yes" else "no") ) ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + buildInputs = [ glib freetype cairo ]; # recommended by upstream propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ] diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 8f1aadc3a26e..75dd8693d2cf 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m"; }; - meta = { + meta = with stdenv.lib; { homepage = http://herqq.org; description = "A software library for building UPnP devices and control points"; - inherit (qt5.qtbase.meta) platforms; + platforms = platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 6b08a0fd86f7..edb1dc01aa80 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hpx-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = "${version}"; - sha256 = "0k79gw4c0v4i7ps1hw6x4m7svxbfml5xm6ly7p00dvg7z9521zsk"; + sha256 = "0xlhnycmpy2jgiqyzpwmkdrl6drf46ywdsl0qm4vksvjxqfgk9z3"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index b17fc48c7e9a..5d4eae4e0639 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }: let - version = "2.8.0"; + version = "2.8.1"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "17a7k3nxv2p1sp2x5d89wr51vk770753vz6qnlp2gz7nkgwwcxvj"; + sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index f30ec1872bae..ee8a5107b341 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -61,6 +61,51 @@ let ''; }; + mkDictFromDSSO = + { shortName, shortDescription, dictFileName }: + mkDict rec { + inherit dictFileName; + version = "2.40"; + # Should really use a string function or something + _version = "2-40"; + name = "hunspell-dict-${shortName}-dsso-${version}"; + _name = "ooo_swedish_dict_${_version}"; + readmeFile = "LICENSE_en_US.txt"; + src = fetchurl { + url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt"; + sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc"; + }; + meta = with stdenv.lib; { + longDescription = '' + Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran + Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från + LibreOffice då dsso.se inte längre verkar vara med oss. + ''; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = licenses.lgpl3; + platforms = platforms.all; + }; + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase"; + sourceRoot = "."; + unpackCmd = '' + unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile + ''; + installPhase = '' + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 dictionaries/${dictFileName}.dic "$out/share/hunspell/" + install -m644 dictionaries/${dictFileName}.aff "$out/share/hunspell/" + # myspell dicts symlinks + install -dm755 "$out/share/myspell/dicts" + ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/" + ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" + # docs + install -dm755 "$out/share/doc" + install -m644 ${readmeFile} $out/share/doc/${name}.txt + ''; + }; + mkDictFromDicollecte = { shortName, shortDescription, longDescription, dictFileName }: mkDict rec { @@ -464,6 +509,21 @@ in { ]; }; + /* SWEDISH */ + + sv-se = mkDictFromDSSO rec { + shortName = "sv-se"; + dictFileName = "sv_SE"; + shortDescription = "Swedish (Sweden)"; + }; + + # Finlandian Swedish (hello Linus Torvalds) + sv-fi = mkDictFromDSSO rec { + shortName = "sv-fi"; + dictFileName = "sv_FI"; + shortDescription = "Swedish (Finland)"; + }; + /* GERMAN */ de-de = mkDictFromJ3e { diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 4cee28630935..442da700f345 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "idnkit-1.0"; + name = "idnkit-${version}"; + version = "2.3"; src = fetchurl { - url = "http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${name}-src.tar.gz"; - sha256 = "1z4i6fmyv67sflmjg763ymcxrcv84rbj1kv15im0s655h775zk8n"; + url = "https://jprs.co.jp/idn/${name}.tar.bz2"; + sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16"; }; buildInputs = [ libiconv ]; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 8206338fb080..3568edb7890c 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ignitionrobotics.org/libraries/math; + homepage = https://ignitionrobotics.org/libraries/math; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; platforms = platforms.all; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index e2d7d7ffd034..cdb018d297b6 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix index d7143b8747ee..880f91fccedc 100644 --- a/pkgs/development/libraries/isl/0.12.2.nix +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index 8196dec283ac..1ff4b7ec18a0 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.15.0.nix index eca3372ad4d0..8b6080c2880a 100644 --- a/pkgs/development/libraries/isl/0.15.0.nix +++ b/pkgs/development/libraries/isl/0.15.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix index 2136969c0752..59d4d38ce574 100644 --- a/pkgs/development/libraries/isl/0.17.1.nix +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 7d07408236e6..4dfe190124b1 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, gettext, python3, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.74"; + name = "iso-codes-${version}"; + version = "3.79"; src = fetchurl { - url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz"; + sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; }; patchPhase = '' for i in `find . -name \*.py` diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index bb90ec4831ac..10c160eacc6e 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.12.2"; + name = "itk-4.13.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.12.2.tar.xz; - sha256 = "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w"; + url = mirror://sourceforge/itk/InsightToolkit-4.13.0.tar.xz; + sha256 = "09d1gmqx3wbdfgwf7r91r12m2vknviv0i8wxwh2q9w1vrpizrczy"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 55f44df2b4f3..36eedadc4c2e 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.5"; src = fetchurl { - url = http://math.nist.gov/tnt/jama125.zip; + url = https://math.nist.gov/tnt/jama125.zip; sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://math.nist.gov/tnt/; + homepage = https://math.nist.gov/tnt/; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index af543c4e1976..6c9ea32d518a 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; }; + patches = [ + # Fixes CVE-2018-9055 + (fetchpatch { + url = "http://paste.opensuse.org/view/raw/330751ce"; + sha256 = "0m798m6c4v9yyhql7x684j5kppcm6884n1rrb9ljz8p9aqq2jqnm"; + }) + ]; + + # newer reconf to recognize a multiout flag nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix deleted file mode 100644 index 82e02d06906b..000000000000 --- a/pkgs/development/libraries/java/classpath/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk2, gconf, ecj }: - -stdenv.mkDerivation rec { - name = "classpath-0.99"; - - src = fetchurl { - url = "mirror://gnu/classpath/${name}.tar.gz"; - sha256 = "1j7cby4k66f1nvckm48xcmh352b1d1b33qk7l6hi7dp9i9zjjagr"; - }; - - patches = [ ./missing-casts.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ javac jvm antlr gtk2 gconf ecj ]; - - configurePhase = '' - # GCJ tries to compile all of Classpath during the `configure' run when - # trying to build in the source tree (see - # http://www.mail-archive.com/classpath@gnu.org/msg15079.html), thus we - # build out-of-tree. - mkdir ../build - cd ../build - echo "building in \`$PWD'" - - ../${name}/configure --prefix="$out" \ - --enable-fast-install --disable-dependency-tracking \ - ${configureFlags} - ''; - - /* Plug-in support requires Xulrunner and all that. Maybe someday, - optionally. - - Compilation with `-Werror' is disabled because of this: - - native/jni/native-lib/cpnet.c: In function 'cpnet_addMembership': - native/jni/native-lib/cpnet.c:583: error: dereferencing type-punned pointer will break strict-aliasing rules - native/jni/native-lib/cpnet.c: In function 'cpnet_dropMembership': - native/jni/native-lib/cpnet.c:598: error: dereferencing type-punned pointer will break strict-aliasing rules - - */ - - configureFlags = "--disable-Werror --disable-plugin --with-antlr-jar=${antlr}/lib/antlr.jar"; - - meta = { - description = "Essential libraries for Java"; - - longDescription = '' - GNU Classpath, Essential Libraries for Java, is a GNU project to create - free core class libraries for use with virtual machines and compilers - for the Java programming language. - ''; - - homepage = http://www.gnu.org/software/classpath/; - - # The exception makes it similar to LGPLv2+ AFAICS. - license = stdenv.lib.licenses.gpl2ClasspathPlus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/java/classpath/missing-casts.patch b/pkgs/development/libraries/java/classpath/missing-casts.patch deleted file mode 100644 index 863ca2cac8ce..000000000000 --- a/pkgs/development/libraries/java/classpath/missing-casts.patch +++ /dev/null @@ -1,80 +0,0 @@ -Add missing casts. The GCC folks applied a similar patch in -GCC's own copy of Classpath: -http://gcc.gnu.org/ml/java/2007-05/msg00039.html . - ---- classpath-0.98/javax/management/NotificationBroadcasterSupport.java 2009-07-30 16:52:08.000000000 +0200 -+++ classpath-0.98/javax/management/NotificationBroadcasterSupport.java 2009-07-30 16:51:58.000000000 +0200 -@@ -218,7 +218,7 @@ - { - if (info == null || info.length == 0) - return new MBeanNotificationInfo[0]; -- return info.clone(); -+ return (MBeanNotificationInfo[]) info.clone(); - } - - /** - ---- classpath-0.98/java/util/concurrent/CopyOnWriteArrayList.java 2008-03-27 18:39:25.000000000 +0100 -+++ classpath-0.98/java/util/concurrent/CopyOnWriteArrayList.java 2009-07-30 17:08:30.000000000 +0200 -@@ -147,7 +148,7 @@ public class CopyOnWriteArrayList<E> - */ - public CopyOnWriteArrayList(E[] array) - { -- data = array.clone(); -+ data = (E[]) array.clone(); - } - - /** -@@ -364,7 +365,7 @@ public class CopyOnWriteArrayList<E> - public synchronized E set(int index, E e) - { - E result = data[index]; -- E[] newData = data.clone(); -+ E[] newData = (E[]) data.clone(); - newData[index] = e; - data = newData; - return result; - ---- classpath-0.98/java/util/EnumMap.java 2007-07-24 17:26:36.000000000 +0200 -+++ classpath-0.98/java/util/EnumMap.java 2009-07-30 17:12:19.000000000 +0200 -@@ -398,7 +398,7 @@ public class EnumMap<K extends Enum<K>, - // Can't happen. - result = null; - } -- result.store = store.clone(); -+ result.store = (V[]) store.clone(); - return result; - } - ---- classpath-0.98/gnu/java/lang/reflect/GenericSignatureParser.java 2008-03-01 11:13:31.000000000 +0100 -+++ classpath-0.98/gnu/java/lang/reflect/GenericSignatureParser.java 2009-07-30 17:14:24.000000000 +0200 -@@ -75,7 +75,7 @@ final class TypeVariableImpl extends Typ - public Type[] getBounds() - { - resolve(bounds); -- return bounds.clone(); -+ return (Type[]) bounds.clone(); - } - - public GenericDeclaration getGenericDeclaration() -@@ -154,7 +154,7 @@ final class ParameterizedTypeImpl extend - - public Type[] getActualTypeArguments() - { -- return typeArgs.clone(); -+ return (Type[]) typeArgs.clone(); - } - - public Type getRawType() - ---- classpath-0.98/external/jsr166/java/util/ArrayDeque.java 2006-12-10 21:25:40.000000000 +0100 -+++ classpath-0.98/external/jsr166/java/util/ArrayDeque.java 2009-07-30 17:15:35.000000000 +0200 -@@ -787,7 +790,7 @@ public class ArrayDeque<E> extends Abstr - ArrayDeque<E> result = (ArrayDeque<E>) super.clone(); - // Classpath local: we don't have Arrays.copyOf yet. - // result.elements = Arrays.copyOf(elements, elements.length); -- result.elements = elements.clone(); -+ result.elements = (E[]) elements.clone(); - return result; - - } catch (CloneNotSupportedException e) { diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index d49165ac521a..03b083328da4 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.4"; + version = "2.6"; name = "commons-io-${version}"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz"; - sha256 = "0m5xmjfr9k2zmbrz425q530jd0lm6368c4wm3jsjlsrqmqjpsvz1"; + sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index ad849a4d6d53..97ffcb647d62 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ }: stdenv.mkDerivation { - name = "hsqldb-1.8.0.9"; + name = "hsqldb-2.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://sourceforge/hsqldb/hsqldb_1_8_0_9.zip; - sha256 = "e98d1d8bca15059f4ef4f0d3dde2d75778a5e1bbe8bc12abd4ec2cac39d5adec"; + sha256 = "1v5dslwsqb7csjmi5g78pghsay2pszidvlzhyi79y18mra5iv3g9"; }; buildInputs = [ unzip diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix new file mode 100644 index 000000000000..1a26bd13d41c --- /dev/null +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, version, sha256, ... }@args: + +stdenv.mkDerivation (rec { + name = "jemalloc-${version}"; + inherit version; + + src = fetchurl { + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; + inherit sha256; + }; + + # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which + # then stops downstream builds (mariadb in particular) from detecting it. This + # option should remove the prefix and give us a working jemalloc. + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" + # jemalloc is unable to correctly detect transparent hugepage support on + # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default + # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support + ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://jemalloc.net; + description = "General purpose malloc(3) implementation"; + longDescription = '' + malloc(3)-compatible memory allocator that emphasizes fragmentation + avoidance and scalable concurrency support. + ''; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ])) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 0882431cc15b..40c06cbffdf0 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,40 +1,10 @@ { stdenv, fetchurl, fetchpatch }: - -stdenv.mkDerivation rec { - name = "jemalloc-${version}"; +import ./common.nix { + inherit stdenv fetchurl; version = "5.0.1"; - - src = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; - }; - - # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which - # then stops downstream builds (mariadb in particular) from detecting it. This - # option should remove the prefix and give us a working jemalloc. - configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; - doCheck = true; - + sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; }); - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://jemalloc.net; - description = "General purpose malloc(3) implementation"; - longDescription = '' - malloc(3)-compatible memory allocator that emphasizes fragmentation - avoidance and scalable concurrency support. - ''; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; - }; } diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix new file mode 100644 index 000000000000..00b38a855532 --- /dev/null +++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix @@ -0,0 +1,6 @@ +{ stdenv, fetchurl }: +import ./common.nix { + inherit stdenv fetchurl; + version = "4.5.0"; + sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; +} diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 315296ea2dfb..27d1b701f054 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - name = "json-c-0.13"; + name = "json-c-0.13.1"; src = fetchurl { url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz"; - sha256 = "01jsr647faqrcbsrmzb52s9ppa9ll4pscz4nizk3xlp98q37cwl5"; + sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index bf32f4f8e8bc..21bddf8f6bb5 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext -, gobjectIntrospection, dbus, libintlOrEmpty +, gobjectIntrospection, dbus , fixDarwinDylibNames }: @@ -14,10 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - buildInputs = libintlOrEmpty - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; patches = [ # https://gitlab.gnome.org/GNOME/json-glib/issues/27 diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index e85190cdfcec..1dedd3836c29 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "kdb"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1n11xhqk3sf4a5nzvnrnj7bj21yqqqkm2d1xzfx3q82fkyah8s49"; + sha256 = "1wi9z7j0nr9wi6aqqkdcpnr38ixyxbv00sblya7pakdf96hlamhp"; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 85a49ce6b6cd..ede76323347e 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.44/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.45/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 3b9ca74bbd07..ee7d13af5b1e 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, gettext, python, qtbase, qtdeclarative, qtscript, }: @@ -13,4 +13,10 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python ]; buildInputs = [ qtdeclarative qtscript ]; + patches = [ + (fetchpatch { + url = "https://phabricator.kde.org/D12216?download=true"; + sha256 = "04gpyb11vlgivqjx3lqdwgqb4ss5bphy5zmh65k57bbv4rnlsm15"; + }) + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 84cbbe798fc1..8e2187f29574 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/attica-5.44.0.tar.xz"; - sha256 = "1ac2k3rc5dd5sc9n8qdb1d6jssjpag709sfsnvif1cvp0j8s2xj3"; - name = "attica-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/attica-5.45.0.tar.xz"; + sha256 = "1vzbajj2ldhg26ssxh0vkahj7fw5v9nhrv000vbxlhsrcczq81n5"; + name = "attica-5.45.0.tar.xz"; }; }; baloo = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/baloo-5.44.0.tar.xz"; - sha256 = "0ybxl05njryk7zrdcwh4gbvxbn7n6xb51y2587d9bxiizasmbbiy"; - name = "baloo-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/baloo-5.45.0.tar.xz"; + sha256 = "0zr2pg946q3wc6bhsbngpmca0ylhw8ckfdrs6ym36v7xz3h5fhds"; + name = "baloo-5.45.0.tar.xz"; }; }; bluez-qt = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/bluez-qt-5.44.0.tar.xz"; - sha256 = "054zh3hc7wq13iks3nryzdns61wb56j2cvvfvsnv3yl9ni6i6wxv"; - name = "bluez-qt-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/bluez-qt-5.45.0.tar.xz"; + sha256 = "056xl29yf7bkqrn655c9b2wdx69021q7cz176rx4daid70i8nx49"; + name = "bluez-qt-5.45.0.tar.xz"; }; }; breeze-icons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/breeze-icons-5.44.0.tar.xz"; - sha256 = "05ndqmprwv4dd8aib3sjmvd5481znq4jg58cpk4id1xxq4dgx9gg"; - name = "breeze-icons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/breeze-icons-5.45.0.tar.xz"; + sha256 = "0nzi4wy0p7lkb76nynmwbgnrsrfbhfxn3269mkbqwakq6i4mxsj8"; + name = "breeze-icons-5.45.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/extra-cmake-modules-5.44.0.tar.xz"; - sha256 = "121gwj54f7bns386wrw6rwqmwzsny93mb00sxxzf3ic8m6mw6wis"; - name = "extra-cmake-modules-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/extra-cmake-modules-5.45.0.tar.xz"; + sha256 = "0g7njdz6bqjcswq100mb2jr4l1mdicqq24wdw3a8f63syg5rvm76"; + name = "extra-cmake-modules-5.45.0.tar.xz"; }; }; frameworkintegration = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/frameworkintegration-5.44.0.tar.xz"; - sha256 = "10rqabchldra16zb0ryynvjimc67di3r4b29fbn47wg4pwj0jn41"; - name = "frameworkintegration-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/frameworkintegration-5.45.0.tar.xz"; + sha256 = "0s300vp674rq2dinhjjsp7v4gmv6ybxsk1r3asv3x789zwz1lr3i"; + name = "frameworkintegration-5.45.0.tar.xz"; }; }; kactivities = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kactivities-5.44.0.tar.xz"; - sha256 = "1j5v03mgh0prql51hy468k2vhskg1gyddhjlb8qlyzyzqz1aj82c"; - name = "kactivities-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kactivities-5.45.0.tar.xz"; + sha256 = "0h3hym4am055f9kyhg98gabw00nb1h10b9dvbs3hs3178dyi5gjg"; + name = "kactivities-5.45.0.tar.xz"; }; }; kactivities-stats = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kactivities-stats-5.44.0.tar.xz"; - sha256 = "1p1vznw8qxdasb82cvjc35wnhvfhjhapx3r451kl3ly4cbjf39fg"; - name = "kactivities-stats-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kactivities-stats-5.45.0.tar.xz"; + sha256 = "0jcvikr7yvjik8zdz46mkrxf2c3ydns194a07njw7hd15x1czqjl"; + name = "kactivities-stats-5.45.0.tar.xz"; }; }; kapidox = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kapidox-5.44.0.tar.xz"; - sha256 = "0mn67ckxhsav70jk1wj5qci07qyy0291rm7q54qmcl6p7a7a0vj4"; - name = "kapidox-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kapidox-5.45.0.tar.xz"; + sha256 = "1996akdnhrky1bk63xraj0qawx6ar1vk6ia4rmdgq0bqjk804g1p"; + name = "kapidox-5.45.0.tar.xz"; }; }; karchive = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/karchive-5.44.0.tar.xz"; - sha256 = "00mvn9rsc4lb2kamfz2xzmm0a0s1m68ar65dcfrp0n2i8plxin5j"; - name = "karchive-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/karchive-5.45.0.tar.xz"; + sha256 = "0gl86ybjkmjz6sl4s00j8mi43admj7xnjnmv92q5lngk75k1zbhq"; + name = "karchive-5.45.0.tar.xz"; }; }; kauth = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kauth-5.44.0.tar.xz"; - sha256 = "1ph2jlbwx27g9awfvkvrynnfwyr8yqq4x7w4msn1clh8nz9c9n0k"; - name = "kauth-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kauth-5.45.0.tar.xz"; + sha256 = "1j6pgbkqjw70lnpk84wqi9m81hc55f1z4cfxkd8hhdk578pry56i"; + name = "kauth-5.45.0.tar.xz"; }; }; kbookmarks = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kbookmarks-5.44.0.tar.xz"; - sha256 = "04wwg9s3i3nj7im0cscdzb3c78lqg96k7vyg9ziyn2cpqmj6gihr"; - name = "kbookmarks-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kbookmarks-5.45.0.tar.xz"; + sha256 = "0ii0gi4vlngp0qypyn2780dnqpkg24k0wb5jpngllrvrf37132md"; + name = "kbookmarks-5.45.0.tar.xz"; }; }; kcmutils = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcmutils-5.44.0.tar.xz"; - sha256 = "1fddjg89az0gfcl9gf3r7rq7hw9j8k10mvlvzq31x89hn8h7kafs"; - name = "kcmutils-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcmutils-5.45.0.tar.xz"; + sha256 = "0w082wr9h2rpk9jyads9bwdimhqjl6f68l710miwjglzcmfy4dgq"; + name = "kcmutils-5.45.0.tar.xz"; }; }; kcodecs = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcodecs-5.44.0.tar.xz"; - sha256 = "15fv3f2akjz8n65rj6r2nd5zzc4wsz67zc80bp45kqynrb1jgcjk"; - name = "kcodecs-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcodecs-5.45.0.tar.xz"; + sha256 = "0si694a64dbb65m7gzcvz474gd61nyvj71wh77chsbsh6hvl1xzx"; + name = "kcodecs-5.45.0.tar.xz"; }; }; kcompletion = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcompletion-5.44.0.tar.xz"; - sha256 = "1fy2krnxxppax13jb82zsfxky9n01z28d3kw4jx58yw1b1jm9ha4"; - name = "kcompletion-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcompletion-5.45.0.tar.xz"; + sha256 = "0lqp0m715hqh8ci1cq7r1y00828ajjzz5y04xpxw78gk9gprakf8"; + name = "kcompletion-5.45.0.tar.xz"; }; }; kconfig = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kconfig-5.44.0.tar.xz"; - sha256 = "1vfl7jchlrw8hkf613nb9a4f0dxyppkc97506xsknxwf1z5v7cmm"; - name = "kconfig-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kconfig-5.45.0.tar.xz"; + sha256 = "00r7vh2myh518wfngfr1gmz6svmnvjfx9bxv8px5z1ap0yda181p"; + name = "kconfig-5.45.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kconfigwidgets-5.44.0.tar.xz"; - sha256 = "15a7k8ai70a061gw91aps282v1f4sric0fhyw2fysfdfv6ry92rz"; - name = "kconfigwidgets-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kconfigwidgets-5.45.0.tar.xz"; + sha256 = "0kj0a2x6f27hkzyl7pfz20b0mv4625nxr7iqdq130wdy5x0wv71l"; + name = "kconfigwidgets-5.45.0.tar.xz"; }; }; kcoreaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcoreaddons-5.44.0.tar.xz"; - sha256 = "0lwxa326gap83qjw1dsj330qd3klgm6jwr7d77f7hyhm95d7pidl"; - name = "kcoreaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcoreaddons-5.45.0.tar.xz"; + sha256 = "15zgz8yhw7z31rljgj63hd949sp48syd1ggbay5nmnsb91ly0z92"; + name = "kcoreaddons-5.45.0.tar.xz"; }; }; kcrash = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcrash-5.44.0.tar.xz"; - sha256 = "01dcj5cyqqn2jb6mjshjcf48jdjhmjhkqxbhhx07dy7r56r4sqp1"; - name = "kcrash-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcrash-5.45.0.tar.xz"; + sha256 = "1ny3m1jqazf7b2qrh4dlprwyf60cddk2c88dxhmzr02a8040gckv"; + name = "kcrash-5.45.0.tar.xz"; }; }; kdbusaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdbusaddons-5.44.0.tar.xz"; - sha256 = "15b7nyivkrv7s2hdahsv27p8j6q80209ayqvi3dzlhzj2b5qqzkg"; - name = "kdbusaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdbusaddons-5.45.0.tar.xz"; + sha256 = "071zr5d95j1cd1djqd5nkfz5n224dmzsbx2a446dsp9liklhqaz6"; + name = "kdbusaddons-5.45.0.tar.xz"; }; }; kdeclarative = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdeclarative-5.44.0.tar.xz"; - sha256 = "0byggaxfkna0iqlhp970fx8kp926dc6m99xihvja1765525i1lj0"; - name = "kdeclarative-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdeclarative-5.45.0.tar.xz"; + sha256 = "0h84nla5symfdyrv5dvgs8b1mz0czclipiki16xglzdsja9z9xpl"; + name = "kdeclarative-5.45.0.tar.xz"; }; }; kded = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kded-5.44.0.tar.xz"; - sha256 = "04sdsz5frwff602ls3mqwijckl3kl64lanhhpmzxc33xdniff9as"; - name = "kded-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kded-5.45.0.tar.xz"; + sha256 = "0qr4ycqqz2g5k9pzllahc7aj1b6fyh0zidvaxvbw600wjr5v3acw"; + name = "kded-5.45.0.tar.xz"; }; }; kdelibs4support = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kdelibs4support-5.44.0.tar.xz"; - sha256 = "1cyxry09qnlbc2khaqjpb598f4rscg80dmjcqhlsn6b1375iqkjn"; - name = "kdelibs4support-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kdelibs4support-5.45.0.tar.xz"; + sha256 = "0kil35fj9p8g99jmmkvch326j32wfjqrhypzwg0sa0d74vc2pv5s"; + name = "kdelibs4support-5.45.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdesignerplugin-5.44.0.tar.xz"; - sha256 = "1fh4nw8qh563yc2parqlbrjzx6avi4gi01jzclf4bxv78zs4957a"; - name = "kdesignerplugin-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdesignerplugin-5.45.0.tar.xz"; + sha256 = "0gqvga5akilmqldhzmgjyngbz2dmxmkcjq2g5diq6pijiafsx8kj"; + name = "kdesignerplugin-5.45.0.tar.xz"; }; }; kdesu = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdesu-5.44.0.tar.xz"; - sha256 = "1p6bk7cnngwqklvm6aj5xlna6c5r6rznfbvdn7zz5h3wpzs8pqz2"; - name = "kdesu-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdesu-5.45.0.tar.xz"; + sha256 = "0znncn74vmczcqffc0n6q39q3mk4vsfwj3zn5kglzzsg0x730aly"; + name = "kdesu-5.45.0.tar.xz"; }; }; kdewebkit = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdewebkit-5.44.0.tar.xz"; - sha256 = "07mr4x55pp6wvbgnkggwalrqx9z8y9q1mmn79jkyhf2q905ynsmj"; - name = "kdewebkit-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdewebkit-5.45.0.tar.xz"; + sha256 = "0jdxaaysgdgp15yn2fnxf6m22djyvnl4jcyyrjxz7mz0s0lc4pg9"; + name = "kdewebkit-5.45.0.tar.xz"; }; }; kdnssd = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdnssd-5.44.0.tar.xz"; - sha256 = "18x43l7ni7jwfpch4hngiyz5w05z48q8wmhm38gz3jw09w9npgi4"; - name = "kdnssd-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdnssd-5.45.0.tar.xz"; + sha256 = "181slqgyp7xsg6xz92zris6yjmzysglvkbiyiii4245z1ms9pf0x"; + name = "kdnssd-5.45.0.tar.xz"; }; }; kdoctools = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdoctools-5.44.0.tar.xz"; - sha256 = "146crn9arrbi6ha7p5p0x7zmwlz86my067rif0v7j48xmmz6h5i3"; - name = "kdoctools-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdoctools-5.45.0.tar.xz"; + sha256 = "0b2bkn9a7nxyynn5cy53kb62khfklayj8fwgfdh3sr5a15yjycm5"; + name = "kdoctools-5.45.0.tar.xz"; }; }; kemoticons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kemoticons-5.44.0.tar.xz"; - sha256 = "1ggwyzs22907kxgapqi7md3ng1ry85gccyxbqvn638inxk299mla"; - name = "kemoticons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kemoticons-5.45.0.tar.xz"; + sha256 = "1981430xbypxswayrjf5c9bvk65dd2gsima8k0rvysbcqlnyqq7s"; + name = "kemoticons-5.45.0.tar.xz"; }; }; kfilemetadata = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kfilemetadata-5.44.0.tar.xz"; - sha256 = "0v8xdl0wgp67ykw5czxzvzsqzijg0qpkm5vjc9rnai7zaymxg7bg"; - name = "kfilemetadata-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kfilemetadata-5.45.0.tar.xz"; + sha256 = "0wcgsbpkvi8pls9zh24z4c328dl7lq8km4r7dag9vw4200bncwa6"; + name = "kfilemetadata-5.45.0.tar.xz"; }; }; kglobalaccel = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kglobalaccel-5.44.0.tar.xz"; - sha256 = "16qhf6kb6q85p6y9zh72b4rz0ikmahvhyzmrx0jd1r044g4j81wn"; - name = "kglobalaccel-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kglobalaccel-5.45.0.tar.xz"; + sha256 = "1iwmwpdxrymsyryvp007n3kz2w9syhl4h9jk6x77hprnmwj62cym"; + name = "kglobalaccel-5.45.0.tar.xz"; }; }; kguiaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kguiaddons-5.44.0.tar.xz"; - sha256 = "1npl2ibk7ilsicmyvlnvf42lz6qjmqp4nl607a66ikxp3kvk3sdc"; - name = "kguiaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kguiaddons-5.45.0.tar.xz"; + sha256 = "16cgi9a9laiwzg2fbp5hl3qlxjmhq0l7dw5kjpkzm7xvlj0rm5cn"; + name = "kguiaddons-5.45.0.tar.xz"; }; }; kholidays = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kholidays-5.44.0.tar.xz"; - sha256 = "134zxnkclh16gh0qf2ak1pmhlxxwrcgzgmkn5wrynwraplf9b812"; - name = "kholidays-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kholidays-5.45.0.tar.xz"; + sha256 = "02bcybzkzp26sz6rjnsh60jmwidmjg8wnixzxs5fk7h8qfygm4ra"; + name = "kholidays-5.45.0.tar.xz"; }; }; khtml = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/khtml-5.44.0.tar.xz"; - sha256 = "1sph90cfwq0067a6ih8mx1bn715lvsspn6s9lijmm0ck9vbbixgp"; - name = "khtml-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/khtml-5.45.0.tar.xz"; + sha256 = "1ligyb5hpp53q13r9a2w1xi7b5dc1xqqi9bf3jri01n9pf5d4ynq"; + name = "khtml-5.45.0.tar.xz"; }; }; ki18n = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/ki18n-5.44.0.tar.xz"; - sha256 = "1rg24i8ks5mxryssq0zdig0q545zyj4svy9kb6r84qwag4vn7pcc"; - name = "ki18n-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ki18n-5.45.0.tar.xz"; + sha256 = "1xjwwlr46x0wr26xn4z086rlzm2bgzyi1ck91cbcc0jv6p6n43mp"; + name = "ki18n-5.45.0.tar.xz"; }; }; kiconthemes = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kiconthemes-5.44.0.tar.xz"; - sha256 = "1xkrczqw332hr667qp9pwlkypcn9d6zkx51bmi4bg9xfgpg1pwz4"; - name = "kiconthemes-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kiconthemes-5.45.0.tar.xz"; + sha256 = "0wir8drhv5lx00f4n984yh5xavpi75vg1vpyrf68dd490klwzg45"; + name = "kiconthemes-5.45.0.tar.xz"; }; }; kidletime = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kidletime-5.44.0.tar.xz"; - sha256 = "1zf8rspn603hyz1rr3rkslnij7883f4ha0ls6v5phh19jdp9hcis"; - name = "kidletime-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kidletime-5.45.0.tar.xz"; + sha256 = "0057az4a9jvn120j94jsmf78lxw03c6s534mjn4r8ns9j46c060i"; + name = "kidletime-5.45.0.tar.xz"; }; }; kimageformats = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kimageformats-5.44.0.tar.xz"; - sha256 = "1zpz3a4wghh348is2yyfs5qhhkg0261p5v2khxcgcy6vpblv1h1j"; - name = "kimageformats-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kimageformats-5.45.0.tar.xz"; + sha256 = "0kdcrlpj56sw9gy9wf6dxlrsa11k3hv6ayvv6irry3iv1akfx7yp"; + name = "kimageformats-5.45.0.tar.xz"; }; }; kinit = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kinit-5.44.0.tar.xz"; - sha256 = "1v3zmlmh3yg9333v7ha1xg3hp7ig2q8w7ixyzww5a5q4gxpzz9z5"; - name = "kinit-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kinit-5.45.0.tar.xz"; + sha256 = "0phqwp60368vynnkh0hl3kdz6p0kisa5ab6fvgvks5p9h1nb6l2h"; + name = "kinit-5.45.0.tar.xz"; }; }; kio = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kio-5.44.0.tar.xz"; - sha256 = "1dvif1779kh8d8yh6svmbs2yhvprzc38hchd4wb4l70hmzqcd3vs"; - name = "kio-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kio-5.45.0.tar.xz"; + sha256 = "05bb27jfinpfdh3vz76prkdvpp574sx1sr41b6qk267y37l14x9y"; + name = "kio-5.45.0.tar.xz"; }; }; kirigami2 = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kirigami2-5.44.0.tar.xz"; - sha256 = "1vvq3c2j9v07ngkm3c8hwvik80sfd7i20ga7hyx4i94spjcagj6h"; - name = "kirigami2-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kirigami2-5.45.0.tar.xz"; + sha256 = "00miz1zwhq5ikwyqvvl6ha8w1dra7rxgw59wfg1ac74kjpb964ng"; + name = "kirigami2-5.45.0.tar.xz"; }; }; kitemmodels = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kitemmodels-5.44.0.tar.xz"; - sha256 = "0m63i10nvgp86ajsd7aizah4g21dpwxrs2lvglv0kybhaykziwa8"; - name = "kitemmodels-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kitemmodels-5.45.0.tar.xz"; + sha256 = "08mbvs6lcfwbprk51fjswig0sprn5pcgrhy34qbbnim5ijf8gkw1"; + name = "kitemmodels-5.45.0.tar.xz"; }; }; kitemviews = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kitemviews-5.44.0.tar.xz"; - sha256 = "1vg99figpspm0p7ipbgf94j4xarcf2zicm3rijywxfcwcl0sr99h"; - name = "kitemviews-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kitemviews-5.45.0.tar.xz"; + sha256 = "19cm7vxkp7qiqhjj7ma2nx4lvp2hiffnakiic26jqzb9sb0vkq2n"; + name = "kitemviews-5.45.0.tar.xz"; }; }; kjobwidgets = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kjobwidgets-5.44.0.tar.xz"; - sha256 = "1c26vdq8sqja95scqbvm0y2zhl1qx5aapkadi44vrjf54q4kgqrv"; - name = "kjobwidgets-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kjobwidgets-5.45.0.tar.xz"; + sha256 = "1946wqa6dpi82771nw70nz123w1xa9znhn9kgb0q5ypzc89498gj"; + name = "kjobwidgets-5.45.0.tar.xz"; }; }; kjs = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kjs-5.44.0.tar.xz"; - sha256 = "1y350xgxip9qlwzanzlbyj4mb7i53msldv2wmacdp2di1hxn8ihy"; - name = "kjs-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kjs-5.45.0.tar.xz"; + sha256 = "1xmc57fv3692vk0pzmrs1wyzgd69dhp6by0i1kw4a76w8h0lh5sr"; + name = "kjs-5.45.0.tar.xz"; }; }; kjsembed = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kjsembed-5.44.0.tar.xz"; - sha256 = "0d71pnfx5fylxlpc0m08i1qasnrk0jvwmcv7zr7r8fnfagjl7gpk"; - name = "kjsembed-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kjsembed-5.45.0.tar.xz"; + sha256 = "15jlbr5nw3c3p4cylr01c6w8isf78wnljsym8fsl9513k8cfabif"; + name = "kjsembed-5.45.0.tar.xz"; }; }; kmediaplayer = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kmediaplayer-5.44.0.tar.xz"; - sha256 = "1nwpx2y8bl92m8yxk5c3sw7a0zm50hfpfrcicdqpv7nfs4n70anj"; - name = "kmediaplayer-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kmediaplayer-5.45.0.tar.xz"; + sha256 = "0p3fm448xdcw7qmpbadx9rb6q1zx8bbap0a3xm11ni27s7dpvwgf"; + name = "kmediaplayer-5.45.0.tar.xz"; }; }; knewstuff = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/knewstuff-5.44.0.tar.xz"; - sha256 = "1sd5780gpxidlc9g3dmd38ji5q5c1va49r604x5y739wjdrsgm0a"; - name = "knewstuff-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knewstuff-5.45.0.tar.xz"; + sha256 = "0jk2zsxkj558rf2ar120mljjv13f261js9p27272wr6ily55navn"; + name = "knewstuff-5.45.0.tar.xz"; }; }; knotifications = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/knotifications-5.44.0.tar.xz"; - sha256 = "137snmjix1jji1vn40vxsnigddz7xxlkkch1rag79f6dqjnswb76"; - name = "knotifications-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knotifications-5.45.0.tar.xz"; + sha256 = "0rnqlfg7n86g7fdmx32l337xjr03g1ri88dg94wci3v9rpffy839"; + name = "knotifications-5.45.0.tar.xz"; }; }; knotifyconfig = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/knotifyconfig-5.44.0.tar.xz"; - sha256 = "0122w5mklyr958284824qzxxp76hacnf8zgv58b9ihr5finc919z"; - name = "knotifyconfig-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knotifyconfig-5.45.0.tar.xz"; + sha256 = "0qxfzrw8pmnm6jrl98d50d12x9azgj3f9bin2irim2w6zcsfqs37"; + name = "knotifyconfig-5.45.0.tar.xz"; }; }; kpackage = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kpackage-5.44.0.tar.xz"; - sha256 = "1av8m9m7by0j128779rhws0pjc3hhi37cp311nks5sa5mmpbksmz"; - name = "kpackage-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpackage-5.45.0.tar.xz"; + sha256 = "0ddmpn688dil3sdlr91iqczi52rz58nwifij00c0gvj5pgp6agvg"; + name = "kpackage-5.45.0.tar.xz"; }; }; kparts = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kparts-5.44.0.tar.xz"; - sha256 = "0bbf17y8nnd1gbhdnffhgj9xn1wjida6a7qgwi16k3zp4yjmpgac"; - name = "kparts-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kparts-5.45.0.tar.xz"; + sha256 = "0mhmy6sq21c4rgl4lfz9sr3r4zhzn2wfapm3g7qzf8554rinzs5z"; + name = "kparts-5.45.0.tar.xz"; }; }; kpeople = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kpeople-5.44.0.tar.xz"; - sha256 = "0gp602c2wq2ipbsan84r11a14xqpzyfszhb4lw3qkd7y4dpha37i"; - name = "kpeople-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpeople-5.45.0.tar.xz"; + sha256 = "1dm8nb9ckivww867541w6bfjvhg6hi64drzx61ak1ix3ha6n24g1"; + name = "kpeople-5.45.0.tar.xz"; }; }; kplotting = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kplotting-5.44.0.tar.xz"; - sha256 = "0ccgpbccfrn4c4wri80zm8ni8390jnqywh4k1z5r68hzmr3l79xw"; - name = "kplotting-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kplotting-5.45.0.tar.xz"; + sha256 = "1fdvbd57f8aikgi6xa5qb16a32398zkn83xb6vq5rjd3jrzyk4bi"; + name = "kplotting-5.45.0.tar.xz"; }; }; kpty = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kpty-5.44.0.tar.xz"; - sha256 = "08jxq693mkwxr45696nz05f2zxa16finvacif330r6s03izvwfw0"; - name = "kpty-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpty-5.45.0.tar.xz"; + sha256 = "0g8daxvybiraax0395sb05468qfzdg0cjgq810kz78512carsg7f"; + name = "kpty-5.45.0.tar.xz"; }; }; kross = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kross-5.44.0.tar.xz"; - sha256 = "1gq2cg3gq40rqih0kflfxl2n5l7j4gli0w57xnfhc39xpkpd1cqv"; - name = "kross-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kross-5.45.0.tar.xz"; + sha256 = "1s8y36cn9nj5lqf8f667yyqdk0m4ankqb0fr3s9c7llb87ca8iqn"; + name = "kross-5.45.0.tar.xz"; }; }; krunner = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/krunner-5.44.0.tar.xz"; - sha256 = "1zr3zm528p4agw8d7krm4drs8638gfmbnm011r9kcmpjadkv0ila"; - name = "krunner-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/krunner-5.45.0.tar.xz"; + sha256 = "18rq5nzdxr8x55s3hqp5b3mibfa51sbybirhdp49igz9x2la2j9x"; + name = "krunner-5.45.0.tar.xz"; }; }; kservice = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kservice-5.44.0.tar.xz"; - sha256 = "0gzp8sbf0mk7nhy1hz9m3fz97lkwijpxwf2l2ljz375ylf374iyk"; - name = "kservice-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kservice-5.45.0.tar.xz"; + sha256 = "0qrawj6hvy6q68k278nqkmdnjqk1cwr6iym9wmiq3lphsab08nl7"; + name = "kservice-5.45.0.tar.xz"; }; }; ktexteditor = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/ktexteditor-5.44.0.tar.xz"; - sha256 = "1g0v5sax3pfkvdcvyxyz81j3ainm0n1m7nc1rxh106iz8gs0z9cn"; - name = "ktexteditor-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ktexteditor-5.45.0.tar.xz"; + sha256 = "1gp5f9v01f0824j96wmv7a48561wkcndnk75q1qdbkknxk4cmnnp"; + name = "ktexteditor-5.45.0.tar.xz"; }; }; ktextwidgets = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/ktextwidgets-5.44.0.tar.xz"; - sha256 = "1kxh39n9gzism99x1x7fpdqkppdpn7aaj6j3wp4a4y4hrn82bqwp"; - name = "ktextwidgets-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ktextwidgets-5.45.0.tar.xz"; + sha256 = "1r76qvn02m6b1rvzmp966xfxr6ifflzd7g7ln0sxccsd9c46lh2b"; + name = "ktextwidgets-5.45.0.tar.xz"; }; }; kunitconversion = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kunitconversion-5.44.0.tar.xz"; - sha256 = "1zr7m1wmyr9phg3lq11qm0l24kkc1zh6xc3x4hcrpv1yn458qxdl"; - name = "kunitconversion-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kunitconversion-5.45.0.tar.xz"; + sha256 = "0alm5s3c6g3w66gzii7jjsb0cn4naiimsnm5dag6idhix79wa1kr"; + name = "kunitconversion-5.45.0.tar.xz"; }; }; kwallet = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwallet-5.44.0.tar.xz"; - sha256 = "01bah8rycjhgycd2bfkxj5jwfrwdbi2ba6bis79kbiaacl0q0qns"; - name = "kwallet-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwallet-5.45.0.tar.xz"; + sha256 = "1yis49k3wyk8vhmdhgjrn42jq5kah5z7dg8wgy09dhq61w50sdi9"; + name = "kwallet-5.45.0.tar.xz"; }; }; kwayland = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwayland-5.44.0.tar.xz"; - sha256 = "1pq8gikwcq6p67whhfm653xq79cdwr48br5ydism06644ikc2nlk"; - name = "kwayland-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwayland-5.45.0.tar.xz"; + sha256 = "0pk242h8ggd3szyw6jlk0zz8q4rw4ppbbidkilzv3lx340jr1qkq"; + name = "kwayland-5.45.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwidgetsaddons-5.44.0.tar.xz"; - sha256 = "11yaqwqkmwvhn9phmsfgyfl229zcrikdi3hz2w7nk8ibraagn5pi"; - name = "kwidgetsaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwidgetsaddons-5.45.0.tar.xz"; + sha256 = "0ywya6fa0q7vdwj7almkvdi16m839c48ma7j9sd87rc0dhigv0p0"; + name = "kwidgetsaddons-5.45.0.tar.xz"; }; }; kwindowsystem = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwindowsystem-5.44.0.tar.xz"; - sha256 = "0qn02c0yq1ir7vb56jhlla8j7nm6yx725hxnw31b8i62k1i7nvqy"; - name = "kwindowsystem-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwindowsystem-5.45.0.tar.xz"; + sha256 = "0139413wk8ifyfwadln87ik55jrp5bccy3lbz6ya191fygglx16k"; + name = "kwindowsystem-5.45.0.tar.xz"; }; }; kxmlgui = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kxmlgui-5.44.0.tar.xz"; - sha256 = "1qr6j4cnndb14fdppc2mpbqgk1mkjfdxyl5pl7gjrwd8558brjg2"; - name = "kxmlgui-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kxmlgui-5.45.0.tar.xz"; + sha256 = "1vb5izjp27qb9685haidagjg2p14a335fwzagzal20z3j2a7j3hv"; + name = "kxmlgui-5.45.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kxmlrpcclient-5.44.0.tar.xz"; - sha256 = "1r6mcwgagnskh8jiy2fyajgzqacw03d2qfk1fb3vv4lfwry4h2j3"; - name = "kxmlrpcclient-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kxmlrpcclient-5.45.0.tar.xz"; + sha256 = "0kfkai1cc4xb7vcspbmf6zd951dfz2yxiyjdar4d21s5krvcfh5l"; + name = "kxmlrpcclient-5.45.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/modemmanager-qt-5.44.0.tar.xz"; - sha256 = "1dkbyn6y605i8xqwqvpxmspp0fh7zarc0h54k30rnvv1g9rs1dd4"; - name = "modemmanager-qt-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/modemmanager-qt-5.45.0.tar.xz"; + sha256 = "16qdvy19q5pjk82amn3mncwgvk3g2qrbdzl9wpfxhqcny18xbwdd"; + name = "modemmanager-qt-5.45.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/networkmanager-qt-5.44.0.tar.xz"; - sha256 = "0bhsminn31b8w1678im5zqixmyx1m5275szca9hh7wx6dl0sxhlw"; - name = "networkmanager-qt-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/networkmanager-qt-5.45.0.tar.xz"; + sha256 = "00ipzc92v229bz9vv6kga37qhpcnqrxn2h47v9n5myfr1p6acgw0"; + name = "networkmanager-qt-5.45.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/oxygen-icons5-5.44.0.tar.xz"; - sha256 = "0ymd9s26x2ryyw851y4yb2wl9f3syzfp0z08387h90jg6xk36si5"; - name = "oxygen-icons5-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/oxygen-icons5-5.45.0.tar.xz"; + sha256 = "1va0296118x7apb7idjf0qjx5f0flamspmzicc03znbh4hx1fxyc"; + name = "oxygen-icons5-5.45.0.tar.xz"; }; }; plasma-framework = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/plasma-framework-5.44.0.tar.xz"; - sha256 = "1lfrmrgamizfkr9jmfmf3afis0z40r1chpk854pqfr4p27j4gdmz"; - name = "plasma-framework-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/plasma-framework-5.45.0.tar.xz"; + sha256 = "1db8pyq1bdkswi59aihaqgas3xzzlfsfd9yn34g4q00gzc17ird5"; + name = "plasma-framework-5.45.0.tar.xz"; }; }; prison = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/prison-5.44.0.tar.xz"; - sha256 = "0glcifwjm50kn6fk3lvwpslmh4s6s8g5r7h208dw56n19yhpkrfm"; - name = "prison-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/prison-5.45.0.tar.xz"; + sha256 = "1g6rnyx84sz28cf427y9yp0lcbdhrlgx4ns80jz34gyzcgi4bxi0"; + name = "prison-5.45.0.tar.xz"; }; }; purpose = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/purpose-5.44.0.tar.xz"; - sha256 = "1scc2vbb5ws70kvicaay634ghgp2c7xhm7d907b36jj9gvyp4d2f"; - name = "purpose-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/purpose-5.45.0.tar.xz"; + sha256 = "0mfx2gl78w2wwkykl0zch88i7d10zq5cm2xqwxjfpkpdjwb7pflb"; + name = "purpose-5.45.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/qqc2-desktop-style-5.44.0.tar.xz"; - sha256 = "02s22xncpy988fbyjj17j5saamaf8q0sll4gd2s5xsswmalvnb51"; - name = "qqc2-desktop-style-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/qqc2-desktop-style-5.45.0.tar.xz"; + sha256 = "1dc20wkh2cfyhd7wkg1v1b5f6asz70m8ksml6r5hzs807sdqvrsa"; + name = "qqc2-desktop-style-5.45.0.tar.xz"; }; }; solid = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/solid-5.44.0.tar.xz"; - sha256 = "08xw54m5srjr5n1h689hd05ld7ssimwvhlb9dlpxdavkag1vbqq1"; - name = "solid-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/solid-5.45.0.tar.xz"; + sha256 = "175hsj2hdsdnz4wkg1l56275390nn1kjpwcyb7ryzzqabn7hdqmd"; + name = "solid-5.45.0.tar.xz"; }; }; sonnet = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/sonnet-5.44.0.tar.xz"; - sha256 = "1dip8h9frxvzy39cjc205y2szdpczyh1fldlcpcq8ckjfk8pmgdm"; - name = "sonnet-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/sonnet-5.45.0.tar.xz"; + sha256 = "0msrwxfvc4vr4xqpwavnj0w4cwkflfjql8nhgm5bvk6cpcxs92ss"; + name = "sonnet-5.45.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/syntax-highlighting-5.44.0.tar.xz"; - sha256 = "10s5m1as9c1kln8mc7zf2m8zsqrf9rxfa2rzfyff1kki1icp65nm"; - name = "syntax-highlighting-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/syntax-highlighting-5.45.0.tar.xz"; + sha256 = "1v73jzansk6z0kwq65gxvkcm7vcmgw2jvl7916aqzj8xjx8kp433"; + name = "syntax-highlighting-5.45.0.tar.xz"; }; }; threadweaver = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/threadweaver-5.44.0.tar.xz"; - sha256 = "135x9z1rzvlhx13nbkacmcj7g0z88rpv0c2vy8yybysfaspc1hzn"; - name = "threadweaver-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/threadweaver-5.45.0.tar.xz"; + sha256 = "16s1pgyxhs6v1w7pwg3rr97xkd24xmf23x24pcm15ybd9g38a5yp"; + name = "threadweaver-5.45.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix deleted file mode 100644 index 1127f3e197df..000000000000 --- a/pkgs/development/libraries/kirigami/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig -, plasma-framework, qtbase, qttranslations -, qtquickcontrols ? null -, qtquickcontrols2 ? null }: - -let - pname = "kirigami"; - - generic = { name, version, sha256, qtqc, broken }: - stdenv.mkDerivation rec { - inherit name version; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - inherit sha256; - }; - - buildInputs = [ plasma-framework qtbase qtqc qttranslations ]; - - nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - - meta = with stdenv.lib; { - license = licenses.lgpl2; - homepage = http://www.kde.org; - maintainers = with maintainers; [ ttuegel peterhoeg ]; - platforms = platforms.unix; - inherit broken; - }; - }; - -in { - kirigami_1 = generic rec { - name = "${pname}-${version}"; - version = "1.1.0"; - sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6"; - qtqc = qtquickcontrols; - broken = false; - }; - - kirigami_2 = generic rec { - name = "${pname}2-${version}"; - version = "2.1.0"; - sha256 = "0d79h10jzv9z7xzap4k9vbw6p9as8vdkz3x6xlzx407i9sbzyi77"; - qtqc = qtquickcontrols2; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; - }; -} diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 8532a8880ce8..2a2f0c79490e 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.0.3"; + version = "3.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "17lqrp39w31fm7haigwq23cp92zwk3czjzqa2fhn3wafx3vafwd2"; + sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; }; buildInputs = [ diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 3ff2ca0b0ee4..2b50c09af5cc 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { make all leveldbutil libmemenv.a ''; - installPhase = " + installPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + for file in *.dylib*; do + install_name_tool -id $out/lib/$file $file + done + '') + # XXX consider removing above after transition to cmake in the next release + " mkdir -p $out/{bin,lib,include} cp -r include $out diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 20531adcd1c7..aafcf86e4a62 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }: +{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -9,14 +9,22 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + cmakeFlags = [ + "-DGDAL_CONFIG=${gdal}/bin/gdal-config" + ]; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib + ''; meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = http://www.liblas.org; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; }; } diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 421c73cbb056..85972e67e103 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { name = "libamqpcpp-${version}"; - version = "2.7.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "0m010bz0axawcpv4d1p1vx7c6r8lg27w2s2vjqpbpg99w35n6c8k"; + sha256 = "0n93wy2v2hx9zalpyn8zxsxihh0xpgcd472qwvwsc253y97v8ngv"; }; + buildInputs = [ openssl ]; + patches = [ ./libamqpcpp-darwin.patch ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix new file mode 100644 index 000000000000..d11bec2cb4ff --- /dev/null +++ b/pkgs/development/libraries/libaom/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libaom-0.1.0"; + + src = fetchgit { + url = "https://aomedia.googlesource.com/aom"; + rev = "105e9b195bb90c9b06edcbcb13b6232dab6db0b7"; + sha256 = "1fl2sca4df01gyn00s0xcwwirxccfnjppvjdrxdnb8f2naj721by"; + }; + + buildInputs = [ perl yasm ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DCONFIG_UNIT_TESTS=0" + ]; + + meta = with stdenv.lib; { + description = "AV1 Bitstream and Decoding Library"; + homepage = https://aomedia.org/av1-features/get-started/; + maintainers = with maintainers; [ kiloreux ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 827d3de79ea8..91ceb959779e 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ libgpgerror pth gettext]; doCheck = true; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 04cf1c1e696e..fde8a06eb416 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,21 +2,18 @@ stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; - version = "7.6.2"; + version = "7.6.4"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 ="1rif2hjscq5mh639nsnjhb90c01gnmy1sbmj6x6hsn1xmpnj95r1"; + sha256 = "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv"; }; outputs = [ "out" "dev" "doc" ]; - # https://github.com/ivmai/libatomic_ops/pull/32 - patches = if hostPlatform.isRiscV then [ ./riscv.patch ] else null; - nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; preConfigure = stdenv.lib.optionalString stdenv.isCygwin '' diff --git a/pkgs/development/libraries/libatomic_ops/riscv.patch b/pkgs/development/libraries/libatomic_ops/riscv.patch deleted file mode 100644 index 27f2408c34c6..000000000000 --- a/pkgs/development/libraries/libatomic_ops/riscv.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur libatomic_ops-7.6.2-orig/src/atomic_ops/sysdeps/gcc/riscv.h libatomic_ops-7.6.2/src/atomic_ops/sysdeps/gcc/riscv.h ---- libatomic_ops-7.6.2-orig/src/atomic_ops/sysdeps/gcc/riscv.h 1969-12-31 19:00:00.000000000 -0500 -+++ libatomic_ops-7.6.2/src/atomic_ops/sysdeps/gcc/riscv.h 2018-02-18 00:48:53.581721375 -0500 -@@ -0,0 +1 @@ -+#include "generic.h" -diff -Naur libatomic_ops-7.6.2-orig/src/atomic_ops.h libatomic_ops-7.6.2/src/atomic_ops.h ---- libatomic_ops-7.6.2-orig/src/atomic_ops.h 2017-12-24 03:31:12.000000000 -0500 -+++ libatomic_ops-7.6.2/src/atomic_ops.h 2018-02-18 00:48:53.580721359 -0500 -@@ -352,6 +352,9 @@ - # if defined(__tile__) - # include "atomic_ops/sysdeps/gcc/tile.h" - # endif -+# if defined(__riscv) -+# include "atomic_ops/sysdeps/gcc/riscv.h" -+# endif - #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */ - - #if (defined(__IBMC__) || defined(__IBMCPP__)) && !defined(__GNUC__) \ -diff -Naur libatomic_ops-7.6.2-orig/src/Makefile.am libatomic_ops-7.6.2/src/Makefile.am ---- libatomic_ops-7.6.2-orig/src/Makefile.am 2017-12-24 03:31:12.000000000 -0500 -+++ libatomic_ops-7.6.2/src/Makefile.am 2018-02-18 00:48:53.579721342 -0500 -@@ -92,6 +92,7 @@ - atomic_ops/sysdeps/gcc/mips.h \ - atomic_ops/sysdeps/gcc/nios2.h \ - atomic_ops/sysdeps/gcc/powerpc.h \ -+ atomic_ops/sysdeps/gcc/riscv.h \ - atomic_ops/sysdeps/gcc/s390.h \ - atomic_ops/sysdeps/gcc/sh.h \ - atomic_ops/sysdeps/gcc/sparc.h \ -diff -Naur libatomic_ops-7.6.2-orig/src/Makefile.in libatomic_ops-7.6.2/src/Makefile.in ---- libatomic_ops-7.6.2-orig/src/Makefile.in 2017-12-24 03:32:23.000000000 -0500 -+++ libatomic_ops-7.6.2/src/Makefile.in 2018-02-18 00:49:14.005062121 -0500 -@@ -446,6 +446,7 @@ - atomic_ops/sysdeps/gcc/mips.h \ - atomic_ops/sysdeps/gcc/nios2.h \ - atomic_ops/sysdeps/gcc/powerpc.h \ -+ atomic_ops/sysdeps/gcc/riscv.h \ - atomic_ops/sysdeps/gcc/s390.h \ - atomic_ops/sysdeps/gcc/sh.h \ - atomic_ops/sysdeps/gcc/sparc.h \ diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index b81eba5252f8..aab8fcd4beb8 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; - homepage = http://audacious-media-player.org/; + homepage = https://audacious-media-player.org/; license = licenses.bsd2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index ac508908e8f2..3f244d399f7e 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,17 +1,15 @@ { stdenv, buildPackages -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped , libiberty, zlib }: -let inherit (buildPackages.buildPackages) binutils-raw; in - stdenv.mkDerivation rec { name = "libbfd-${version}"; - inherit (binutils-raw.bintools) version src; + inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; - patches = binutils-raw.bintools.patches ++ [ + patches = binutils-unwrapped.patches ++ [ ../../tools/misc/binutils/build-components-separately.patch (fetchpatch { url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch new file mode 100644 index 000000000000..81822654aeb4 --- /dev/null +++ b/pkgs/development/libraries/libbsd/cdefs.patch @@ -0,0 +1,222 @@ +From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 +From: Guillem Jover <guillem@hadrons.org> +Date: Tue, 6 Mar 2018 01:41:35 +0100 +Subject: Handle systems missing <sys/cdefs.h> + +This is a non-portable header, and we cannot expect it to be provided by +the system libc (e.g. musl). We just need and rely on declaration that +we have defined ourselves in our own <bsd/sys/cdefs.h>. So we switch to +only ever assume that. + +Fixes: https://bugs.freedesktop.org/105281 +--- + include/bsd/libutil.h | 4 ++++ + include/bsd/md5.h | 4 ++++ + include/bsd/nlist.h | 4 ++++ + include/bsd/readpassphrase.h | 4 ++++ + include/bsd/stdlib.h | 4 ++++ + include/bsd/string.h | 4 ++++ + include/bsd/stringlist.h | 5 +++++ + include/bsd/sys/queue.h | 4 ++++ + include/bsd/sys/tree.h | 4 ++++ + include/bsd/timeconv.h | 4 ++++ + include/bsd/vis.h | 4 ++++ + include/bsd/wchar.h | 4 ++++ + 12 files changed, 49 insertions(+) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index 45b3b15..ccca29a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -40,7 +40,11 @@ + #define LIBBSD_LIBUTIL_H + + #include <features.h> ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <sys/types.h> + #include <stdint.h> + #include <stdio.h> +diff --git a/include/bsd/md5.h b/include/bsd/md5.h +index 5f3ae46..bf36a30 100644 +--- a/include/bsd/md5.h ++++ b/include/bsd/md5.h +@@ -27,7 +27,11 @@ typedef struct MD5Context { + uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ + } MD5_CTX; + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <sys/types.h> + + __BEGIN_DECLS +diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h +index cb297e8..8767117 100644 +--- a/include/bsd/nlist.h ++++ b/include/bsd/nlist.h +@@ -27,7 +27,11 @@ + #ifndef LIBBSD_NLIST_H + #define LIBBSD_NLIST_H + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + + struct nlist { + union { +diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h +index 14744b8..5eb8021 100644 +--- a/include/bsd/readpassphrase.h ++++ b/include/bsd/readpassphrase.h +@@ -31,7 +31,11 @@ + #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ + #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <sys/types.h> + + __BEGIN_DECLS +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index ebc9638..8d33d1f 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -42,7 +42,11 @@ + #ifndef LIBBSD_STDLIB_H + #define LIBBSD_STDLIB_H + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <sys/stat.h> + #include <stdint.h> + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 6798bf6..29097f6 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_STRING_H + #define LIBBSD_STRING_H + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <sys/types.h> + + __BEGIN_DECLS +diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h +index ff30cac..dd71496 100644 +--- a/include/bsd/stringlist.h ++++ b/include/bsd/stringlist.h +@@ -31,7 +31,12 @@ + + #ifndef LIBBSD_STRINGLIST_H + #define LIBBSD_STRINGLIST_H ++ ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <sys/types.h> + + /* +diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h +index 4a94ea7..ac00026 100644 +--- a/include/bsd/sys/queue.h ++++ b/include/bsd/sys/queue.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_SYS_QUEUE_H + #define LIBBSD_SYS_QUEUE_H + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + + /* + * This file defines four types of data structures: singly-linked lists, +diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h +index 628bec0..325b382 100644 +--- a/include/bsd/sys/tree.h ++++ b/include/bsd/sys/tree.h +@@ -30,7 +30,11 @@ + #ifndef LIBBSD_SYS_TREE_H + #define LIBBSD_SYS_TREE_H + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + + /* + * This file defines data structures for different types of trees: +diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h +index e2a2c55..a426bd3 100644 +--- a/include/bsd/timeconv.h ++++ b/include/bsd/timeconv.h +@@ -41,7 +41,11 @@ + #ifndef LIBBSD_TIMECONV_H + #define LIBBSD_TIMECONV_H + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <stdint.h> + #include <time.h> + +diff --git a/include/bsd/vis.h b/include/bsd/vis.h +index 970dfdd..ab5430c 100644 +--- a/include/bsd/vis.h ++++ b/include/bsd/vis.h +@@ -72,7 +72,11 @@ + */ + #define UNVIS_END 1 /* no more characters */ + ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + + __BEGIN_DECLS + char *vis(char *, int, int, int); +diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h +index 33a500e..7216503 100644 +--- a/include/bsd/wchar.h ++++ b/include/bsd/wchar.h +@@ -40,7 +40,11 @@ + #define LIBBSD_WCHAR_H + + #include <stddef.h> ++#ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> ++#else ++#include <bsd/sys/cdefs.h> ++#endif + #include <sys/types.h> + + __BEGIN_DECLS +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 0e232a50e943..ff9412ceb580 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -13,7 +13,16 @@ stdenv.mkDerivation rec { # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch + # Suitable for all, but limited to musl to avoid rebuilds + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 + ./non-glibc.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd + ./cdefs.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404 + ./features.patch + ]; meta = with stdenv.lib; { description = "Common functions found on BSD systems"; diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch new file mode 100644 index 000000000000..66bd1e9232ba --- /dev/null +++ b/pkgs/development/libraries/libbsd/features.patch @@ -0,0 +1,26 @@ +From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001 +From: Guillem Jover <guillem@hadrons.org> +Date: Tue, 6 Mar 2018 01:42:52 +0100 +Subject: Remove <features.h> inclusion from <bsd/libutil.h> + +This is a non-portable header, and we should not assume it is present. +Let the first system header pull it in if needed. +--- + include/bsd/libutil.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index ccca29a..e5f148a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -39,7 +39,6 @@ + #ifndef LIBBSD_LIBUTIL_H + #define LIBBSD_LIBUTIL_H + +-#include <features.h> + #ifdef LIBBSD_OVERLAY + #include <sys/cdefs.h> + #else +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch new file mode 100644 index 000000000000..f61e0d242943 --- /dev/null +++ b/pkgs/development/libraries/libbsd/non-glibc.patch @@ -0,0 +1,74 @@ +From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 +From: Guillem Jover <guillem@hadrons.org> +Date: Tue, 6 Mar 2018 01:39:45 +0100 +Subject: Fix function declaration protection for glibc already providing them +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On non-glibc based systems we cannot unconditionally use the +__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, +if it is undefined, define it to 0. + +We should also always declare these functions on non-glibc based +systems. And on systems with a new enough glibc, which provides these +functions, we should still provide the declarations if _GNU_SOURCE +is *not* defined. + +Reported-by: Jörg Krause <joerg.krause@embedded.rocks> +--- + include/bsd/stdlib.h | 3 ++- + include/bsd/string.h | 3 ++- + include/bsd/sys/cdefs.h | 8 ++++++++ + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index 8d33d1f..a5b063c 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 29097f6..f987fee 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); + char *strnstr(const char *str, const char *find, size_t str_len); + void strmode(mode_t mode, char *str); + +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) + void explicit_bzero(void *buf, size_t len); + #endif + __END_DECLS +diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h +index b4c8f30..d1cc419 100644 +--- a/include/bsd/sys/cdefs.h ++++ b/include/bsd/sys/cdefs.h +@@ -59,6 +59,14 @@ + #endif + + /* ++ * On non-glibc based systems, we cannot unconditionally use the ++ * __GLIBC_PREREQ macro as it gets expanded before evaluation. ++ */ ++#ifndef __GLIBC_PREREQ ++#define __GLIBC_PREREQ(maj, min) 0 ++#endif ++ ++/* + * Some kFreeBSD headers expect those macros to be set for sanity checks. + */ + #ifndef _SYS_CDEFS_H_ +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6e9b033a976a..6b370f46e70d 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "0dbpmvd2p9bdqdyiijmsc1hd9d6l36migk79smw7fpfvh0y6ldsk"; + sha256 = "01lyikbpqky1ib8g4vhwpb5rjwyzm6g1z24z8m73lk4vcdl65190"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index b3aa2b199060..48e632ba52d8 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig, + libiconv, IOKit, DiskArbitration}: stdenv.mkDerivation { name = "libcdio-paranoia-0.94+2"; @@ -11,7 +12,14 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libcdio ]; + buildInputs = [ libcdio ] ++ + stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; + + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration; + + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--disable-ld-version-script" + ]; meta = with stdenv.lib; { description = "CD paranoia on top of libcdio"; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 228dccea3e39..0005525a7cd2 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake }: -let version = "2.0.1"; in +let version = "2.1.0.1"; in stdenv.mkDerivation { name = "p8-platform-${version}"; src = fetchurl { url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; - sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9"; + sha256 = "18381y54f7d18ckpzf9cfxbz1ws6imprbbm9pvhcg5c86ln8skq6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 7c7cd1c3aae2..c3050bf8c676 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.8.5"; + version = "2.8.6"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "1iwzf0y5f25g5hgdkmv6qf3k5mzlazrpx5sj3m2pvrl9jg9wn4s1"; + sha256 = "1in0fdl5mgzhwmd8kvniqkizi7isf2g2gvbknfbbdmxkki7a8p95"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 50f03f3ac7ac..faa8b483a780 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.28.0"; + version = "3.28.1"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zq37i7gnmnc7qfngzhj71nqhf2wxl4m247s2ym9ykakxbi6zajp"; + sha256 = "04j9pjigpgxddq6y90y73k8qyjixlalip87q121ss5d8zp8xnz32"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3eb7325132a8..82307e9ab163 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.90"; + name = "libdrm-2.4.91"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b"; + sha256 = "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index bd230c61028f..154128144201 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation rec { - name = "libedit-20160903-3.1"; + name = "libedit-20170329-3.1"; src = fetchurl { url = "http://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "0rvmm8z6hal5bbp5pljp7yvkpqi4pkas1amizhvg35v0skkx5jqc"; + sha256 = "1gnlgl0x8g9ky59s70nriy5gv47676d1s4ypvbv8y11apl7xkwli"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix new file mode 100644 index 000000000000..980cee2e6879 --- /dev/null +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libESMTP-${version}"; + version = "1.0.6"; + + src = fetchurl { + url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2"; + sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; + }; + + meta = with stdenv.lib; { + homepage = http://brianstafford.info/libesmtp/index.html; + description = "A Library for Posting Electronic Mail"; + license = licenses.lgpl21; + }; +} + diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 063633619431..b09c2dd0f47e 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,6 +1,6 @@ { autoconf, automake, fetchgit, libtool, stdenv, openssl }: -let version = "1.6"; in +let version = "1.8"; in stdenv.mkDerivation { name = "libetpan-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/dinhviethoa/libetpan"; rev = "refs/tags/" + version; - sha256 = "13hv49271rr9yj7ifxqqmc0jfy1f26llivhp22s5wigick7qjxky"; + sha256 = "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk"; }; buildInputs = [ autoconf automake libtool openssl ]; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index e14f4cbf5d63..871437f19082 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, findutils +{ stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; postInstall = stdenv.lib.optionalString sslSupport '' diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 7ea1ecdd0522..4bc1d1addcfb 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,15 +1,16 @@ -{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGL_driver, libX11, libXext, glproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: -# Git version is needed for EGL and GLES handling. - -stdenv.mkDerivation rec { - name = "libglvnd-2016-12-22"; +let + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; +in stdenv.mkDerivation rec { + name = "libglvnd-${version}"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; - rev = "dc16f8c337703ad141f83583a4004fcf42e07766"; - sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f"; + rev = "v${version}"; + sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; @@ -17,11 +18,21 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGL_driver.driverLink}/share/glvnd/egl_vendor.d\"" + # FHS paths are added so that non-NixOS applications can find vendor files. + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ]; + # Upstream patch fixing use of libdl, should be in next release. + patches = [ + (fetchpatch { + url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; + sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; + }) + ]; outputs = [ "out" "dev" ]; + passthru = { inherit driverLink; }; + meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; homepage = https://github.com/NVIDIA/libglvnd; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 5c5824a9930c..2fcf6701ab8f 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,7 +1,7 @@ -{ stdenv, buildPackages, fetchurl, gettext -, hostPlatform, genPosixLockObjOnly ? false +{ stdenv, lib, fetchpatch, buildPackages, fetchurl, gettext +, genPosixLockObjOnly ? false }: let - genPosixLockObjOnlyAttrs = stdenv.lib.optionalAttrs genPosixLockObjOnly { + genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { buildPhase = '' cd src make gen-posix-lock-obj @@ -17,18 +17,24 @@ }; in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; - version = "1.27"; + version = "1.28"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; + sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"; }; - patches = if hostPlatform.isRiscV then ./riscv.patch else null; + patches = [ + # Fix builds on ARM, AArch64 + (fetchpatch { + url = "https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623.patch"; + sha256 = "0vqfw0ak1j37wf6sk9y9vmdyk3kxdxkldhs0bv2waa76s11cmdx0"; + }) + ]; postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h ''; @@ -41,7 +47,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ gettext ]; postConfigure = - stdenv.lib.optionalString stdenv.isSunOS + lib.optionalString stdenv.isSunOS # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number diff --git a/pkgs/development/libraries/libgpg-error/riscv.patch b/pkgs/development/libraries/libgpg-error/riscv.patch deleted file mode 100644 index afc3b9993a43..000000000000 --- a/pkgs/development/libraries/libgpg-error/riscv.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit b3e9ec5626d474c58e683a41d09576297d4acd3d -Author: Shea Levy <shea@shealevy.com> -Date: Sat Feb 24 21:12:44 2018 -0500 - - syscfg: Add lock-obj-pub file for riscv64-unknown-linux-gnu. - - * src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: new. - * src/Makefile.am (lock_obj_pub): Add it. - - Signed-off-by: Shea Levy <shea@shealevy.com> - -diff --git a/src/Makefile.am b/src/Makefile.am -index 4446612..5a8cc43 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -65,6 +65,7 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ -+ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ - syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ -diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -new file mode 100644 -index 0000000..8aab9d6 ---- /dev/null -+++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -@@ -0,0 +1,25 @@ -+## lock-obj-pub.riscv64-unknown-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[40]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 1da6cffe3f2c..89fcfdfde8da 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgringotts-${version}"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "http://libgringotts.sourceforge.net/current/${name}.tar.bz2"; - sha256 = "1bzfnpf2gwc2bisbrw06s63g9z9v4mh1n9ksqr6pbgj2prz7bvlk"; + url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2"; + sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 54a17d94a598..b0013d0f9491 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: +, python, perl, gdk_pixbuf, libiconv, libintl }: let inherit (stdenv.lib) optionals; in @@ -11,21 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool libintl ]; buildInputs = [ gettext bzip2 zlib python ] ++ stdenv.lib.optional doCheck perl; - propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] - ++ libintlOrEmpty; + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]; outputs = [ "out" "dev" ]; doCheck = true; preCheck = "patchShebangs ./tests/"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "GNOME's Structured File Library"; homepage = https://www.gnome.org/projects/libgsf; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 0a44eee90aa0..656395b8867d 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintlOrEmpty, gnome3 }: +{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, gnome3 }: let pname = "libgtop"; version = "2.38.0"; @@ -12,11 +12,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - buildInputs = libintlOrEmpty; nativeBuildInputs = [ pkgconfig perl gettext gobjectIntrospection ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b55fc18cb69b..a4e6fed88e1c 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"; }; + setupHook = ./setup-hook.sh; + postPatch = lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh new file mode 100644 index 000000000000..78222dddbf1d --- /dev/null +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -0,0 +1,18 @@ +# libiconv must be listed in load flags on non-Glibc +# it doesn't hurt to have it in Glibc either though +iconvLdflags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -liconv" +} + +addEnvHooks "$hostOffset" iconvLdflags diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index d375785e497e..46cb579c56c4 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./fix-error-darwin.patch; - nativeBuildInputs = [ ronn ] - ++ optional stdenv.isDarwin help2man; + nativeBuildInputs = optional stdenv.isDarwin help2man; buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 9bbb8f0e129d..944cf7a6f5e2 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -4,7 +4,7 @@ , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl , gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss -, libintlOrEmpty }: +, libintl }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -19,14 +19,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintlOrEmpty ] + buildInputs = [ glib libxml2 gsasl libidn gss libintl ] ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; propagatedBuildInputs = [ gnutls ]; - + configureFlags = '' ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} ${edf gtkWidgets "inftextgtk"} @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { ${edf avahiSupport "avahi"} ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 3f7a4bed9cc9..0611e0e57e7b 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ gettext ]; propagatedBuildInputs = [ libgpgerror ]; postInstall = '' diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 36343faa0f99..8c204ba4006f 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.03"; + version = "18.03.1"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1d4zqik9sm8fsr26w5jsp0rgczlh5vh3gwknxy4g3gd6pqri4igv"; + sha256 = "183gcb6h81blgvssfl5lxsv8h5izkgg6b86z0jy9g699adgkchq2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 2e7c913e6a8d..041e0d98d654 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }: +{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: stdenv.mkDerivation rec { name = "libmicrohttpd-${version}"; @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" "info" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgcrypt curl gnutls ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ]; + buildInputs = [ libgcrypt curl gnutls libiconv libintl ]; preCheck = '' # Since `localhost' can't be resolved in a chroot, work around it. @@ -38,4 +37,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 33ccccea2e95..2dbdb60b4b66 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { This library aims to provide simple helpers that allows you to re-use code and to avoid re-inventing the wheel. ''; - homepage = http://netfilter.org/projects/libmnl/index.html; + homepage = https://netfilter.org/projects/libmnl/index.html; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 06a98bcdcebf..b23701837fa0 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmowgli-0.9.50"; + name = "libmowgli-${version}"; + version = "2.1.3"; src = fetchurl { - url = "http://distfiles.atheme.org/${name}.tar.bz2"; - sha256 = "0wbnpd2rzk5jg6pghgxyx7brjrdmsyg4p0mm9blwmrdrj5ybxx9z"; + url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz"; + sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp"; }; meta = { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index dca80bbbe881..88ef55715a7c 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.14"; + name = "libmtp-1.1.15"; src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "1s0jyhypxmj0j8s003ba1n74x63h1rw8am9q4z2ip3xyjvid65rq"; + sha256 = "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index c184e647d286..9eefbcfdb49e 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmysqlconnectorcpp-${version}"; - version = "1.1.7"; + version = "1.1.9"; src = fetchurl { url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; - sha256 = "0qy7kxz8h1zswr50ysyl2cc9gy0ip2j7ikl714m7lq3gsay3ydav"; + sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y"; }; buildInputs = [ cmake boost mysql ]; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fe38755f10c5..9b692e9e3b2e 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation (rec { maintainers = [ ]; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { - NIX_LDFLAGS = "-liconv"; propagatedBuildInputs = [ libiconv ]; }) diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 17dea7b3d7d2..1b4c471a2567 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.6"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications ''; - homepage = http://netfilter.org/projects/libnetfilter_conntrack/; + homepage = https://netfilter.org/projects/libnetfilter_conntrack/; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index f30e12a41631..d16155374ca8 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { With this library, you can create, update and delete timeout policies that can be attached to traffic flows. This library is used by conntrack-tools. ''; - homepage = http://netfilter.org/projects/libnetfilter_cttimeout/; + homepage = https://netfilter.org/projects/libnetfilter_cttimeout/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index f660cd7a7814..0d8de14513ed 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.1"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { system that deprecates the old syslog/dmesg based packet logging. This library has been previously known as libnfnetlink_log. ''; - homepage = http://netfilter.org/projects/libnetfilter_log/; + homepage = https://netfilter.org/projects/libnetfilter_log/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix new file mode 100644 index 000000000000..b6d5912581ba --- /dev/null +++ b/pkgs/development/libraries/libngspice/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, bison, flex, fftw}: + +# Note that this does not provide the ngspice command-line utility. For that see +# the ngspice derivation. +stdenv.mkDerivation { + name = "libngspice-26"; + + src = fetchurl { + url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz"; + sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ fftw ]; + + configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ]; + + meta = with stdenv.lib; { + description = "The Next Generation Spice (Electronic Circuit Simulator)"; + homepage = http://ngspice.sourceforge.net; + license = with licenses; [ "BSD" gpl2 ]; + maintainers = with maintainers; [ bgamari ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index d6d6989761bc..c918c61abf0d 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages -, fetchurl, autoreconfHook264, bison, binutils-raw +, fetchurl, autoreconfHook264, bison, binutils-unwrapped , libiberty, libbfd }: stdenv.mkDerivation rec { name = "libopcodes-${version}"; - inherit (binutils-raw.bintools) version src; + inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; - patches = binutils-raw.bintools.patches ++ [ + patches = binutils-unwrapped.patches ++ [ ../../tools/misc/binutils/build-components-separately.patch ]; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index 4da6a0b3cbc7..e11527ca10c9 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { - name = "libpipeline-1.4.1"; - + name = "libpipeline-1.5.0"; + src = fetchurl { url = "mirror://savannah/libpipeline/${name}.tar.gz"; - sha256 = "1vmrs4nvdsmb550bk10cankrd42ffczlibpsnafxpak306rdfins"; + sha256 = "0avg525wvifcvjrwa6i1r6kvahmsswj0mpxrsxzzdzra9wpf2whd"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 97fb5f27d9dd..eb70677b3e95 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libpqxx-${version}"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "jtv"; repo = "libpqxx"; rev = version; - sha256 = "1dv96h10njg115216n2zm6fsvi4kb502hmhhn8cjhlfbxr9vc84q"; + sha256 = "0yw0wvnpw0j560f5zv4gvmafi19d9hrknwjzl7qrss926aqx65jq"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index cdc2a6570022..1b15769465e1 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "0bam1xvw4n5sm3g4kmggz2aha34xaw64kw15wl2lbkd2yzdjdm4l"; + sha256 = "1wrd9ajf00h1ja56r25vljjsgklg0qlzmziax7x26wjqkigc28iq"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix index 337d9423aa3d..7c1844bf281e 100644 --- a/pkgs/development/libraries/libqrencode/default.nix +++ b/pkgs/development/libraries/libqrencode/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "libqrencode-${version}"; - version = "3.4.4"; + version = "4.0.0"; src = fetchurl { url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; sha1 = "644054a76c8b593acb66a8c8b7dcf1b987c3d0b2"; - sha256 = "0wiagx7i8p9zal53smf5abrnh9lr31mv0p36wg017401jrmf5577"; + sha256 = "10da4q5pym7pzxcv21w2kc2rxmq7sp1rg58zdklwfr0jjci1nqjv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 56272b319917..ceff244670f3 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: stdenv.mkDerivation rec { - name = "rasqal-0.9.32"; + name = "rasqal-0.9.33"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "eeba03218e3b7dfa033934d523a1a64671a9a0f64eadc38a01e4b43367be2e8f"; + sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 5db5d2b59651..55bb22e660b0 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.14"; + name = "librelp-1.2.15"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "0marms2np729ck0x0hsj1bdmi0ly57pl7pfspwrqld9n8cd29xhi"; + sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 1384b3e7a74e..e6d2612fe626 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "librime-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; rev = "${version}"; - sha256 = "1sxxxliqjjsfblx9n6ijw9gx40xqw71v352b28aw51gg3k201v0j"; + sha256 = "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4bb4db104382..c2e1739117b5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3 +, bzip2, libcroco, libintl, darwin, rust, gnome3 , withGTK ? false, gtk3 ? null , vala, gobjectIntrospection }: @@ -15,11 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - outputs = [ "out" "dev" ]; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ]; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index df160f3405a3..ec4fa6b7427a 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0qy5hsglrdwzlb1x83v40pnm52hrjbdrc5zardp89i3vwcdzkrq8"; + sha256 = "1qjpicbjsj9gf8s00ma0d6kw6qfnc29fhrqdkvq8427wfffj654r"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index d953fd12e68b..e0c77a0cf357 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/seccomp/libseccomp"; license = licenses.lgpl21; platforms = platforms.linux; + badPlatforms = platforms.riscv; maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 4ff00d777691..b77ba49822fd 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc -, libgcrypt, gobjectIntrospection, vala_0_38, gnome3 }: +, libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: let pname = "libsecret"; version = "0.18.5"; @@ -14,10 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; + nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl libintl ]; buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; # optional: build docs with gtk-doc? (probably needs a flag as well) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 396bd09921fe..2d5fa20c7cf8 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.33"; + rev = "0.6.34"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "1vf8mwqzjjqkd5ir71h4lifybibs5nhqgfgq5zzlazby02zx2yiz"; + sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; }; cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index dad245d0791e..92e9c3662c9f 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3 , gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection , valaSupport ? true, vala_0_40 -, libintlOrEmpty , intltool, python3 }: + let pname = "libsoup"; version = "2.62.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = libintlOrEmpty ++ [ python3 sqlite ]; + buildInputs = [ python3 sqlite ]; nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ] ++ stdenv.lib.optionals valaSupport [ vala_0_40 ]; propagatedBuildInputs = [ glib libxml2 ]; @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { "--with-gnome=${if gnomeSupport then "yes" else "no"}" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index fe0acbfc538d..aa3aaa1c59bc 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 375c59f77631..fd58f4f44e78 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.theora.org/; + homepage = https://www.theora.org/; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt wkennington ]; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 2f8963db0cd8..b1e6938a1494 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -15,7 +15,9 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ] ++ - (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]); + (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa] + else if backend == "unix" then [gtk3] + else null); preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index aa106baf8152..85f8b6df2959 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "liburcu-${version}"; src = fetchurl { - url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace RCU (read-copy-update) library"; - homepage = http://lttng.org/urcu; + homepage = https://lttng.org/urcu; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 44638b4dfd59..69afd9d4c691 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }: stdenv.mkDerivation rec { - name = "libusb-1.0.21"; + name = "libusb-1.0.22"; src = fetchurl { url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "0jw2n5kdnrqvp7zh792fd6mypzzfap6jp4gfcmq4n6c1kb79rkkx"; + sha256 = "0mw1a5ss4alg37m6bd4k44v35xwrcwp5qm4s686q1nsgkbavkbkm"; }; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 031ac781651c..04d621e29c84 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, mesa_noglu -, minimal ? true, libva +, libGL, libGL_driver +, minimal ? false, libva1-minimal }: stdenv.mkDerivation rec { @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them configureFlags = - [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++ + # Add FHS paths for non-NixOS applications. + [ "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 6b8c3631fb37..0ba49da06cfe 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 -, libGL -, minimal ? true, libva +, libGL, libGL_driver +, minimal ? false, libva-minimal }: stdenv.mkDerivation rec { - name = "libva-${lib.optionalString (!minimal) "full-"}${version}"; + name = "libva-${lib.optionalString minimal "minimal-"}${version}"; version = "2.1.0"; # update libva-utils and vaapiIntel as well @@ -21,13 +21,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ]; + ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them enableParallelBuilding = true; configureFlags = [ - "--with-drivers-path=${libGL.driverLink}/lib/dri" + # Add FHS paths for non-NixOS applications. + "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index eebdc2941974..35c339b45d09 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, xorg, libGL }: +{ stdenv, fetchurl, pkgconfig, xorg, libGL_driver }: stdenv.mkDerivation rec { - name = "libvdpau-1.1.1"; + name = "libvdpau-${version}"; + version = "1.1.1"; src = fetchurl { url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${libGL.driverLink}/lib/vdpau"; + "--with-module-dir=${libGL_driver.driverLink}/lib/vdpau"; installFlags = [ "moduledir=$(out)/lib/vdpau" ]; diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index bda14d729476..a09e2cf2f72a 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -1,32 +1,31 @@ { stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf -, librevenge, libxml2, icu, perl +, librevenge, libxml2, icu, perl, cppunit, doxygen }: stdenv.mkDerivation rec { - name = "libvisio-0.1.3"; + name = "libvisio-${version}"; + version = "0.1.6"; + + outputs = [ "out" "bin" "dev" "doc" ]; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; - sha256 = "1blgdwxprqkasm2175imcvy647sqv6xyf3k09p0b1i7hlq889wvy"; + url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz"; + sha256 = "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig cppunit doxygen ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; - # Boost 1.59 compatability fix - # Attempt removing when updating - postPatch = '' - sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in - ''; - configureFlags = [ "--disable-werror" - "--disable-tests" ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { description = "A library providing ability to interpret and import visio diagrams into various applications"; - homepage = http://www.freedesktop.org/wiki/Software/libvisio; - platforms = stdenv.lib.platforms.unix; + homepage = https://wiki.documentfoundation.org/DLP/Libraries/libvisio; + license = licenses.mpl20; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 824449a347af..ef499f238d63 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = http://www.webmproject.org/; + homepage = https://www.webmproject.org/; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index f2d05d14d693..8efd908584e1 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; propagatedBuildInputs = [ libX11 gtk3 ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 7ed2d2fd6300..d225831f7024 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { name = "libxcomp-${version}"; - version = "3.5.0.33"; + version = "3.5.99.16"; src = fetchurl { - sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74"; + sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libjpeg libpng libX11 zlib ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; preAutoreconf = '' cd nxcomp/ + sed -i 's|/src/.libs/libXcomp.a|/src/.libs/libXcomp.la|' test/Makefile.am ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index f5660e93d79a..f2a8d75a9cbb 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; # 2018-02-16 }; } diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 5d63dd770664..1479f7b6153b 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -2,14 +2,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD let - version = "2018.02.12"; + version = "2018.02.28"; in stdenv.mkDerivation { name = "live555-${version}"; src = fetchurl { # the upstream doesn't provide a stable URL url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; - sha256 = "08860q07hfiln44d6qaasmfalf4hb9na5jsfd4yps6jn4r54xxwx"; + sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d"; }; postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index d96b5ed6d520..0bb3a67d9502 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,17 +2,20 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.21"; + version = "0.9.22"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "026a6himvg3y4ssnccdbgr3c2pq3w2d47nayn05v512875z4f2w3"; + sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; + patches = [ ./hardcoded-compiler.patch ]; + patchFlags = "-p3"; + outputs = [ "bin" "out" "dev" ]; makeFlags = [ "prefix=$(out)" "CC=cc" ] diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch new file mode 100644 index 000000000000..ddb247b7f113 --- /dev/null +++ b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch @@ -0,0 +1,26 @@ +commit 029031a68873bc3784a8561bd8e049efbd34f9d0 (HEAD) +Author: Vladimír Čunát <vcunat@gmail.com> +Date: Sun Apr 1 11:05:31 2018 +0200 + + make: gcc -> $(CC) + +diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile +index f254511..612484e 100644 +--- a/libraries/liblmdb/Makefile ++++ b/libraries/liblmdb/Makefile +@@ -102,13 +102,13 @@ COV_OBJS=xmdb.o xmidl.o + + coverage: xmtest + for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \ +- gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ ++ $(CC) -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ + rm -rf testdb; mkdir testdb; ./x$$j; done + gcov xmdb.c + gcov xmidl.c + + xmtest: mtest.o xmdb.o xmidl.o +- gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) ++ $(CC) -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) + + xmdb.o: mdb.c lmdb.h midl.h + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@ diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index ac0b7bf68341..8e8541564245 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; meta = { - homepage = http://logging.apache.org/log4cxx/index.html; + homepage = https://logging.apache.org/log4cxx/index.html; description = "A logging framework for C++ patterned after Apache log4j"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 0a64c7c0429a..3828ebcb7a70 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "mailcore2-${version}"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "MailCore"; repo = "mailcore2"; rev = version; - sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb"; + sha256 = "1d0wmnkk9vnjqc28i79z3fwaaycdbprfspagik4mzdkgval5r5pm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 9fcc9c70a9b1..573215227369 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.11"; + name = "matio-1.5.12"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "02ygr7bslzvn6mhxvapz57bh4d448xjf3ds82g1cvhn9al6fvk0c"; + sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 91fcba97e184..8c2a2a694b03 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.7.1"; + name = "mbedtls-2.8.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "0dkmhvs38sqgnfxgzrs81ghajyyzp9bb7wy9kn96q7zy4lly0gg6"; + sha256 = "1pnwmy0qg8g9lz26fpr5fzpvrdjm59winxpwdjfp6d62qxdjbgmn"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 9a6441956db3..4e35d6ed24d1 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, libGL }: stdenv.mkDerivation rec { - name = "glu-9.0.0"; + name = "glu-${version}"; + version = "9.0.0"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ mesa_noglu ]; + propagatedBuildInputs = [ libGL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index fbbfe44e27e8..e77a4e1414e9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook, substituteAll , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages, libffi, libomxil-bellagio, libva +, llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 +, libglvnd , grsecEnabled ? false , enableRadv ? true # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. @@ -54,7 +55,7 @@ let (if gallium_ == null then defaultGalliumDrivers else gallium_) - ++ ["swrast"]; + ++ ["swrast" "virgl"]; driDrivers = (if dri_ == null then defaultDriDrivers @@ -66,12 +67,11 @@ let in let - version = "17.3.6"; + version = "17.3.8"; branch = head (splitString "." version); - driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in -stdenv.mkDerivation { +let self = stdenv.mkDerivation { name = "mesa-noglu-${version}"; src = fetchurl { @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8"; + sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg"; }; prePatch = "patchShebangs ."; @@ -92,16 +92,17 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; + ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl + ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ - "--sysconfdir=${driverLink}/etc" + "--sysconfdir=${libglvnd.driverLink}/etc" "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" - "--with-dri-searchpath=${driverLink}/lib/dri" + "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri" "--with-platforms=x11,wayland,drm" ] ++ (optional (galliumDrivers != []) @@ -118,6 +119,7 @@ stdenv.mkDerivation { (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine + "--enable-libglvnd" "--enable-dri" "--enable-driglx-direct" "--enable-gles1" @@ -146,21 +148,21 @@ stdenv.mkDerivation { ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ - expat llvmPackages.llvm + expat llvmPackages.llvm libglvnd glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC - libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ + libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ valgrind-light python2 ]; - enableParallelBuilding = true; doCheck = false; installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" + "vendorjsondir=\${out}/share/glvnd/egl_vendor.d" ]; # TODO: probably not all .la files are completely fixed, but it shouldn't matter; @@ -174,8 +176,10 @@ stdenv.mkDerivation { $out/lib/libxatracker* \ $out/lib/libvulkan_* + # Move other drivers to a separate output mv $out/lib/dri/* $drivers/lib/dri # */ rmdir "$out/lib/dri" + mv $out/lib/lib*_mesa* $drivers/lib # move libOSMesa to $osmesa, as it's relatively big mkdir -p {$osmesa,$drivers}/lib/ @@ -185,10 +189,22 @@ stdenv.mkDerivation { sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la # set the default search path for DRI drivers; used e.g. by X server - substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" - '' + optionalString (vulkanDrivers != []) '' - # move share/vulkan/icd.d/ + substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${libglvnd.driverLink}" + + # remove GLES libraries; they are provided by libglvnd + rm $out/lib/lib{GLESv1_CM,GLESv2}.* + + # remove pkgconfig files for GL/GLES/EGL; they are provided by libGL. + rm $dev/lib/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc + + # move vendor files mv $out/share/ $drivers/ + + # Update search path used by glvnd + for js in $drivers/share/glvnd/egl_vendor.d/*.json; do + substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" + done + '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) for js in $drivers/share/vulkan/icd.d/*.json; do @@ -209,13 +225,48 @@ stdenv.mkDerivation { done ''; - passthru = { inherit libdrm version driverLink; }; + passthru = { + inherit libdrm version; + inherit (libglvnd) driverLink; + + stubs = stdenv.mkDerivation { + name = "libGL-${libglvnd.version}"; + outputs = [ "out" "dev" ]; + + # Use stub libraries from libglvnd and headers from Mesa. + buildCommand = '' + ln -s ${libglvnd.out} $out + mkdir -p $dev/{,lib/pkgconfig,nix-support} + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${self.dev}/include $dev/include + + genPkgConfig() { + local name="$1" + local lib="$2" + + cat <<EOF >$dev/lib/pkgconfig/$name.pc + Name: $name + Description: $lib library + Version: ${self.version} + Libs: -L${libglvnd.out}/lib -l$lib + Cflags: -I${self.dev}/include + EOF + } + + genPkgConfig gl GL + genPkgConfig egl EGL + genPkgConfig glesv1_cm GLESv1_CM + genPkgConfig glesv2 GLESv2 + ''; + }; + }; meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; maintainers = with maintainers; [ eduarrrd vcunat ]; }; -} +}; +in self diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch new file mode 100644 index 000000000000..dd3e6bb64af8 --- /dev/null +++ b/pkgs/development/libraries/mesa/missing-include.patch @@ -0,0 +1,11 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include <sys/stat.h> + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + diff --git a/pkgs/development/libraries/mesa/musl-fixes.patch b/pkgs/development/libraries/mesa/musl-fixes.patch deleted file mode 100644 index 60140d445ae8..000000000000 --- a/pkgs/development/libraries/mesa/musl-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include <sys/stat.h> - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - ---- a/src/util/u_endian.h.orig 2016-11-04 12:16:00.480356454 +0100 -+++ b/src/util/u_endian.h 2016-11-04 12:16:11.984347944 +0100 -@@ -27,7 +27,7 @@ - #ifndef U_ENDIAN_H - #define U_ENDIAN_H - --#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) -+#if defined(__linux__) || defined(ANDROID) || defined(__CYGWIN__) - #include <endian.h> - - #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index d85d4f444077..3766140eea1e 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://movit.sesse.net/${name}.tar.gz"; + url = "https://movit.sesse.net/${name}.tar.gz"; sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44"; }; diff --git a/pkgs/development/libraries/mpfr/upstream.patch b/pkgs/development/libraries/mpfr/upstream.patch deleted file mode 100644 index 779331605245..000000000000 --- a/pkgs/development/libraries/mpfr/upstream.patch +++ /dev/null @@ -1,1699 +0,0 @@ -diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES ---- mpfr-3.1.3-a/PATCHES 2015-07-02 10:49:23.950112879 +0000 -+++ mpfr-3.1.3-b/PATCHES 2015-07-02 10:49:24.042113845 +0000 -@@ -0,0 +1 @@ -+lngamma-and-doc -diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION ---- mpfr-3.1.3-a/VERSION 2015-06-19 19:55:09.000000000 +0000 -+++ mpfr-3.1.3-b/VERSION 2015-07-02 10:49:24.042113845 +0000 -@@ -1 +1 @@ --3.1.3 -+3.1.3-p1 -diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi ---- mpfr-3.1.3-a/doc/mpfr.texi 2015-06-19 19:55:11.000000000 +0000 -+++ mpfr-3.1.3-b/doc/mpfr.texi 2015-07-02 10:49:24.018113593 +0000 -@@ -810,13 +810,17 @@ - When the input point is in the closure of the domain of the mathematical - function and an input argument is +0 (resp.@: @minus{}0), one considers - the limit when the corresponding argument approaches 0 from above --(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on --@minus{}0), the behavior is specified in the description of the MPFR function. -+(resp.@: below), if possible. If the limit is not defined (e.g., -+@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is -+specified in the description of the MPFR function, but must be consistent -+with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0 -+gives @minus{}Inf). - - When the result is equal to 0, its sign is determined by considering the - limit as if the input point were not in the domain: If one approaches 0 - from above (resp.@: below), the result is +0 (resp.@: @minus{}0); --for example, @code{mpfr_sin} on +0 gives +0. -+for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and -+@code{mpfr_acos} on 1 gives +0 (in all rounding modes). - In the other cases, the sign is specified in the description of the MPFR - function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0. - -@@ -832,8 +836,8 @@ - @c that advantages in practice), like for any bug fix. - Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot} - on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}), --since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf) --gives +Inf. -+since for any finite or infinite input @var{x}, @code{mpfr_hypot} on -+(@var{x},+Inf) gives +Inf. - - @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics - @comment node-name, next, previous, up -@@ -1581,7 +1585,8 @@ - @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd}) - @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction --@var{rnd}. For types having no signed zero, it is considered unsigned -+@var{rnd}. The IEEE-754 rules are used, in particular for signed zeros. -+But for types having no signed zeros, 0 is considered unsigned - (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)). - The @code{mpfr_add_d} function assumes that the radix of the @code{double} type - is a power of 2, with a precision at most that declared by the C implementation -@@ -1599,7 +1604,8 @@ - @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd}) - @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction --@var{rnd}. For types having no signed zero, it is considered unsigned -+@var{rnd}. The IEEE-754 rules are used, in particular for signed zeros. -+But for types having no signed zeros, 0 is considered unsigned - (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0), - 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)). - The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub} -@@ -1615,7 +1621,7 @@ - Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the - direction @var{rnd}. - When a result is zero, its sign is the product of the signs of the operands --(for types having no signed zero, it is considered positive). -+(for types having no signed zeros, 0 is considered positive). - The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}. - @end deftypefun - -@@ -1635,7 +1641,7 @@ - @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}. - When a result is zero, its sign is the product of the signs of the operands --(for types having no signed zero, it is considered positive). -+(for types having no signed zeros, 0 is considered positive). - The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div} - and @code{mpfr_div_d}. - @end deftypefun -@@ -1643,15 +1649,18 @@ - @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) - @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}} --rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is --@minus{}0, to be consistent with the IEEE 754 standard). -+rounded in the direction @var{rnd}. Set @var{rop} to @minus{}0 if -+@var{op} is @minus{}0, to be consistent with the IEEE 754 standard. - Set @var{rop} to NaN if @var{op} is negative. - @end deftypefun - - @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}} --rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is --@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative. -+rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is -+@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative. Warning! -+Therefore the result on @minus{}0 is different from the one of the rSqrt -+function recommended by the IEEE 754-2008 standard (Section 9.2.1), which -+is @minus{}Inf instead of +Inf. - @end deftypefun - - @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) -@@ -1832,7 +1841,9 @@ - @m{\log_2 @var{op}, log2(@var{op})} or - @m{\log_{10} @var{op}, log10(@var{op})}, respectively, - rounded in the direction @var{rnd}. --Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0 -+Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes), -+for consistency with the ISO C99 and IEEE 754-2008 standards. -+Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0 - (i.e., the sign of the zero has no influence on the result). - @end deftypefun - -@@ -2003,8 +2014,11 @@ - @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to the value of the logarithm of the Gamma function on @var{op}, - rounded in the direction @var{rnd}. --When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}}, --@var{k} being a non-negative integer, @var{rop} is set to NaN. -+When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes). -+When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf, -+following the general rules on special values. -+When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}}, -+@var{k} being a nonnegative integer, set @var{rop} to NaN@. - See also @code{mpfr_lgamma}. - @end deftypefun - -@@ -2012,10 +2026,11 @@ - Set @var{rop} to the value of the logarithm of the absolute value of the - Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign - (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to --by @var{signp}. When @var{op} is an infinity or a non-positive integer, set --@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer, --*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is --the sign of the zero. -+by @var{signp}. -+When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes). -+When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf. -+When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is -+undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero. - @end deftypefun - - @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) -@@ -2064,7 +2079,10 @@ - @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}} - (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}}) --rounded in the direction @var{rnd}. -+rounded in the direction @var{rnd}. Concerning special values (signed zeros, -+infinities, NaN), these functions behave like a multiplication followed by a -+separate addition or subtraction. That is, the fused operation matters only -+for rounding. - @end deftypefun - - @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd}) -@@ -2089,8 +2107,8 @@ - i.e., $\sqrt{x^2+y^2}$, - @end tex - rounded in the direction @var{rnd}. --Special values are handled as described in Section F.9.4.3 of --the ISO C99 and IEEE 754-2008 standards: -+Special values are handled as described in the ISO C99 (Section F.9.4.3) -+and IEEE 754-2008 (Section 9.2.1) standards: - If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop}, - even if the other number is NaN. - @end deftypefun -diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info ---- mpfr-3.1.3-a/doc/mpfr.info 2015-06-19 19:55:53.000000000 +0000 -+++ mpfr-3.1.3-b/doc/mpfr.info 2015-07-02 10:49:38.718267817 +0000 -@@ -1,4 +1,4 @@ --This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi. -+This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi. - - This manual documents how to install and use the Multiple Precision - Floating-Point Reliable Library, version 3.1.3. -@@ -55,7 +55,7 @@ - MPFR Copying Conditions - *********************** - --The GNU MPFR library (or MPFR for short) is "free"; this means that -+The GNU MPFR library (or MPFR for short) is “free”; this means that - everyone is free to use it and free to redistribute it on a free basis. - The library is not in the public domain; it is copyrighted and there are - restrictions on its distribution, but these restrictions are designed to -@@ -418,7 +418,7 @@ - 4.2 Nomenclature and Types - ========================== - --A "floating-point number", or "float" for short, is an arbitrary -+A “floating-point number”, or “float” for short, is an arbitrary - precision significand (also called mantissa) with a limited precision - exponent. The C data type for such objects is ‘mpfr_t’ (internally - defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C -@@ -432,7 +432,7 @@ - to the other functions supported by MPFR. Unless documented otherwise, - the sign bit of a NaN is unspecified. - --The "precision" is the number of bits used to represent the significand -+The “precision” is the number of bits used to represent the significand - of a floating-point number; the corresponding C data type is - ‘mpfr_prec_t’. The precision can be any integer between ‘MPFR_PREC_MIN’ - and ‘MPFR_PREC_MAX’. In the current implementation, ‘MPFR_PREC_MIN’ is -@@ -446,7 +446,7 @@ - may abort, crash or have undefined behavior (depending on your C - implementation). - --The "rounding mode" specifies the way to round the result of a -+The “rounding mode” specifies the way to round the result of a - floating-point operation, in case the exact result can not be - represented exactly in the destination significand; the corresponding C - data type is ‘mpfr_rnd_t’. -@@ -499,14 +499,14 @@ - representable numbers, it is rounded to the one with the least - significant bit set to zero. For example, the number 2.5, which is - represented by (10.1) in binary, is rounded to (10.0)=2 with a precision --of two bits, and not to (11.0)=3. This rule avoids the "drift" -+of two bits, and not to (11.0)=3. This rule avoids the “drift” - phenomenon mentioned by Knuth in volume 2 of The Art of Computer - Programming (Section 4.2.2). - - Most MPFR functions take as first argument the destination variable, - as second and following arguments the input variables, as last argument - a rounding mode, and have a return value of type ‘int’, called the --"ternary value". The value stored in the destination variable is -+“ternary value”. The value stored in the destination variable is - correctly rounded, i.e., MPFR behaves as if it computed the result with - an infinite precision, then rounded it to the precision of this - variable. The input variables are regarded as exact (in particular, -@@ -572,15 +572,18 @@ - When the input point is in the closure of the domain of the - mathematical function and an input argument is +0 (resp. −0), one - considers the limit when the corresponding argument approaches 0 from --above (resp. below). If the limit is not defined (e.g., ‘mpfr_log’ on --−0), the behavior is specified in the description of the MPFR function. -+above (resp. below), if possible. If the limit is not defined (e.g., -+‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the -+description of the MPFR function, but must be consistent with the rule -+from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf). - - When the result is equal to 0, its sign is determined by considering - the limit as if the input point were not in the domain: If one - approaches 0 from above (resp. below), the result is +0 (resp. −0); for --example, ‘mpfr_sin’ on +0 gives +0. In the other cases, the sign is --specified in the description of the MPFR function; for example --‘mpfr_max’ on −0 and +0 gives +0. -+example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all -+rounding modes). In the other cases, the sign is specified in the -+description of the MPFR function; for example ‘mpfr_max’ on −0 and +0 -+gives +0. - - When the input point is not in the closure of the domain of the - function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN. -@@ -590,8 +593,8 @@ - numbers; such a case is always explicitly specified in *note MPFR - Interface::. Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but - ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special --Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf) --gives +Inf. -+Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on -+(X,+Inf) gives +Inf. - - - File: mpfr.info, Node: Exceptions, Next: Memory Handling, Prev: Floating-Point Values on Special Numbers, Up: MPFR Basics -@@ -1253,8 +1256,9 @@ - mpfr_rnd_t RND) - -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2, - mpfr_rnd_t RND) -- Set ROP to OP1 + OP2 rounded in the direction RND. For types -- having no signed zero, it is considered unsigned (i.e., (+0) + 0 = -+ Set ROP to OP1 + OP2 rounded in the direction RND. The IEEE-754 -+ rules are used, in particular for signed zeros. But for types -+ having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 = - (+0) and (−0) + 0 = (−0)). The ‘mpfr_add_d’ function assumes that - the radix of the ‘double’ type is a power of 2, with a precision at - most that declared by the C implementation (macro -@@ -1280,8 +1284,9 @@ - mpfr_rnd_t RND) - -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2, - mpfr_rnd_t RND) -- Set ROP to OP1 - OP2 rounded in the direction RND. For types -- having no signed zero, it is considered unsigned (i.e., (+0) − 0 = -+ Set ROP to OP1 - OP2 rounded in the direction RND. The IEEE-754 -+ rules are used, in particular for signed zeros. But for types -+ having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 = - (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)). The - same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and - ‘mpfr_sub_d’. -@@ -1300,7 +1305,7 @@ - mpfr_rnd_t RND) - Set ROP to OP1 times OP2 rounded in the direction RND. When a - result is zero, its sign is the product of the signs of the -- operands (for types having no signed zero, it is considered -+ operands (for types having no signed zeros, 0 is considered - positive). The same restrictions than for ‘mpfr_add_d’ apply to - ‘mpfr_mul_d’. - -@@ -1327,21 +1332,24 @@ - mpfr_rnd_t RND) - Set ROP to OP1/OP2 rounded in the direction RND. When a result is - zero, its sign is the product of the signs of the operands (for -- types having no signed zero, it is considered positive). The same -+ types having no signed zeros, 0 is considered positive). The same - restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and - ‘mpfr_div_d’. - - -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP, - mpfr_rnd_t RND) -- Set ROP to the square root of OP rounded in the direction RND (set -- ROP to −0 if OP is −0, to be consistent with the IEEE 754 -- standard). Set ROP to NaN if OP is negative. -+ Set ROP to the square root of OP rounded in the direction RND. Set -+ ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard. -+ Set ROP to NaN if OP is negative. - - -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the reciprocal square root of OP rounded in the - direction RND. Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and -- NaN if OP is negative. -+ NaN if OP is negative. Warning! Therefore the result on −0 is -+ different from the one of the rSqrt function recommended by the -+ IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of -+ +Inf. - - -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K, -@@ -1515,8 +1523,10 @@ - -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the natural logarithm of OP, log2(OP) or log10(OP), -- respectively, rounded in the direction RND. Set ROP to −Inf if OP -- is −0 (i.e., the sign of the zero has no influence on the result). -+ respectively, rounded in the direction RND. Set ROP to +0 if OP is -+ 1 (in all rounding modes), for consistency with the ISO C99 and -+ IEEE 754-2008 standards. Set ROP to −Inf if OP is ±0 (i.e., the -+ sign of the zero has no influence on the result). - - -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) -@@ -1649,17 +1659,21 @@ - - -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the value of the logarithm of the Gamma function on OP, -- rounded in the direction RND. When −2K−1 <= OP <= −2K, K being a -- non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’. -+ rounded in the direction RND. When OP is 1 or 2, set ROP to +0 (in -+ all rounding modes). When OP is an infinity or a nonpositive -+ integer, set ROP to +Inf, following the general rules on special -+ values. When −2K−1 < OP < −2K, K being a nonnegative integer, set -+ ROP to NaN. See also ‘mpfr_lgamma’. - - -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP, - mpfr_rnd_t RND) - Set ROP to the value of the logarithm of the absolute value of the - Gamma function on OP, rounded in the direction RND. The sign (1 or - −1) of Gamma(OP) is returned in the object pointed to by SIGNP. -- When OP is an infinity or a non-positive integer, set ROP to +Inf. -- When OP is NaN, −Inf or a negative integer, *SIGNP is undefined, -- and when OP is ±0, *SIGNP is the sign of the zero. -+ When OP is 1 or 2, set ROP to +0 (in all rounding modes). When OP -+ is an infinity or a nonpositive integer, set ROP to +Inf. When OP -+ is NaN, −Inf or a negative integer, *SIGNP is undefined, and when -+ OP is ±0, *SIGNP is the sign of the zero. - - -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the value of the Digamma (sometimes also called Psi) -@@ -1703,7 +1717,10 @@ - -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t - OP3, mpfr_rnd_t RND) - Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3) -- rounded in the direction RND. -+ rounded in the direction RND. Concerning special values (signed -+ zeros, infinities, NaN), these functions behave like a -+ multiplication followed by a separate addition or subtraction. -+ That is, the fused operation matters only for rounding. - - -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, - mpfr_rnd_t RND) -@@ -1717,9 +1734,10 @@ - RND) - Set ROP to the Euclidean norm of X and Y, i.e., the square root of - the sum of the squares of X and Y, rounded in the direction RND. -- Special values are handled as described in Section F.9.4.3 of the -- ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then -- +Inf is returned in ROP, even if the other number is NaN. -+ Special values are handled as described in the ISO C99 (Section -+ F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is -+ an infinity, then +Inf is returned in ROP, even if the other number -+ is NaN. - - -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND) - Set ROP to the value of the Airy function Ai on X, rounded in the -@@ -2670,7 +2688,7 @@ - 5.16 Internals - ============== - --A "limb" means the part of a multi-precision number that fits in a -+A “limb” means the part of a multi-precision number that fits in a - single word. Usually a limb contains 32 or 64 bits. The C data type - for a limb is ‘mp_limb_t’. - -@@ -3140,7 +3158,7 @@ - 0. PREAMBLE - - The purpose of this License is to make a manual, textbook, or other -- functional and useful document "free" in the sense of freedom: to -+ functional and useful document “free” in the sense of freedom: to - assure everyone the effective freedom to copy and redistribute it, - with or without modifying it, either commercially or - noncommercially. Secondarily, this License preserves for the -@@ -3655,9 +3673,9 @@ - * Menu: - - * mpfr_abs: Basic Arithmetic Functions. -- (line 160) --* mpfr_acos: Special Functions. (line 51) --* mpfr_acosh: Special Functions. (line 115) -+ (line 165) -+* mpfr_acos: Special Functions. (line 53) -+* mpfr_acosh: Special Functions. (line 117) - * mpfr_add: Basic Arithmetic Functions. - (line 6) - * mpfr_add_d: Basic Arithmetic Functions. -@@ -3670,15 +3688,15 @@ - (line 8) - * mpfr_add_z: Basic Arithmetic Functions. - (line 14) --* mpfr_agm: Special Functions. (line 210) --* mpfr_ai: Special Functions. (line 226) --* mpfr_asin: Special Functions. (line 52) --* mpfr_asinh: Special Functions. (line 116) -+* mpfr_agm: Special Functions. (line 219) -+* mpfr_ai: Special Functions. (line 236) -+* mpfr_asin: Special Functions. (line 54) -+* mpfr_asinh: Special Functions. (line 118) - * mpfr_asprintf: Formatted Output Functions. - (line 193) --* mpfr_atan: Special Functions. (line 53) --* mpfr_atan2: Special Functions. (line 63) --* mpfr_atanh: Special Functions. (line 117) -+* mpfr_atan: Special Functions. (line 55) -+* mpfr_atan2: Special Functions. (line 65) -+* mpfr_atanh: Special Functions. (line 119) - * mpfr_buildopt_decimal_p: Miscellaneous Functions. - (line 162) - * mpfr_buildopt_gmpinternals_p: Miscellaneous Functions. -@@ -3690,7 +3708,7 @@ - * mpfr_can_round: Rounding Related Functions. - (line 39) - * mpfr_cbrt: Basic Arithmetic Functions. -- (line 108) -+ (line 113) - * mpfr_ceil: Integer Related Functions. - (line 7) - * mpfr_check_range: Exception Related Functions. -@@ -3735,18 +3753,18 @@ - (line 27) - * mpfr_cmp_z: Comparison Functions. - (line 11) --* mpfr_const_catalan: Special Functions. (line 237) --* mpfr_const_euler: Special Functions. (line 236) --* mpfr_const_log2: Special Functions. (line 234) --* mpfr_const_pi: Special Functions. (line 235) -+* mpfr_const_catalan: Special Functions. (line 247) -+* mpfr_const_euler: Special Functions. (line 246) -+* mpfr_const_log2: Special Functions. (line 244) -+* mpfr_const_pi: Special Functions. (line 245) - * mpfr_copysign: Miscellaneous Functions. - (line 109) --* mpfr_cos: Special Functions. (line 29) --* mpfr_cosh: Special Functions. (line 95) --* mpfr_cot: Special Functions. (line 47) --* mpfr_coth: Special Functions. (line 111) --* mpfr_csc: Special Functions. (line 46) --* mpfr_csch: Special Functions. (line 110) -+* mpfr_cos: Special Functions. (line 31) -+* mpfr_cosh: Special Functions. (line 97) -+* mpfr_cot: Special Functions. (line 49) -+* mpfr_coth: Special Functions. (line 113) -+* mpfr_csc: Special Functions. (line 48) -+* mpfr_csch: Special Functions. (line 112) - * mpfr_custom_get_exp: Custom Interface. (line 75) - * mpfr_custom_get_kind: Custom Interface. (line 65) - * mpfr_custom_get_significand: Custom Interface. (line 70) -@@ -3756,47 +3774,47 @@ - * mpfr_custom_move: Custom Interface. (line 82) - * MPFR_DECL_INIT: Initialization Functions. - (line 74) --* mpfr_digamma: Special Functions. (line 166) -+* mpfr_digamma: Special Functions. (line 172) - * mpfr_dim: Basic Arithmetic Functions. -- (line 166) -+ (line 171) - * mpfr_div: Basic Arithmetic Functions. -- (line 72) -+ (line 74) - * mpfr_divby0_p: Exception Related Functions. - (line 134) - * mpfr_div_2exp: Compatibility with MPF. - (line 49) - * mpfr_div_2si: Basic Arithmetic Functions. -- (line 181) -+ (line 186) - * mpfr_div_2ui: Basic Arithmetic Functions. -- (line 179) -+ (line 184) - * mpfr_div_d: Basic Arithmetic Functions. -- (line 84) -+ (line 86) - * mpfr_div_q: Basic Arithmetic Functions. -- (line 88) -+ (line 90) - * mpfr_div_si: Basic Arithmetic Functions. -- (line 80) -+ (line 82) - * mpfr_div_ui: Basic Arithmetic Functions. -- (line 76) -+ (line 78) - * mpfr_div_z: Basic Arithmetic Functions. -- (line 86) -+ (line 88) - * mpfr_d_div: Basic Arithmetic Functions. -- (line 82) -+ (line 84) - * mpfr_d_sub: Basic Arithmetic Functions. -- (line 35) --* mpfr_eint: Special Functions. (line 133) -+ (line 36) -+* mpfr_eint: Special Functions. (line 135) - * mpfr_eq: Compatibility with MPF. - (line 28) - * mpfr_equal_p: Comparison Functions. - (line 59) - * mpfr_erangeflag_p: Exception Related Functions. - (line 137) --* mpfr_erf: Special Functions. (line 177) --* mpfr_erfc: Special Functions. (line 178) --* mpfr_exp: Special Functions. (line 23) --* mpfr_exp10: Special Functions. (line 25) --* mpfr_exp2: Special Functions. (line 24) --* mpfr_expm1: Special Functions. (line 129) --* mpfr_fac_ui: Special Functions. (line 121) -+* mpfr_erf: Special Functions. (line 183) -+* mpfr_erfc: Special Functions. (line 184) -+* mpfr_exp: Special Functions. (line 25) -+* mpfr_exp10: Special Functions. (line 27) -+* mpfr_exp2: Special Functions. (line 26) -+* mpfr_expm1: Special Functions. (line 131) -+* mpfr_fac_ui: Special Functions. (line 123) - * mpfr_fits_intmax_p: Conversion Functions. - (line 150) - * mpfr_fits_sint_p: Conversion Functions. -@@ -3815,20 +3833,20 @@ - (line 147) - * mpfr_floor: Integer Related Functions. - (line 8) --* mpfr_fma: Special Functions. (line 203) -+* mpfr_fma: Special Functions. (line 209) - * mpfr_fmod: Integer Related Functions. - (line 92) --* mpfr_fms: Special Functions. (line 205) -+* mpfr_fms: Special Functions. (line 211) - * mpfr_fprintf: Formatted Output Functions. - (line 157) - * mpfr_frac: Integer Related Functions. - (line 76) --* mpfr_free_cache: Special Functions. (line 244) -+* mpfr_free_cache: Special Functions. (line 254) - * mpfr_free_str: Conversion Functions. - (line 137) - * mpfr_frexp: Conversion Functions. - (line 45) --* mpfr_gamma: Special Functions. (line 148) -+* mpfr_gamma: Special Functions. (line 150) - * mpfr_get_d: Conversion Functions. - (line 7) - * mpfr_get_decimal64: Conversion Functions. -@@ -3887,7 +3905,7 @@ - (line 56) - * mpfr_greater_p: Comparison Functions. - (line 55) --* mpfr_hypot: Special Functions. (line 218) -+* mpfr_hypot: Special Functions. (line 227) - * mpfr_inexflag_p: Exception Related Functions. - (line 136) - * mpfr_inf_p: Comparison Functions. -@@ -3922,21 +3940,21 @@ - (line 31) - * mpfr_integer_p: Integer Related Functions. - (line 119) --* mpfr_j0: Special Functions. (line 182) --* mpfr_j1: Special Functions. (line 183) --* mpfr_jn: Special Functions. (line 184) -+* mpfr_j0: Special Functions. (line 188) -+* mpfr_j1: Special Functions. (line 189) -+* mpfr_jn: Special Functions. (line 190) - * mpfr_lessequal_p: Comparison Functions. - (line 58) - * mpfr_lessgreater_p: Comparison Functions. - (line 64) - * mpfr_less_p: Comparison Functions. - (line 57) --* mpfr_lgamma: Special Functions. (line 157) --* mpfr_li2: Special Functions. (line 143) --* mpfr_lngamma: Special Functions. (line 152) -+* mpfr_lgamma: Special Functions. (line 162) -+* mpfr_li2: Special Functions. (line 145) -+* mpfr_lngamma: Special Functions. (line 154) - * mpfr_log: Special Functions. (line 16) - * mpfr_log10: Special Functions. (line 18) --* mpfr_log1p: Special Functions. (line 125) -+* mpfr_log1p: Special Functions. (line 127) - * mpfr_log2: Special Functions. (line 17) - * mpfr_max: Miscellaneous Functions. - (line 22) -@@ -3947,29 +3965,29 @@ - * mpfr_modf: Integer Related Functions. - (line 82) - * mpfr_mul: Basic Arithmetic Functions. -- (line 51) -+ (line 53) - * mpfr_mul_2exp: Compatibility with MPF. - (line 47) - * mpfr_mul_2si: Basic Arithmetic Functions. -- (line 174) -+ (line 179) - * mpfr_mul_2ui: Basic Arithmetic Functions. -- (line 172) -+ (line 177) - * mpfr_mul_d: Basic Arithmetic Functions. -- (line 57) -+ (line 59) - * mpfr_mul_q: Basic Arithmetic Functions. -- (line 61) -+ (line 63) - * mpfr_mul_si: Basic Arithmetic Functions. -- (line 55) -+ (line 57) - * mpfr_mul_ui: Basic Arithmetic Functions. -- (line 53) -+ (line 55) - * mpfr_mul_z: Basic Arithmetic Functions. -- (line 59) -+ (line 61) - * mpfr_nanflag_p: Exception Related Functions. - (line 135) - * mpfr_nan_p: Comparison Functions. - (line 39) - * mpfr_neg: Basic Arithmetic Functions. -- (line 159) -+ (line 164) - * mpfr_nextabove: Miscellaneous Functions. - (line 15) - * mpfr_nextbelow: Miscellaneous Functions. -@@ -3983,13 +4001,13 @@ - * mpfr_overflow_p: Exception Related Functions. - (line 133) - * mpfr_pow: Basic Arithmetic Functions. -- (line 116) -+ (line 121) - * mpfr_pow_si: Basic Arithmetic Functions. -- (line 120) -+ (line 125) - * mpfr_pow_ui: Basic Arithmetic Functions. -- (line 118) -+ (line 123) - * mpfr_pow_z: Basic Arithmetic Functions. -- (line 122) -+ (line 127) - * mpfr_prec_round: Rounding Related Functions. - (line 13) - * ‘mpfr_prec_t’: Nomenclature and Types. -@@ -3999,7 +4017,7 @@ - * mpfr_print_rnd_mode: Rounding Related Functions. - (line 71) - * mpfr_rec_sqrt: Basic Arithmetic Functions. -- (line 103) -+ (line 105) - * mpfr_regular_p: Comparison Functions. - (line 43) - * mpfr_reldiff: Compatibility with MPF. -@@ -4021,11 +4039,11 @@ - * ‘mpfr_rnd_t’: Nomenclature and Types. - (line 34) - * mpfr_root: Basic Arithmetic Functions. -- (line 109) -+ (line 114) - * mpfr_round: Integer Related Functions. - (line 9) --* mpfr_sec: Special Functions. (line 45) --* mpfr_sech: Special Functions. (line 109) -+* mpfr_sec: Special Functions. (line 47) -+* mpfr_sech: Special Functions. (line 111) - * mpfr_set: Assignment Functions. - (line 9) - * mpfr_setsign: Miscellaneous Functions. -@@ -4100,57 +4118,57 @@ - (line 49) - * mpfr_signbit: Miscellaneous Functions. - (line 99) --* mpfr_sin: Special Functions. (line 30) --* mpfr_sinh: Special Functions. (line 96) --* mpfr_sinh_cosh: Special Functions. (line 101) --* mpfr_sin_cos: Special Functions. (line 35) -+* mpfr_sin: Special Functions. (line 32) -+* mpfr_sinh: Special Functions. (line 98) -+* mpfr_sinh_cosh: Special Functions. (line 103) -+* mpfr_sin_cos: Special Functions. (line 37) - * mpfr_si_div: Basic Arithmetic Functions. -- (line 78) -+ (line 80) - * mpfr_si_sub: Basic Arithmetic Functions. -- (line 31) -+ (line 32) - * mpfr_snprintf: Formatted Output Functions. - (line 180) - * mpfr_sprintf: Formatted Output Functions. - (line 170) - * mpfr_sqr: Basic Arithmetic Functions. -- (line 69) -+ (line 71) - * mpfr_sqrt: Basic Arithmetic Functions. -- (line 96) -+ (line 98) - * mpfr_sqrt_ui: Basic Arithmetic Functions. -- (line 97) -+ (line 99) - * mpfr_strtofr: Assignment Functions. - (line 80) - * mpfr_sub: Basic Arithmetic Functions. -- (line 25) -+ (line 26) - * mpfr_subnormalize: Exception Related Functions. - (line 60) - * mpfr_sub_d: Basic Arithmetic Functions. -- (line 37) -+ (line 38) - * mpfr_sub_q: Basic Arithmetic Functions. -- (line 43) -+ (line 44) - * mpfr_sub_si: Basic Arithmetic Functions. -- (line 33) -+ (line 34) - * mpfr_sub_ui: Basic Arithmetic Functions. -- (line 29) -+ (line 30) - * mpfr_sub_z: Basic Arithmetic Functions. -- (line 41) --* mpfr_sum: Special Functions. (line 252) -+ (line 42) -+* mpfr_sum: Special Functions. (line 262) - * mpfr_swap: Assignment Functions. - (line 150) - * ‘mpfr_t’: Nomenclature and Types. - (line 6) --* mpfr_tan: Special Functions. (line 31) --* mpfr_tanh: Special Functions. (line 97) -+* mpfr_tan: Special Functions. (line 33) -+* mpfr_tanh: Special Functions. (line 99) - * mpfr_trunc: Integer Related Functions. - (line 10) - * mpfr_ui_div: Basic Arithmetic Functions. -- (line 74) -+ (line 76) - * mpfr_ui_pow: Basic Arithmetic Functions. -- (line 126) -+ (line 131) - * mpfr_ui_pow_ui: Basic Arithmetic Functions. -- (line 124) -+ (line 129) - * mpfr_ui_sub: Basic Arithmetic Functions. -- (line 27) -+ (line 28) - * mpfr_underflow_p: Exception Related Functions. - (line 132) - * mpfr_unordered_p: Comparison Functions. -@@ -4181,61 +4199,61 @@ - (line 182) - * mpfr_vsprintf: Formatted Output Functions. - (line 171) --* mpfr_y0: Special Functions. (line 193) --* mpfr_y1: Special Functions. (line 194) --* mpfr_yn: Special Functions. (line 195) -+* mpfr_y0: Special Functions. (line 199) -+* mpfr_y1: Special Functions. (line 200) -+* mpfr_yn: Special Functions. (line 201) - * mpfr_zero_p: Comparison Functions. - (line 42) --* mpfr_zeta: Special Functions. (line 171) --* mpfr_zeta_ui: Special Functions. (line 172) -+* mpfr_zeta: Special Functions. (line 177) -+* mpfr_zeta_ui: Special Functions. (line 178) - * mpfr_z_sub: Basic Arithmetic Functions. -- (line 39) -+ (line 40) - - - - Tag Table: - Node: Top775 - Node: Copying2007 --Node: Introduction to MPFR3766 --Node: Installing MPFR5880 --Node: Reporting Bugs11323 --Node: MPFR Basics13353 --Node: Headers and Libraries13669 --Node: Nomenclature and Types16828 --Node: MPFR Variable Conventions18874 --Node: Rounding Modes20418 --Ref: ternary value21544 --Node: Floating-Point Values on Special Numbers23526 --Node: Exceptions26572 --Node: Memory Handling29749 --Node: MPFR Interface30894 --Node: Initialization Functions33008 --Node: Assignment Functions40318 --Node: Combined Initialization and Assignment Functions49673 --Node: Conversion Functions50974 --Node: Basic Arithmetic Functions60035 --Node: Comparison Functions69200 --Node: Special Functions72687 --Node: Input and Output Functions86672 --Node: Formatted Output Functions88644 --Node: Integer Related Functions98431 --Node: Rounding Related Functions105051 --Node: Miscellaneous Functions108888 --Node: Exception Related Functions117568 --Node: Compatibility with MPF124386 --Node: Custom Interface127127 --Node: Internals131526 --Node: API Compatibility133066 --Node: Type and Macro Changes134995 --Node: Added Functions137844 --Node: Changed Functions141132 --Node: Removed Functions145545 --Node: Other Changes145973 --Node: Contributors147576 --Node: References150219 --Node: GNU Free Documentation License151973 --Node: Concept Index174562 --Node: Function and Type Index180659 -+Node: Introduction to MPFR3770 -+Node: Installing MPFR5884 -+Node: Reporting Bugs11327 -+Node: MPFR Basics13357 -+Node: Headers and Libraries13673 -+Node: Nomenclature and Types16832 -+Node: MPFR Variable Conventions18894 -+Node: Rounding Modes20438 -+Ref: ternary value21568 -+Node: Floating-Point Values on Special Numbers23554 -+Node: Exceptions26813 -+Node: Memory Handling29990 -+Node: MPFR Interface31135 -+Node: Initialization Functions33249 -+Node: Assignment Functions40559 -+Node: Combined Initialization and Assignment Functions49914 -+Node: Conversion Functions51215 -+Node: Basic Arithmetic Functions60276 -+Node: Comparison Functions69777 -+Node: Special Functions73264 -+Node: Input and Output Functions87862 -+Node: Formatted Output Functions89834 -+Node: Integer Related Functions99621 -+Node: Rounding Related Functions106241 -+Node: Miscellaneous Functions110078 -+Node: Exception Related Functions118758 -+Node: Compatibility with MPF125576 -+Node: Custom Interface128317 -+Node: Internals132716 -+Node: API Compatibility134260 -+Node: Type and Macro Changes136189 -+Node: Added Functions139038 -+Node: Changed Functions142326 -+Node: Removed Functions146739 -+Node: Other Changes147167 -+Node: Contributors148770 -+Node: References151413 -+Node: GNU Free Documentation License153167 -+Node: Concept Index175760 -+Node: Function and Type Index181857 - - End Tag Table - -diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c ---- mpfr-3.1.3-a/src/lngamma.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/lngamma.c 2015-07-02 10:49:24.018113593 +0000 -@@ -603,16 +603,17 @@ - mpfr_get_prec (y), mpfr_log_prec, y, inex)); - - /* special cases */ -- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x))) -+ if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) || -+ (MPFR_IS_NEG (x) && mpfr_integer_p (x)))) - { -- if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x)) -+ if (MPFR_IS_NAN (x)) - { - MPFR_SET_NAN (y); - MPFR_RET_NAN; - } -- else /* lngamma(+Inf) = lngamma(+0) = +Inf */ -+ else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */ - { -- if (MPFR_IS_ZERO (x)) -+ if (!MPFR_IS_INF (x)) - mpfr_set_divby0 (); - MPFR_SET_INF (y); - MPFR_SET_POS (y); -@@ -620,8 +621,8 @@ - } - } - -- /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */ -- if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x))) -+ /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */ -+ if (MPFR_IS_NEG (x) && unit_bit (x) == 0) - { - MPFR_SET_NAN (y); - MPFR_RET_NAN; -diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h ---- mpfr-3.1.3-a/src/mpfr.h 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/mpfr.h 2015-07-02 10:49:24.038113803 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 3 --#define MPFR_VERSION_STRING "3.1.3" -+#define MPFR_VERSION_STRING "3.1.3-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c ---- mpfr-3.1.3-a/src/version.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/version.c 2015-07-02 10:49:24.042113845 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.3"; -+ return "3.1.3-p1"; - } -diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c ---- mpfr-3.1.3-a/tests/tlngamma.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/tests/tlngamma.c 2015-07-02 10:49:24.018113593 +0000 -@@ -33,7 +33,7 @@ - special (void) - { - mpfr_t x, y; -- int inex; -+ int i, inex; - - mpfr_init (x); - mpfr_init (y); -@@ -46,25 +46,29 @@ - exit (1); - } - -- mpfr_set_inf (x, -1); -+ mpfr_set_inf (x, 1); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_nan_p (y)) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0) - { -- printf ("Error for lngamma(-Inf)\n"); -+ printf ("Error for lngamma(+Inf)\n"); - exit (1); - } - -- mpfr_set_inf (x, 1); -+ mpfr_set_inf (x, -1); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0) - { -- printf ("Error for lngamma(+Inf)\n"); -+ printf ("Error for lngamma(-Inf)\n"); - exit (1); - } - - mpfr_set_ui (x, 0, MPFR_RNDN); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || -+ __gmpfr_flags != MPFR_FLAGS_DIVBY0) - { - printf ("Error for lngamma(+0)\n"); - exit (1); -@@ -72,32 +76,58 @@ - - mpfr_set_ui (x, 0, MPFR_RNDN); - mpfr_neg (x, x, MPFR_RNDN); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_nan_p (y)) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || -+ __gmpfr_flags != MPFR_FLAGS_DIVBY0) - { - printf ("Error for lngamma(-0)\n"); - exit (1); - } - - mpfr_set_ui (x, 1, MPFR_RNDN); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y)) -+ if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y)) - { - printf ("Error for lngamma(1)\n"); - exit (1); - } - -- mpfr_set_si (x, -1, MPFR_RNDN); -- mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_nan_p (y)) -+ for (i = 1; i <= 5; i++) - { -- printf ("Error for lngamma(-1)\n"); -- exit (1); -+ int c; -+ -+ mpfr_set_si (x, -i, MPFR_RNDN); -+ mpfr_clear_flags (); -+ mpfr_lngamma (y, x, MPFR_RNDN); -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || -+ __gmpfr_flags != MPFR_FLAGS_DIVBY0) -+ { -+ printf ("Error for lngamma(-%d)\n", i); -+ exit (1); -+ } -+ if (i & 1) -+ { -+ mpfr_nextabove (x); -+ c = '+'; -+ } -+ else -+ { -+ mpfr_nextbelow (x); -+ c = '-'; -+ } -+ mpfr_lngamma (y, x, MPFR_RNDN); -+ if (!mpfr_nan_p (y)) -+ { -+ printf ("Error for lngamma(-%d%cepsilon)\n", i, c); -+ exit (1); -+ } - } - - mpfr_set_ui (x, 2, MPFR_RNDN); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y)) -+ if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y)) - { - printf ("Error for lngamma(2)\n"); - exit (1); -@@ -127,7 +157,7 @@ - mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN); - mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN); -- if (MPFR_IS_NAN (y) || mpfr_cmp (y, x)) -+ if (mpfr_cmp0 (y, x)) - { - printf ("mpfr_lngamma("CHECK_X2") is wrong:\n" - "expected "); -@@ -143,7 +173,7 @@ - mpfr_lngamma (y, x, MPFR_RNDU); - mpfr_set_prec (x, 175); - mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error in mpfr_lngamma (1)\n"); - exit (1); -@@ -155,7 +185,7 @@ - mpfr_lngamma (x, y, MPFR_RNDZ); - mpfr_set_prec (y, 21); - mpfr_set_str_binary (y, "0.111000101000001100101E9"); -- if (MPFR_IS_NAN (x) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error in mpfr_lngamma (120)\n"); - printf ("Expected "); mpfr_print_binary (y); puts (""); -@@ -169,7 +199,7 @@ - inex = mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_prec (x, 206); - mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error in mpfr_lngamma (768)\n"); - exit (1); -@@ -185,7 +215,7 @@ - mpfr_set_str_binary (x, "0.1100E-66"); - mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_str_binary (x, "0.1100E6"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error for lngamma(0.1100E-66)\n"); - exit (1); -@@ -199,7 +229,7 @@ - mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_prec (x, 32); - mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error for lngamma(-2^199+0.5)\n"); - printf ("Got "); -diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES ---- mpfr-3.1.3-a/PATCHES 2015-07-02 10:50:08.046573308 +0000 -+++ mpfr-3.1.3-b/PATCHES 2015-07-02 10:50:08.126574142 +0000 -@@ -0,0 +1 @@ -+muldiv-2exp-overflow -diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION ---- mpfr-3.1.3-a/VERSION 2015-07-02 10:49:24.042113845 +0000 -+++ mpfr-3.1.3-b/VERSION 2015-07-02 10:50:08.126574142 +0000 -@@ -1 +1 @@ --3.1.3-p1 -+3.1.3-p2 -diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c ---- mpfr-3.1.3-a/src/div_2si.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/div_2si.c 2015-07-02 10:50:08.106573933 +0000 -@@ -49,7 +49,7 @@ - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y)); - } -- else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n || -+ else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n || - exp > __gmpfr_emax + n)) ) - return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y)); - -diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c ---- mpfr-3.1.3-a/src/div_2ui.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/div_2ui.c 2015-07-02 10:50:08.106573933 +0000 -@@ -32,7 +32,7 @@ - rnd_mode), - ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact)); - -- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x))) -+ if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x))) - return mpfr_set (y, x, rnd_mode); - else - { -diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h ---- mpfr-3.1.3-a/src/mpfr.h 2015-07-02 10:49:24.038113803 +0000 -+++ mpfr-3.1.3-b/src/mpfr.h 2015-07-02 10:50:08.126574142 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 3 --#define MPFR_VERSION_STRING "3.1.3-p1" -+#define MPFR_VERSION_STRING "3.1.3-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c ---- mpfr-3.1.3-a/src/mul_2si.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/mul_2si.c 2015-07-02 10:50:08.106573933 +0000 -@@ -39,7 +39,7 @@ - { - mpfr_exp_t exp = MPFR_GET_EXP (x); - MPFR_SETRAW (inexact, y, x, exp, rnd_mode); -- if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n || -+ if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n || - exp > __gmpfr_emax - n))) - return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y)); - else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n || -diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c ---- mpfr-3.1.3-a/src/version.c 2015-07-02 10:49:24.042113845 +0000 -+++ mpfr-3.1.3-b/src/version.c 2015-07-02 10:50:08.126574142 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.3-p1"; -+ return "3.1.3-p2"; - } -diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c ---- mpfr-3.1.3-a/tests/tmul_2exp.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/tests/tmul_2exp.c 2015-07-02 10:50:08.106573933 +0000 -@@ -242,6 +242,76 @@ - large (MPFR_EMAX_MAX); - } - -+/* Cases where the function overflows on n = 0 when rounding is like -+ away from zero. */ -+static void -+overflow0 (mpfr_exp_t emax) -+{ -+ mpfr_exp_t old_emax; -+ mpfr_t x, y1, y2; -+ int neg, r, op; -+ static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; -+ -+ old_emax = mpfr_get_emax (); -+ set_emax (emax); -+ -+ mpfr_init2 (x, 8); -+ mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0); -+ -+ mpfr_set_inf (x, 1); -+ mpfr_nextbelow (x); -+ -+ for (neg = 0; neg <= 1; neg++) -+ { -+ RND_LOOP (r) -+ { -+ int inex1, inex2; -+ unsigned int flags1, flags2; -+ -+ /* Even if there isn't an overflow (rounding ~ toward zero), -+ the result is the same as the one of an overflow. */ -+ inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1); -+ flags1 = MPFR_FLAGS_INEXACT; -+ if (mpfr_inf_p (y1)) -+ flags1 |= MPFR_FLAGS_OVERFLOW; -+ for (op = 0; op < 4; op++) -+ { -+ mpfr_clear_flags (); -+ inex2 = -+ op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) : -+ op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) : -+ op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) : -+ op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) : -+ (MPFR_ASSERTN (0), 0); -+ flags2 = __gmpfr_flags; -+ if (!(mpfr_equal_p (y1, y2) && -+ SAME_SIGN (inex1, inex2) && -+ flags1 == flags2)) -+ { -+ printf ("Error in overflow0 for %s, mpfr_%s, emax = %" -+ MPFR_EXP_FSPEC "d,\nx = ", -+ mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op], -+ (mpfr_eexp_t) emax); -+ mpfr_dump (x); -+ printf ("Expected "); -+ mpfr_dump (y1); -+ printf (" with inex = %d, flags =", inex1); -+ flags_out (flags1); -+ printf ("Got "); -+ mpfr_dump (y2); -+ printf (" with inex = %d, flags =", inex2); -+ flags_out (flags2); -+ exit (1); -+ } -+ } -+ } -+ mpfr_neg (x, x, MPFR_RNDN); -+ } -+ -+ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); -+ set_emax (old_emax); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -334,6 +404,11 @@ - underflow0 (); - large0 (); - -+ if (mpfr_get_emax () != MPFR_EMAX_MAX) -+ overflow0 (mpfr_get_emax ()); -+ overflow0 (MPFR_EMAX_MAX); -+ overflow0 (-1); -+ - tests_end_mpfr (); - return 0; - } -diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES ---- mpfr-3.1.3-a/PATCHES 2015-07-17 08:54:48.592799981 +0000 -+++ mpfr-3.1.3-b/PATCHES 2015-07-17 08:54:48.616811495 +0000 -@@ -0,0 +1 @@ -+muldiv-2exp-underflow -diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION ---- mpfr-3.1.3-a/VERSION 2015-07-02 10:50:08.126574142 +0000 -+++ mpfr-3.1.3-b/VERSION 2015-07-17 08:54:48.616811495 +0000 -@@ -1 +1 @@ --3.1.3-p2 -+3.1.3-p3 -diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c ---- mpfr-3.1.3-a/src/div_2si.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/src/div_2si.c 2015-07-17 08:54:48.608807656 +0000 -@@ -45,7 +45,8 @@ - if (rnd_mode == MPFR_RNDN && - (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) || - exp < __gmpfr_emin + (n - 1) || -- (inexact >= 0 && mpfr_powerof2_raw (y)))) -+ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) && -+ mpfr_powerof2_raw (y)))) - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y)); - } -diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c ---- mpfr-3.1.3-a/src/div_2ui.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/src/div_2ui.c 2015-07-17 08:54:48.608807656 +0000 -@@ -44,7 +44,9 @@ - if (MPFR_UNLIKELY (n >= diffexp)) /* exp - n <= emin - 1 */ - { - if (rnd_mode == MPFR_RNDN && -- (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y)))) -+ (n > diffexp || -+ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) && -+ mpfr_powerof2_raw (y)))) - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y)); - } -diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h ---- mpfr-3.1.3-a/src/mpfr.h 2015-07-02 10:50:08.126574142 +0000 -+++ mpfr-3.1.3-b/src/mpfr.h 2015-07-17 08:54:48.616811495 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 3 --#define MPFR_VERSION_STRING "3.1.3-p2" -+#define MPFR_VERSION_STRING "3.1.3-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c ---- mpfr-3.1.3-a/src/mul_2si.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/src/mul_2si.c 2015-07-17 08:54:48.608807656 +0000 -@@ -48,7 +48,8 @@ - if (rnd_mode == MPFR_RNDN && - (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) || - exp < __gmpfr_emin - (n + 1) || -- (inexact >= 0 && mpfr_powerof2_raw (y)))) -+ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) && -+ mpfr_powerof2_raw (y)))) - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y)); - } -diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c ---- mpfr-3.1.3-a/src/version.c 2015-07-02 10:50:08.126574142 +0000 -+++ mpfr-3.1.3-b/src/version.c 2015-07-17 08:54:48.616811495 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.3-p2"; -+ return "3.1.3-p3"; - } -diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c ---- mpfr-3.1.3-a/tests/tmul_2exp.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/tests/tmul_2exp.c 2015-07-17 08:54:48.608807656 +0000 -@@ -50,77 +50,82 @@ - { - mpfr_t x, y, z1, z2; - mpfr_exp_t emin; -- int i, k; -+ int i, k, s; - int prec; - int rnd; - int div; - int inex1, inex2; - unsigned int flags1, flags2; - -- /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) -- * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4, -- * by comparing the result with the one of a simple division. -+ /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with -+ * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and -+ * k = 1 to 4, by comparing the result with the one of a simple division. - */ - emin = mpfr_get_emin (); - set_emin (e); - mpfr_inits2 (8, x, y, (mpfr_ptr) 0); - for (i = 15; i <= 17; i++) -- { -- inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN); -- MPFR_ASSERTN (inex1 == 0); -- for (prec = 6; prec >= 3; prec -= 3) -- { -- mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0); -- RND_LOOP (rnd) -- for (k = 1; k <= 4; k++) -- { -- /* The following one is assumed to be correct. */ -- inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN); -- MPFR_ASSERTN (inex1 == 0); -- inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN); -- MPFR_ASSERTN (inex1 == 0); -- mpfr_clear_flags (); -- /* Do not use mpfr_div_ui to avoid the optimization -- by mpfr_div_2si. */ -- inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd); -- flags1 = __gmpfr_flags; -- -- for (div = 0; div <= 2; div++) -+ for (s = 1; s >= -1; s -= 2) -+ { -+ inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ for (prec = 6; prec >= 3; prec -= 3) -+ { -+ mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0); -+ RND_LOOP (rnd) -+ for (k = 1; k <= 4; k++) - { -+ /* The following one is assumed to be correct. */ -+ inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); - mpfr_clear_flags (); -- inex2 = div == 0 ? -- mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ? -- mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) : -- mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd); -- flags2 = __gmpfr_flags; -- if (flags1 == flags2 && SAME_SIGN (inex1, inex2) && -- mpfr_equal_p (z1, z2)) -- continue; -- printf ("Error in underflow("); -- if (e == MPFR_EMIN_MIN) -- printf ("MPFR_EMIN_MIN"); -- else if (e == emin) -- printf ("default emin"); -- else if (e >= LONG_MIN) -- printf ("%ld", (long) e); -- else -- printf ("<LONG_MIN"); -- printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d, " -- "%s\n", div == 0 ? "mul_2si" : div == 1 ? -- "div_2si" : "div_2ui", i, prec, k, -- mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); -- printf ("Expected "); -- mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN); -- printf (", inex = %d, flags = %u\n", SIGN (inex1), flags1); -- printf ("Got "); -- mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN); -- printf (", inex = %d, flags = %u\n", SIGN (inex2), flags2); -- exit (1); -- } /* div */ -- } /* k */ -- mpfr_clears (z1, z2, (mpfr_ptr) 0); -- } /* prec */ -- } /* i */ -+ /* Do not use mpfr_div_ui to avoid the optimization -+ by mpfr_div_2si. */ -+ inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd); -+ flags1 = __gmpfr_flags; -+ -+ for (div = 0; div <= 2; div++) -+ { -+ mpfr_clear_flags (); -+ inex2 = -+ div == 0 ? -+ mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : -+ div == 1 ? -+ mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) : -+ mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd); -+ flags2 = __gmpfr_flags; -+ if (flags1 == flags2 && SAME_SIGN (inex1, inex2) && -+ mpfr_equal_p (z1, z2)) -+ continue; -+ printf ("Error in underflow("); -+ if (e == MPFR_EMIN_MIN) -+ printf ("MPFR_EMIN_MIN"); -+ else if (e == emin) -+ printf ("default emin"); -+ else if (e >= LONG_MIN) -+ printf ("%ld", (long) e); -+ else -+ printf ("<LONG_MIN"); -+ printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d," -+ " %s\n", div == 0 ? "mul_2si" : div == 1 ? -+ "div_2si" : "div_2ui", s * i, prec, k, -+ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); -+ printf ("Expected "); -+ mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN); -+ printf (", inex = %d, flags = %u\n", -+ SIGN (inex1), flags1); -+ printf ("Got "); -+ mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN); -+ printf (", inex = %d, flags = %u\n", -+ SIGN (inex2), flags2); -+ exit (1); -+ } /* div */ -+ } /* k */ -+ mpfr_clears (z1, z2, (mpfr_ptr) 0); -+ } /* prec */ -+ } /* i */ - mpfr_clears (x, y, (mpfr_ptr) 0); - set_emin (emin); - } -diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES ---- mpfr-3.1.3-a/PATCHES 2015-07-17 08:58:21.094987384 +0000 -+++ mpfr-3.1.3-b/PATCHES 2015-07-17 08:58:21.118986898 +0000 -@@ -0,0 +1 @@ -+frexp -diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION ---- mpfr-3.1.3-a/VERSION 2015-07-17 08:54:48.616811495 +0000 -+++ mpfr-3.1.3-b/VERSION 2015-07-17 08:58:21.118986898 +0000 -@@ -1 +1 @@ --3.1.3-p3 -+3.1.3-p4 -diff -Naurd mpfr-3.1.3-a/src/frexp.c mpfr-3.1.3-b/src/frexp.c ---- mpfr-3.1.3-a/src/frexp.c 2015-06-19 19:55:09.000000000 +0000 -+++ mpfr-3.1.3-b/src/frexp.c 2015-07-17 08:58:21.106987142 +0000 -@@ -26,6 +26,13 @@ - mpfr_frexp (mpfr_exp_t *exp, mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd) - { - int inex; -+ unsigned int saved_flags = __gmpfr_flags; -+ MPFR_BLOCK_DECL (flags); -+ -+ MPFR_LOG_FUNC -+ (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd), -+ ("y[%Pu]=%.*Rg exp=%" MPFR_EXP_FSPEC "d inex=%d", mpfr_get_prec (y), -+ mpfr_log_prec, y, (mpfr_eexp_t) *exp, inex)); - - if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x))) - { -@@ -49,8 +56,32 @@ - } - } - -- inex = mpfr_set (y, x, rnd); -+ MPFR_BLOCK (flags, inex = mpfr_set (y, x, rnd)); -+ __gmpfr_flags = saved_flags; -+ -+ /* Possible overflow due to the rounding, no possible underflow. */ -+ -+ if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags))) -+ { -+ int inex2; -+ -+ /* An overflow here means that the exponent of y would be larger than -+ the one of x, thus x would be rounded to the next power of 2, and -+ the returned y should be 1/2 in absolute value, rounded (i.e. with -+ possible underflow or overflow). This also implies that x and y are -+ different objects, so that the exponent of x has not been lost. */ -+ MPFR_LOG_MSG (("Internal overflow\n", 0)); -+ MPFR_ASSERTD (x != y); -+ *exp = MPFR_GET_EXP (x) + 1; -+ inex2 = mpfr_set_si_2exp (y, MPFR_INT_SIGN (x), -1, rnd); -+ MPFR_LOG_MSG (("inex=%d inex2=%d\n", inex, inex2)); -+ if (inex2 != 0) -+ inex = inex2; -+ MPFR_RET (inex); -+ } -+ - *exp = MPFR_GET_EXP (y); -- MPFR_SET_EXP (y, 0); -+ /* Do not use MPFR_SET_EXP because the range has not been checked yet. */ -+ MPFR_EXP (y) = 0; - return mpfr_check_range (y, inex, rnd); - } -diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h ---- mpfr-3.1.3-a/src/mpfr.h 2015-07-17 08:54:48.616811495 +0000 -+++ mpfr-3.1.3-b/src/mpfr.h 2015-07-17 08:58:21.114986979 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 3 --#define MPFR_VERSION_STRING "3.1.3-p3" -+#define MPFR_VERSION_STRING "3.1.3-p4" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c ---- mpfr-3.1.3-a/src/version.c 2015-07-17 08:54:48.616811495 +0000 -+++ mpfr-3.1.3-b/src/version.c 2015-07-17 08:58:21.118986898 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.3-p3"; -+ return "3.1.3-p4"; - } -diff -Naurd mpfr-3.1.3-a/tests/tfrexp.c mpfr-3.1.3-b/tests/tfrexp.c ---- mpfr-3.1.3-a/tests/tfrexp.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/tests/tfrexp.c 2015-07-17 08:58:21.106987142 +0000 -@@ -129,12 +129,115 @@ - mpfr_clear (x); - } - -+static void check1 (void) -+{ -+ mpfr_exp_t emin, emax, e; -+ mpfr_t x, y1, y2; -+ int r, neg, red; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ -+ mpfr_init2 (x, 7); -+ mpfr_inits2 (4, y1, y2, (mpfr_ptr) 0); -+ -+ mpfr_set_ui_2exp (x, 1, -2, MPFR_RNDN); -+ while (mpfr_regular_p (x)) -+ { -+ /* Test the exponents up to 3 and with the maximum exponent -+ (to check potential intermediate overflow). */ -+ if (MPFR_GET_EXP (x) == 4) -+ mpfr_set_exp (x, MPFR_EMAX_MAX); -+ e = MPFR_GET_EXP (x); -+ for (neg = 0; neg < 2; neg++) -+ { -+ RND_LOOP (r) -+ { -+ int inex1, inex2; -+ mpfr_exp_t e1, e2; -+ unsigned int flags1, flags2; -+ -+ for (red = 0; red < 2; red++) -+ { -+ if (red) -+ { -+ /* e1: exponent of the rounded value of x. */ -+ MPFR_ASSERTN (e1 == e || e1 == e + 1); -+ set_emin (e); -+ set_emax (e); -+ mpfr_clear_flags (); -+ inex1 = e1 < 0 ? -+ mpfr_mul_2ui (y1, x, -e1, (mpfr_rnd_t) r) : -+ mpfr_div_2ui (y1, x, e1, (mpfr_rnd_t) r); -+ flags1 = __gmpfr_flags; -+ } -+ else -+ { -+ inex1 = mpfr_set (y1, x, (mpfr_rnd_t) r); -+ e1 = MPFR_IS_INF (y1) ? e + 1 : MPFR_GET_EXP (y1); -+ flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; -+ } -+ mpfr_clear_flags (); -+ inex2 = mpfr_frexp (&e2, y2, x, (mpfr_rnd_t) r); -+ flags2 = __gmpfr_flags; -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ if ((!red || e == 0) && -+ (! mpfr_regular_p (y2) || MPFR_GET_EXP (y2) != 0)) -+ { -+ printf ("Error in check1 for %s, red = %d, x = ", -+ mpfr_print_rnd_mode ((mpfr_rnd_t) r), red); -+ mpfr_dump (x); -+ printf ("Expected 1/2 <= |y| < 1, got y = "); -+ mpfr_dump (y2); -+ exit (1); -+ } -+ if (!red) -+ { -+ if (e2 > 0) -+ mpfr_mul_2ui (y2, y2, e2, MPFR_RNDN); -+ else if (e2 < 0) -+ mpfr_div_2ui (y2, y2, -e2, MPFR_RNDN); -+ } -+ if (! (SAME_SIGN (inex1, inex2) && -+ mpfr_equal_p (y1, y2) && -+ flags1 == flags2)) -+ { -+ printf ("Error in check1 for %s, red = %d, x = ", -+ mpfr_print_rnd_mode ((mpfr_rnd_t) r), red); -+ mpfr_dump (x); -+ printf ("Expected y1 = "); -+ mpfr_dump (y1); -+ printf ("Got y2 = "); -+ mpfr_dump (y2); -+ printf ("Expected inex ~= %d, got %d\n", inex1, inex2); -+ printf ("Expected flags:"); -+ flags_out (flags1); -+ printf ("Got flags: "); -+ flags_out (flags2); -+ exit (1); -+ } -+ } -+ } -+ mpfr_neg (x, x, MPFR_RNDN); -+ } -+ mpfr_nextabove (x); -+ } -+ -+ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); -+ set_emin (emin); -+ set_emax (emax); -+} -+ - int - main (int argc, char *argv[]) - { - tests_start_mpfr (); - - check_special (); -+ check1 (); - - tests_end_mpfr (); - return 0; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee7d4765fb22..1040cb9a9343 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.lgpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.sjmackenzie ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index d43519f4a2f3..8af2a7aa3682 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fortran API to manipulate netcdf files"; - homepage = http://www.unidata.ucar.edu/software/netcdf/; + homepage = https://www.unidata.ucar.edu/software/netcdf/; license = licenses.free; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 8ccaf726e6b0..c4a30f52b050 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig }: -let version = "3.0.1"; in +{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: +let version = "4.0.4"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,12 +7,12 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r"; + sha256 = "02lz62n55pvqin4x44qlxb5knrapyckmj9k8ggk4qxgb36368ifn"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ nix ]; + buildInputs = [ nix boost ]; meta = { description = "Collection of miscellaneous plugins for the nix expression language"; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index afd2a7b12dfa..ec6dc5f90528 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, libGL }: +{stdenv, fetchurl, ruby, opencl-headers, libGL_driver }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${libGL.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${libGL_driver.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 694fbaa50c1c..0f6495f0c9c1 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; - homepage = http://www.ogre3d.org/; + homepage = https://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index b82f137ec6d7..974c2e482ea5 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.6.1"; + version = "6.7.1"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "062g5443dyxsraq346panfqvbd6wal6nmb336n4dw1rszx576sxz"; + sha256 = "07xbx4f3h1aqvy6587xbr8fgcn679ph3bd86pp144y0agzw0d0q2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix new file mode 100644 index 000000000000..a6e62cea9d7e --- /dev/null +++ b/pkgs/development/libraries/openbsm/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "openbsm"; + name = "${pname}-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}"; + sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; + }; + + meta = { + homepage = http://www.openbsm.org/; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 49574a4b421b..efb9a7cdbe43 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { ''; preConfigure = - installExtraFiles ippicv + ( + lib.optionalString enableIpp (installExtraFiles ippicv) + ( lib.optionalString buildContrib '' cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib") @@ -260,7 +260,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.org/; + homepage = https://opencv.org/; license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 46a8ebffbb8c..68486fca54d6 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "0ybv41nbh86ricxfv478z4izbxvnvk86csr29c6qf4dinmrysf96"; + sha256 = "13sxcg2sdhnzdkrjqmhg16p4001w3rd048p71k74pbmi8qpd0bw2"; }; buildInputs = [ diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index f8cbc867b2be..1ab6661db5bb 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1b13nzf9xh1iv0k8z7sdfs9ya2ykf0gzjiixpb1qn3bydck6ppdm"; + sha256 = "1xqpc1qlvghprwih99immsjh3ba08lg754cf5icnmpkwh9nlh6p2"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix new file mode 100644 index 000000000000..187f86133756 --- /dev/null +++ b/pkgs/development/libraries/openpam/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, lib }: + +stdenv.mkDerivation rec { + name = "openpam-${version}"; + version = "20170430"; + + src = fetchurl { + url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz"; + sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; + }; + + meta = { + homepage = https://www.openpam.org; + description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index af6a540b97c0..5a9052222cb8 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -113,20 +113,13 @@ let in { openssl_1_0_2 = common { - version = "1.0.2n"; - sha256 = "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp"; + version = "1.0.2o"; + sha256 = "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc"; }; openssl_1_1_0 = common { - version = "1.1.0g"; - sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; - patches = [ - (fetchpatch { - name = "CVE-2017-3738.patch"; - url = "https://github.com/openssl/openssl/commit/563066.patch"; - sha256 = "0ni9fwpxf8raw8b58pfa15akbqmxx4q64v0ldsm4b9dqhbxf8mkz"; - }) - ]; + version = "1.1.0h"; + sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq"; }; } diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index f9540d2c4d20..be28c84e3e42 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "162l1prgdyf571bgxc621gicl40b050ny64f0jmnhz0h5xq6sfrv"; + sha256 = "1als53dnbnwa66k16vy95h1rhpdzz6i80c0gc2g3i17qbasl6ni5"; }; outputs = [ "out" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec LOG4CPLUS_LIB= BLOSC_INCLUDE_DIR=${c-blosc}/include/ BLOSC_LIB_DIR=${c-blosc}/lib/ - ''; + ''; installFlags = ''DESTDIR=$(out)''; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec description = "An open framework for voxel"; homepage = "http://www.openvdb.org"; maintainers = [ maintainers.guibou ]; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix new file mode 100644 index 000000000000..63c51996b227 --- /dev/null +++ b/pkgs/development/libraries/openzwave/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub +, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which +, systemd }: + +let + version = "2018-04-04"; + +in stdenv.mkDerivation rec { + name = "openzwave-${version}"; + + src = fetchFromGitHub { + owner = "OpenZWave"; + repo = "open-zwave"; + rev = "ab5fe966fee882bb9e8d78a91db892a60a1863d9"; + sha256 = "0yby8ygzjn5zp5vhysxaadbzysqanwd2zakz379299qs454pr2h9"; + }; + + nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; + + buildInputs = [ systemd ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + DESTDIR=$out PREFIX= pkgconfigdir=lib/pkgconfig make install $installFlags + + runHook postInstall + ''; + + FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"; + FONTCONFIG_PATH="${fontconfig.out}/etc/fonts/"; + + postPatch = '' + substituteInPlace cpp/src/Options.cpp \ + --replace /etc/openzwave $out/etc/openzwave + ''; + + fixupPhase = '' + substituteInPlace $out/lib/pkgconfig/libopenzwave.pc \ + --replace prefix= prefix=$out \ + --replace dir= dir=$out + + substituteInPlace $out/bin/ozw_config \ + --replace pcfile=${pkgconfig} pcfile=$out + ''; + + meta = with stdenv.lib; { + description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; + homepage = http://www.openzwave.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 3806926fa244..d880d41c7084 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz -, libintlOrEmpty, gobjectIntrospection, darwin +, libintl, gobjectIntrospection, darwin }: with stdenv.lib; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo harfbuzz libXft ] ++ libintlOrEmpty; + propagatedBuildInputs = [ cairo harfbuzz libXft libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix new file mode 100644 index 000000000000..e281e604380b --- /dev/null +++ b/pkgs/development/libraries/parquet-cpp/default.nix @@ -0,0 +1,37 @@ +{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }: + +stdenv.mkDerivation rec { + name = "parquet-cpp-${version}"; + version = "1.4.0"; + + src = fetchurl { + url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz"; + sha256 = "1kn7pjzi5san5f05qbl8l8znqsa3f9cq9bflfr4s2jfwr7k9p2aj"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + preConfigure = '' + substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + ''; + + ARROW_HOME = arrow-cpp; + THRIFT_HOME = thrift; + GTEST_HOME = gtest; + SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + + cmakeFlags = [ + "-DPARQUET_BUILD_BENCHMARKS=OFF" + ]; + + meta = { + description = "A C++ library to read and write the Apache Parquet columnar data format"; + homepage = http://parquet.apache.org; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 2ea5e923bad0..973798b849bc 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -35,6 +35,10 @@ in stdenv.mkDerivation rec { # https://bugs.exim.org/show_bug.cgi?id=2173 patches = [ ./stacksize-detection.patch ]; + preCheck = '' + patchShebangs RunGrepTest + ''; + doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 5d533d4250aa..c13b659f792e 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1mvsa3v8d1pl2fj1dcdf8sikzm1yb2jcl0q34fyfsjw2cisxpv5f"; + sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; }; patches = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 57580de2401b..7e7314c936dd 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { "-Denable_gstreamer=true" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; - homepage = http://pipewire.org/; + homepage = https://pipewire.org/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 1f360f075886..11dd8ec32910 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.62.0"; + version = "0.63.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1ii9ly1pngyvs0aiq2wxpya08hidpl54y7nsb8b1vxnnskgp76jv"; + sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; }; outputs = [ "out" "dev" ]; - buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; + buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; + # Not sure when and how to pass it. It seems an upstream bug anyway. CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; cmakeFlags = [ diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index d40ae8564951..f300a571b0cc 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ptex-${version}"; - version = "2.1.28"; + version = "2.1.33"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "1h6gb3mpis4m6ph7h9q764w50f9jrar3jz2ja76rn5czy6wn318x"; + sha256 = "15ijjq3w7hwgm4mqah0x4jzjy3v2nnmmv28lbqzmxzcxjgh4sjkn"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index f980a14aa41d..ae60a6f69d63 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -24,12 +24,16 @@ stdenv.mkDerivation rec { (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3; sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0"; }) - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support; - sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4"; - }) ./ptlib-2.10.11-glibc-2.26.patch ]; + # fix typedef clashes with unixODBC>=2.3.5 + postPatch = '' + substituteInPlace include/ptlib/unix/ptlib/contain.h \ + --replace "typedef uintptr_t UINT" "typedef unsigned int UINT" \ + --replace "typedef wchar_t WCHAR" "typedef unsigned short WCHAR" + ''; + meta = with stdenv.lib; { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index dd33f63c913c..1730f9b733ca 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pugixml-${version}"; - version = "1.8.1"; + version = "1.9"; src = fetchurl { url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80"; + sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index fd738faf5074..018a57ad0571 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libupnp-${version}"; - version = "1.6.21"; + version = "1.8.3"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "07ksfhadinaa20542gblrxi9pqz0v6y70a836hp3qr4037id4nm9"; + sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 4976399a66a6..568e7ce07b3b 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt }: +{ stdenv, fetchurl, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { name = "qca-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt ]; + buildInputs = [ (stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security) qt ]; enableParallelBuilding = true; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = "LGPL"; homepage = http://delta.affinix.com/qca; maintainers = [ maintainers.sander ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix new file mode 100644 index 000000000000..630f606c2e54 --- /dev/null +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -0,0 +1,31 @@ +{stdenv, qtdeclarative, fetchFromGitHub, qmake }: +stdenv.mkDerivation rec { + name = "qml-box2d-2018-03-16"; + src = fetchFromGitHub { + owner = "qml-box2d"; + repo = "qml-box2d"; + sha256 = "1fbsvv28b4r0szcv8bk5gxpf8v534jp2axyfp438384sy757wsq2"; + rev = "21e57f1"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtdeclarative ]; + + patchPhase = '' + substituteInPlace box2d.pro \ + --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" + qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" + ''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with stdenv.lib; { + description = "A QML plugin for Box2D engine"; + homepage = "https://github.com/qml-box2d/qml-box2d"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.linux; + license = licenses.zlib; + }; +} diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 7f6c47a9a7fc..00ce51330487 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libjpeg, zlib, perl }: -let version = "8.0.0"; +let version = "8.0.2"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "01a1d5wyrj1m35d68yj0cyqfjyrwhxq2yqwaw5an1d1p4aaid8gz"; + sha256 = "1hf8jfjar8p7v288d7ccmr8w171mv9kb86b6hq1nk58mnlq1g7mh"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index d6bd90fa47d8..281dbe0a5eda 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -3,15 +3,20 @@ , withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null }: +# Fix Xcode 8 compilation problem +let xcodePatch = + fetchurl { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch"; + sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; }; +in stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.9.4"; + version = "2.10.3"; name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; - sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; + sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav"; }; buildInputs = [ (if withQt5 then qtbase else qt4) ] @@ -19,6 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); + + patches = [] ++ lib.optional withQt5 [ xcodePatch ]; + enableParallelBuilding = true; preConfigure = '' diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index bafe36647359..10f892bc4d00 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { icu = icu.out; libXfixes = libXfixes.out; glibc = stdenv.cc.libc.out; - openglDriver = if libGLSupported then libGL.driverLink else "/no-such-path"; }) (fetchpatch { name = "fix-medium-font.patch"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff index 0f5cf2b79c96..4c64e9e26e30 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -59,32 +59,6 @@ index 6b42d1e..f88b628 100644 lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) return; -diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp -index 229d6f9..c122bf3 100644 ---- a/src/plugins/platforms/xcb/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/qglxintegration.cpp -@@ -136,7 +136,7 @@ void* QGLXContext::getProcAddress(const QString& 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"); - } - } -diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp -index 2467247..a2441d4 100644 ---- a/src/plugins/platforms/xlib/qglxintegration.cpp -+++ b/src/plugins/platforms/xlib/qglxintegration.cpp -@@ -137,7 +137,7 @@ void* QGLXContext::getProcAddress(const QString& 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"); - } - } diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp index f8f3d69..d63c5bc 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.cpp diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index df9995bc3b9f..08345510d787 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -4,7 +4,7 @@ , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst -, fontconfig, freetype, harfbuzz, icu, dbus +, fontconfig, freetype, harfbuzz, icu, dbus, libdrm , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent , alsaLib @@ -63,8 +63,9 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc ''; + preConfigure = '' - export MAKEFLAGS=-j$NIX_BUILD_CORES + export NINJAFLAGS=-j$NIX_BUILD_CORES if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" @@ -104,7 +105,7 @@ qtModule { # X11 libs xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst - xorg.libXcomposite + xorg.libXcomposite xorg.libXdamage libdrm ]; dontUseNinjaBuild = true; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 5085d9bf5ef9..8667f272cf7d 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qtstyleplugin-kvantum-${version}"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; - rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; - sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + rev = "a6daa1a6df3c5d4abc7ea39ef7028ddea2addbf6"; + sha256 = "1zns4x95h0ydiwx8yw0bmyg4lc2sy7annmdrg66sx753x3177zxp"; }; nativeBuildInputs = [ qmake qttools ]; @@ -16,15 +16,16 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; - postInstall= '' - mkdir -p $out/$qtPluginPrefix/styles - mv $NIX_QT5_TMP/$qtPluginPrefix/styles/libkvantum.so $out/$qtPluginPrefix/styles/libkvantum.so + postPatch = '' + # Fix plugin dir + substituteInPlace style/style.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; meta = with stdenv.lib; { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; }; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 4379f5cf667b..8d096e18f08f 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zip, zlib, qtbase, qmake }: stdenv.mkDerivation rec { - name = "quazip-0.7.1"; + name = "quazip-0.7.3"; src = fetchurl { url = "mirror://sourceforge/quazip/${name}.tar.gz"; - sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq"; + sha256 = "1db9w8ax1ki0p67a47h4cnbwfgi2di4y3k9nc3a610kffiag7m1a"; }; preConfigure = "cd quazip"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 314ab0f9e611..6e0fa53aa828 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; branch = "6"; }; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index da5769e92cd1..f900de5e578b 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 13c0198ba505..c841d82ccce0 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 8e6b3b44491e..a1671aa3e0f9 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -13,14 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - # detected by gcc7 - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "-Werror" "" + substituteInPlace example/CMakeLists.txt --replace "-Werror" "" + ''; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; homepage = "http://rapidjson.org/"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index bb43a49235bd..a1af43748430 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }: +{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "17ghq0kzk2fdpxhr40xgg3s0p0n0gkvd0d85c6jsww3mj8v5xd14"; + sha256 = "11ps8sy4v8yvj4sha7d1q3rmhfw7l1rd52rnl01xam9862yasahs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib perl python ]; + buildInputs = [ zlib perl python openssl ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ]; - postPatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index fc8a18cfc38f..bb0faf76be69 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,12 +15,13 @@ let malloc = if jemalloc != null then jemalloc else gperftools; + tools = [ "sst_dump" "ldb" "rocksdb_dump" "rocksdb_undump" "blob_dump" ]; in stdenv.mkDerivation rec { name = "rocksdb-${version}"; version = "5.10.3"; - outputs = [ "dev" "out" "static" ]; + outputs = [ "dev" "out" "static" "bin" ]; src = fetchFromGitHub { owner = "facebook"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq"; }; - + nativeBuildInputs = [ which perl ]; buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ]; @@ -43,19 +44,19 @@ stdenv.mkDerivation rec { CMAKE_CXX_FLAGS = "-std=gnu++11"; JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; - ${if enableLite then "LIBNAME" else null} = "librocksdb_lite"; + LIBNAME = "librocksdb${stdenv.lib.optionalString enableLite "_lite"}"; ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; - + buildAndInstallFlags = [ "USE_RTTI=1" "DEBUG_LEVEL=0" - "DISABLE_WARNING_AS_ERROR=1" + "DISABLE_WARNING_AS_ERROR=1" ]; buildFlags = buildAndInstallFlags ++ [ "shared_lib" "static_lib" - ]; + ] ++ tools ; installFlags = buildAndInstallFlags ++ [ "INSTALL_PATH=\${out}" @@ -68,7 +69,10 @@ stdenv.mkDerivation rec { echo "BUILD CONFIGURATION FOR SANITY CHECKING" cat make_config.mk mkdir -pv $static/lib/ - mv -vi $out/lib/librocksdb.a $static/lib/ + mv -vi $out/lib/${LIBNAME}.a $static/lib/ + + install -d ''${!outputBin}/bin + install -D ${stdenv.lib.concatStringsSep " " tools} ''${!outputBin}/bin ''; enableParallelBuilding = true; @@ -77,7 +81,7 @@ stdenv.mkDerivation rec { homepage = http://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; - platforms = platforms.x86_64 ++ platforms.aarch64; + platforms = platforms.x86_64; maintainers = with maintainers; [ adev wkennington ]; }; } diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index d8e67baa13df..2309719c2bdc 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = http://diracvideo.org/; maintainers = [ maintainers.spwhitt ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index d971f1a2e0b2..8cca5565bf6f 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -45,7 +45,9 @@ let inherit (stdenv.lib) optional optionalString; - version = "3.10.3"; + # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44 + # is resolved. + version = "3.10.2"; in stdenv.mkDerivation { @@ -53,7 +55,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; - sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216"; + sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index af7078599db5..916bf122b3c2 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { algorithms. You can bring your creations to scale using the power of GPUs in the cloud or to the masses on mobile with Caffe2's cross-platform libraries. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; }; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 40b02d303417..7a653a58eb2a 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -7,6 +7,7 @@ , python , ocl-icd , opencl-headers +, Accelerate, CoreGraphics, CoreVideo, OpenCL , gtest }: @@ -40,11 +41,19 @@ stdenv.mkDerivation rec { gfortran blas python - ocl-icd - opencl-headers boost gtest - ]; + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ocl-icd + opencl-headers + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreVideo + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + OpenCL + ]; enableParallelBuilding = true; @@ -56,7 +65,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix new file mode 100644 index 000000000000..2441aff9fa30 --- /dev/null +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.21"; + name = "cliquer-${version}"; + + # autotoolized version of the original cliquer + src = fetchFromGitHub { + owner = "dimpase"; + repo = "autocliquer"; + rev = "v${version}"; + sha256 = "180i4qj1a25qfp75ig2d3144xfpb1dgcgpha0iqqghd7di4awg7z"; + }; + + doCheck = true; + + buildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://users.aalto.fi/~pat/cliquer.html; + downloadPage = src.meta.homepage; # autocliquer + description = "Routines for clique searching"; + longDescription = '' + Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. + It uses an exact branch-and-bound algorithm developed by Patric Östergård. + It is designed with the aim of being efficient while still being flexible and + easy to use. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix new file mode 100644 index 000000000000..b9ee1e2a10d7 --- /dev/null +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromBitbucket +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "20140914"; + name = "m4ri-${version}"; + + src = fetchFromBitbucket { + owner = "malb"; + repo = "m4ri"; + rev = "release-${version}"; + sha256 = "0xfg6pffbn8r1s0y7bn9b8i55l00d41dkmhrpf7pwk53qa3achd3"; + }; + + doCheck = true; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://malb.bitbucket.io/m4ri/; + description = "Library to do fast arithmetic with dense matrices over F_2"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix new file mode 100644 index 000000000000..23fc03655cf3 --- /dev/null +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromBitbucket +, autoreconfHook +, m4ri +}: + +stdenv.mkDerivation rec { + version = "20150908"; + name = "m4rie-${version}"; + + src = fetchFromBitbucket { + owner = "malb"; + repo = "m4rie"; + rev = "release-${version}"; + sha256 = "0r8lv46qx5mkz5kp3ay2jnsp0mbhlqr5z2z220wdk73wdshcznss"; + }; + + doCheck = true; + + buildInputs = [ + m4ri + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://malb.bitbucket.io/m4rie/; + description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; + longDescription = '' + M4RIE is a library for fast arithmetic with dense matrices over small finite fields of even characteristic. + It uses the M4RI library, implementing the same operations over the finite field F2. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 07d2a04c5e20..5ac0bcd1d7d7 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -60,7 +60,7 @@ let TARGET = "ATHLON"; DYNAMIC_ARCH = "1"; CC = "gcc"; - USE_OPENMP = "1"; + USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1"; }; }; in diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index e1ce4b497470..ac8129c9032f 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "petsc-${version}"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1b1yr93g6df8kx10ri2y26bp3l3w3jv10r80krnarbvyjgnw7y81"; + sha256 = "1iy49gagxncx09d88kxnwkj876p35683mpfk33x37165si6xqy4z"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix new file mode 100644 index 000000000000..7394fb9e1b41 --- /dev/null +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "planarity"; + version = "3.0.0.5"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "graph-algorithms"; + repo = "edge-addition-planarity-suite"; + rev = "Version_${version}"; + sha256 = "01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + doCheck = true; + + patches = [ + # declare variables declared in headers as extern, not yet merged upstream + (fetchpatch { + url = "https://github.com/graph-algorithms/edge-addition-planarity-suite/pull/3.patch"; + sha256 = "1nqjc4clr326imz4jxqxcxv2hgh1sjgzll27k5cwkdin8lnmmil8"; + }) + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/graph-algorithms/edge-addition-planarity-suite; + description = "A library for implementing graph algorithms"; + license = licenses.bsd3; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix new file mode 100644 index 000000000000..9fc72f18e5d7 --- /dev/null +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, fetchFromGitHub, fetchurl +, python + +# for binding generation +, castxml ? null + +# can take a long time, generates > 30000 images/graphs +, enableDoxygen ? false + +# e.g. "optimized" or "debug". If not set, use default one +, build_profile ? null + +# --enable-examples +, withExamples ? false + +# very long +, withManual ? false, doxygen ? null, graphviz ? null, imagemagick ? null +# for manual, tetex is used to get the eps2pdf binary +# texlive to get latexmk. building manual still fails though +, dia, tetex ? null, ghostscript ? null, texlive ? null + +# generates python bindings +, generateBindings ? false, ncurses ? null + +# All modules can be enabled by choosing 'all_modules'. +# we include here the DCE mandatory ones +, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"] +, gcc6 +, lib +}: + +let + pythonEnv = python.withPackages(ps: + stdenv.lib.optional withManual ps.sphinx + ++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ]) + ); +in +stdenv.mkDerivation rec { + + name = "ns-3.${version}"; + version = "28"; + + # the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2; + # fetches everything (netanim, etc), this package focuses on ns3-core + src = fetchFromGitHub { + owner = "nsnam"; + repo = "ns-3-dev-git"; + rev = name; + sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng"; + }; + + # ncurses is a hidden dependency of waf when checking python + buildInputs = lib.optionals generateBindings [ castxml ncurses ] + ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ] + ++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ]; + + propagatedBuildInputs = [ gcc6 pythonEnv ]; + + postPatch = '' + patchShebangs ./waf + patchShebangs doc/ns3_html_theme/get_version.sh + ''; + + configureScript = "${python.interpreter} ./waf configure"; + + configureFlags = with stdenv.lib; [ + "--enable-modules=${stdenv.lib.concatStringsSep "," modules}" + "--with-python=${pythonEnv.interpreter}" + ] + ++ optional (build_profile != null) "--build-profile=${build_profile}" + ++ optional generateBindings [ ] + ++ optional withExamples " --enable-examples " + ++ optional doCheck " --enable-tests " + ; + + postBuild = with stdenv.lib; let flags = concatStringsSep ";" ( + optional enableDoxygen "./waf doxygen" + ++ optional withManual "./waf sphinx" + ); + in "${flags}" + ; + + doCheck = true; + + # we need to specify the proper interpreter else ns3 can check against a + # different version even though we + checkPhase = '' + ${pythonEnv.interpreter} ./test.py + ''; + + meta = { + homepage = http://www.nsnam.org; + license = stdenv.lib.licenses.gpl3; + description = "A discrete time event network simulator"; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f9b3de36b2c4..0564459b24c0 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,8 +1,29 @@ { stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup -, polkit, acl, usbutils, vala -, gtk3, epoxy }: +, withPolkit ? true, polkit, acl, usbutils +, vala, gtk3, epoxy, libdrm }: + +# If this package is built with polkit support (withPolkit=true), +# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. +# The helper confirms via polkit that the user has an active session, +# then adds a device acl entry for that user. +# Example NixOS config to create a setuid wrapper for the helper: +# security.wrappers.spice-client-glib-usb-acl-helper.source = +# "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; +# On non-NixOS installations, make a setuid copy of the helper +# outside the store and adjust PATH to find the setuid version. + +# If this package is built without polkit support (withPolkit=false), +# usb redirection requires read-write access to usb devices. +# This can be granted by adding users to a custom group like "usb" +# and using a udev rule to put all usb devices in that group. +# Example NixOS config: +# users.groups.usb = {}; +# users.users.dummy.extraGroups = [ "usb" ]; +# services.udev.extraRules = '' +# KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb" +# ''; with stdenv.lib; @@ -18,15 +39,20 @@ in stdenv.mkDerivation rec { sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; + postPatch = '' + # get rid of absolute path to helper in store so we can use a setuid wrapper + substituteInPlace src/usb-acl-helper.c \ + --replace 'ACL_HELPER_PATH"/' '"' + ''; + buildInputs = [ spice-protocol celt_0_5_1 openssl libpulseaudio pixman - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy - polkit acl usbutils - ]; + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm + ] ++ optionals withPolkit [ polkit acl usbutils ] ; nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions"; configureFlags = [ "--with-gtk3" @@ -34,16 +60,6 @@ in stdenv.mkDerivation rec { "--enable-vala" ]; - # usb redirection needs spice-client-glib-usb-acl-helper to run setuid root - # the helper then uses polkit to check access - # in nixos, enable this with - # security.wrappers.spice-client-glib-usb-acl-helper.source = - # "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper.real"; - postFixup = '' - mv $out/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper.real - ln -sf /run/wrappers/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper - ''; - dontDisableStatic = true; # Needed by the coroutine test enableParallelBuilding = true; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index d4ea531f886e..29ad55eb9d92 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libsrtp-${version}"; - version = "1.5.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "0s029m4iw0nsvnsm2hlz8yajrasdvf315iv2dw8mfm7nhbshwsqa"; + sha256 = "1q2rf1d2bsypdnw9k8ag6hrh9vbinfa504d1f42fdgdqw31d6lib"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index fd9ab5a2036d..89261b665f50 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildPhase = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc != "glibc") '' - sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile '' + ( stdenv.lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile '' ) + '' @@ -36,4 +34,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; }; } - diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index e6fb5a2b6853..272967fcb996 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,14 +1,14 @@ { stdenv, python, fetchurl, openssl, boost }: stdenv.mkDerivation rec { name = "swiften-${version}"; - version = "3.0beta2"; + version = "4.0"; buildInputs = [ python ]; propagatedBuildInputs = [ openssl boost ]; src = fetchurl { url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "0i6ks122rry9wvg6qahk3yiggi7nlkpgws1z0r41vi4i1siq0ls0"; + sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh"; }; buildPhase = '' diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index b1649da6459f..53e48eb89317 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,17 +1,57 @@ -{stdenv, fetchurl}: +{ stdenv +, fetchurl +, fetchpatch +, Carbon ? null +, libjpeg ? null +, libpng ? null +, withJpegSupport ? true # support jpeg output +, withPngSupport ? true # support png output +}: + +assert withJpegSupport -> libjpeg != null; +assert withPngSupport -> libpng != null; +assert stdenv.isDarwin -> Carbon != null; + stdenv.mkDerivation rec { name = "tachyon-${version}"; - version = "0.98.9"; + version = "0.99b2"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz"; - sha256 = "1ms0xr4ibrzz291ibm265lyjrdjrmhfrx0a70hwykhsdxn6jk8y6"; + sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; - buildInputs = []; - preBuild = "cd unix"; - arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else - if stdenv.system == "i686-linux" then "linux-thr" else + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + Carbon + ] ++ stdenv.lib.optionals withJpegSupport [ + libjpeg + ] ++ stdenv.lib.optionals withPngSupport [ + libpng + ]; + preBuild = '' + cd unix + '' + stdenv.lib.optionalString withJpegSupport '' + export USEJPEG=" -DUSEJPEG" + export JPEGLIB=" -ljpeg" + '' + stdenv.lib.optionalString withPngSupport '' + export USEPNG=" -DUSEPNG" + export PNGLIB=" -lpng -lz" + ''; + arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else + if stdenv.system == "i686-linux" then "linux-thr" else + if stdenv.system == "aarch64-linux" then "linux-arm-thr" else + if stdenv.system == "x86_64-darwin" then "macosx-thr" else + if stdenv.system == "i686-darwin" then "macosx-64-thr" else + if stdenv.system == "i686-cygwin" then "win32" else + if stdenv.system == "x86_64-freebsd" then "bsd" else + if stdenv.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; makeFlags = "${arch}"; + patches = [ + # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) + ./no-absolute-paths.patch + # Include new targets (like arm) + ./make-archs.patch + ]; + installPhase = '' cd ../compile/${arch} mkdir -p "$out"/{bin,lib,include,share/doc/tachyon,share/tachyon} @@ -26,7 +66,8 @@ stdenv.mkDerivation rec { description = ''A Parallel / Multiprocessor Ray Tracing System''; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + # darwin fails due to missing Carbon.h, even though Carbon is a build input + platforms = with stdenv.lib.platforms; linux ++ cygwin; homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; }; } diff --git a/pkgs/development/libraries/tachyon/make-archs.patch b/pkgs/development/libraries/tachyon/make-archs.patch new file mode 100644 index 000000000000..cf83f8c8c31c --- /dev/null +++ b/pkgs/development/libraries/tachyon/make-archs.patch @@ -0,0 +1,37 @@ +diff --git a/unix/Make-arch b/unix/Make-arch +index 08afb85..dbeb691 100644 +--- a/unix/Make-arch ++++ b/unix/Make-arch +@@ -920,6 +920,15 @@ macosx: + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB)" + ++macosx-64: ++ $(MAKE) all \ ++ "ARCH = macosx" \ ++ "CFLAGS = -Os -m64 -ffast-math -DBsd $(MISCFLAGS)" \ ++ "ARFLAGS = r" \ ++ "STRIP = strip" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(MISCLIB)" ++ + macosx-thr: + $(MAKE) all \ + "ARCH = macosx-thr" \ +@@ -1209,6 +1218,16 @@ linux-thr: + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + ++# Linux Arm using gcc, with threads ++linux-arm-thr: ++ $(MAKE) all \ ++ "ARCH = linux-arm-thr" \ ++ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ ++ "ARFLAGS = r" \ ++ "STRIP = strip" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" ++ + # Linux x86 using gcc, threads, and OpenGL + linux-thr-ogl: + $(MAKE) all \ diff --git a/pkgs/development/libraries/tachyon/no-absolute-paths.patch b/pkgs/development/libraries/tachyon/no-absolute-paths.patch new file mode 100644 index 000000000000..faa3810fb5c6 --- /dev/null +++ b/pkgs/development/libraries/tachyon/no-absolute-paths.patch @@ -0,0 +1,57 @@ +diff --git a/unix/Make-config b/unix/Make-config +index ee4f388..c1d51d4 100644 +--- a/unix/Make-config ++++ b/unix/Make-config +@@ -18,7 +18,7 @@ + # Bourne Shell Configuration: + # set SHELL=/bin/sh or wherever your bourne shell is + ########################################################################## +-SHELL=/bin/sh ++# SHELL=/bin/sh + + + +@@ -30,7 +30,7 @@ SHELL=/bin/sh + + # The following line should be set to -Ixxx where xxx is your X11 include path + # Sun puts X11 in /usr/openwin/xxx +-X11INC= -I/usr/openwin/include ++# X11INC= -I/usr/openwin/include + + # Others typically use /usr/X11 or /usr/X11R6 + #X11INC= -I/usr/X11 +@@ -57,7 +57,7 @@ X11LIB= -lX11 + ########################################################################## + + # Standard MPICH installation location +-MPIDIR=/usr/local/mpi ++# MPIDIR=/usr/local/mpi + + # UMR CS Dept + #MPIDIR=/software/all/mpi +@@ -108,9 +108,9 @@ MBOX= + # http://www.ijg.org/files/ + ########################################################################## + # Uncomment the following lines to disable JPEG support +-USEJPEG= +-JPEGINC= +-JPEGLIB= ++# USEJPEG= ++# JPEGINC= ++# JPEGLIB= + + # Uncomment the following lines to enable JPEG support + #USEJPEG= -DUSEJPEG +@@ -128,9 +128,9 @@ JPEGLIB= + # http://www.libpng.org/ + ########################################################################## + # Uncomment the following lines to disable PNG support +-USEPNG= +-PNGINC= +-PNGLIB= ++# USEPNG= ++# PNGINC= ++# PNGLIB= + + # Uncomment the following lines to enable PNG support + #USEPNG= -DUSEPNG diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 8b06e3f2e096..1d6818276eb8 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.11"; + name = "talloc-2.1.12"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "1lzfxv2zjxap5snf9ydl1bqgjpz0kgkq7n644f8rkbx0arav77k3"; + sha256 = "0jv0ri9vj93fczzgl7rn7xvnfgl2kfx4x85cr8h8v52yh7v0qz4q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index aa134d351044..99f0bb65441c 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -8,14 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/2be873301420ec6ca2c70d899b7c49a7e2b0954d/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch"; - sha256 = "1jmbn0j2bnjp0j9z5vzz5xiwyv3kd28w5pixbqsy2lz6q8nii7cf"; - }); - postPatch = '' sed '1i#include <stdint.h>' -i src/xdr_sizeof.c + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace tirpc/rpc/types.h \ + --replace '#if defined __APPLE_CC__ || defined __FreeBSD__' \ + '#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined __GLIBC__' ''; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 5e3d16000004..23ef997e5ce1 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.12"; src = fetchurl { - url = http://math.nist.gov/tnt/tnt_3_0_12.zip; + url = https://math.nist.gov/tnt/tnt_3_0_12.zip; sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://math.nist.gov/tnt/; + homepage = https://math.nist.gov/tnt/; description = "Template Numerical Toolkit: C++ headers for array and matrices"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 9bb11ca92afa..fb43af362433 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 ="0cmswac8m7zfvk6cb8k5iisqr7arnn1yhcmasri072yz0pmr6dr0"; + sha256 ="1dvhs9nkznlnagzjny61fh574g42c47b9s5hxsqdgqb51njawdg1"; }; buildInputs = [ glib systemd libgudev ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index badcb7e661bb..e7a2dee541d0 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -5,11 +5,11 @@ { psql = stdenv.mkDerivation rec { name = "psqlodbc-${version}"; - version = "09.05.0210"; + version = "10.01.0000"; src = fetchurl { url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; - sha256 = "0317zrxaiy209xzcc6b5sz6hsyiv4zm74iikp91rgz7z3ll4n4dc"; + sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7"; }; buildInputs = [ unixODBC postgresql ]; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 507c494ea27d..515c3b2ca3b9 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; - # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings - NIX_CFLAGS_COMPILE = stdenv.lib.optional (!stdenv.is64bit) "-Wno-error=format" - ++ [ "-Wno-error=format-truncation" ]; # newly detected with gcc-7 + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 0d9abc0247e2..2cd3b5a20c0c 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11 }: +{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa_noglu }: stdenv.mkDerivation rec { @@ -11,10 +11,15 @@ stdenv.mkDerivation rec { sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a"; }; - buildInputs = [ libGLU epoxy libX11 ]; + buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ]; nativeBuildInputs = [ pkgconfig ]; + # Fix use of fd_set without proper include + prePatch = '' + sed -e '1i#include <sys/select.h>' -i vtest/util.c + ''; + meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; homepage = https://virgil3d.github.io/; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4bc642030517..cc6e7211b1d2 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, libGL, makeWrapper }: + libXext, wayland, libGL_driver, makeWrapper }: let - version = "1.0.61.1"; + version = "1.1.70.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; - sha256 = "043kw6wnrpdplnb40x6n9rgf3gygsn9jiv91y458sydbhalfr945"; + sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp"; }; in @@ -18,23 +18,28 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ cmake git python3 python3Packages.lxml - glslang spirv-tools x11 libxcb libXrandr libXext wayland + glslang x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_WSI_MIR_SUPPORT=OFF" - "-DFALLBACK_DATA_DIRS=${libGL.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" ]; outputs = [ "out" "dev" "demos" ]; + patches = [ ./rev-file.patch ]; + + postUnpack = '' + # Hack so a version header can be generated. Relies on ./rev-file.patch to work. + mkdir -p "$sourceRoot/external/glslang/External" + echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools" + ''; preConfigure = '' checkRev() { [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) } - checkRev spirv-tools "${spirv-tools.src.rev}" - checkRev spirv-headers "${spirv-tools.headers.rev}" checkRev glslang "${glslang.src.rev}" ''; diff --git a/pkgs/development/libraries/vulkan-loader/rev-file.patch b/pkgs/development/libraries/vulkan-loader/rev-file.patch new file mode 100644 index 000000000000..e8f9f92c8ead --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/rev-file.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9f73ce96..d14ffeed9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output) + endmacro() + + # Define macro used for generating header files containing commit IDs for external dependencies +-macro(run_external_revision_generate source_dir symbol_name output) ++macro(run_external_revision_generate rev_file symbol_name output) + add_custom_command(OUTPUT ${output} + # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of + # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the + # subsequent line (to ensure that the script is re-run when the revision file is modified). +- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} +- DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output} ++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file} + ) + endmacro() + diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 8b44f11ee930..27524504872e 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -2,7 +2,7 @@ , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt , gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit -, libidn, libedit, readline, libGLU_combined, libintlOrEmpty +, libidn, libedit, readline, libGLU_combined, libintl , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null , gst-plugins-base, gst-plugins-bad, woff2 @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { patchShebangs . ''; + postConfigure = '' + # A stopgap for a non-deterministic build failure when using only one core + # Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788#c4 + ninja JavaScriptCoreForwardingHeaders WTFForwardingHeaders + ''; + cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" @@ -60,20 +66,18 @@ stdenv.mkDerivation rec { "-DENABLE_GTKDOC=OFF" ]; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - nativeBuildInputs = [ cmake ninja perl python2 ruby bison gperf pkgconfig gettext gobjectIntrospection ]; - buildInputs = libintlOrEmpty ++ [ - libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 + buildInputs = [ + libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 - ++ (with xorg; [ libXdmcp libXt libXtst ]) + ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] ++ optional stdenv.isLinux wayland; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 846e710b0a48..a672bbf52a90 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus_libs, wayland-protocols -, libpthreadstubs, libXdmcp, libXext +, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL - libX11 dbus_libs wayland-protocols - libpthreadstubs libXdmcp libXext ] + libX11 libXfixes dbus_libs wayland-protocols + libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 3fdaeb824382..a4c2b3297145 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors +, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu }: let pname = "wlroots"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors + xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu ]; # Install rootston (the reference compositor) to $bin @@ -42,5 +42,8 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; + # Marked as broken until the first official/stable release (upstream + # request). See #38344 for the public discussion. + broken = true; }; } diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 37819c2a98e3..99f73add795a 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, doxygen, qt48Full, libharu +{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu , pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pcre }: @@ -10,7 +10,7 @@ let name = "wt-${version}"; src = fetchFromGitHub { - owner = "kdeforche"; + owner = "emweb"; repo = "wt"; rev = version; inherit sha256; @@ -20,7 +20,7 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost165 doxygen qt48Full libharu + cmake boost doxygen qt48Full libharu pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew openssl pcre ]; @@ -43,14 +43,12 @@ let }; in { wt3 = generic { - # with the next version update the version pinning of boost should be omitted - version = "3.3.9"; - sha256 = "1mkflhvzzzxkc5yzvr6nk34j0ldpwxjxb6n7xml59h3j3px3ixjm"; + version = "3.3.10"; + sha256 = "1y25mhghgbgjgycpny0x4z95xn98q0wraab1c5gkwnay097bgwdy"; }; wt4 = generic { - # with the next version update the version pinning of boost should be omitted - version = "4.0.2"; - sha256 = "0r729gjd1sy0pcmir2r7ga33mp5cr5b4gvf44852q65hw2577w1x"; + version = "4.0.3"; + sha256 = "01xch5dkpcanwhr515236wa9mdmnq2a2j13dn7smyhwzqgbpknsg"; }; } diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 28575f4c5d5e..aeb741dbae7b 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -13,12 +13,11 @@ in stdenv.mkDerivation rec { sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg"; }; - # TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below configurePhase = '' export XALANCROOT=`pwd`/c cd `pwd`/c - mkdir -p $out/usr - ./runConfigure -p ${platform} -c cc -x c++ -P$out/usr + mkdir -p $out + ./runConfigure -p ${platform} -c cc -x c++ -P$out ''; buildInputs = [ xercesc getopt ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 9bb9f7986e6d..274a70057bdd 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.6"; + name = "xine-lib-1.2.9"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "01d0nv4zhr4k8id5n4rmw13llrjsv9dhwg1a773c1iqpi1ris15x"; + sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj"; }; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 0b5f08bdf9b3..8a0017109bbf 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.33.17"; + name = "xmlrpc-c-1.39.12"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "0makq1zpfqnrj6xx1xc7wi4mh115ri9p4yz2rbvjhj0il4y8l4ah"; + sha256 = "026fh7w7y3q9pvxd09i5d4hq3l6gd81n9k19yq4zwbc398kg6c6q"; }; buildInputs = [ curl libxml2 ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # <xmlrpc-c>/doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index d3dc41371de3..21d8a7babb3c 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://hardysimpson.github.com/zlog; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index d43c481c8597..b59cb47eae57 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zziplib-${version}"; - version = "0.13.68"; + version = "0.13.69"; src = fetchurl { url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"; - sha256 = "0chhl6m02562z6c4hjy568mh11pbq2qngw6g2x924ajr8sdr2q4l"; + sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; }; postPatch = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 0c12f169cf7b..111d99527498 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -158,4 +158,9 @@ $out/lib/common-lisp/query-fs" deps = pkgs.lib.filter (x: x.name != quicklisp-to-nix-packages.buildnode-xhtml.name) x.deps; parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; }; + postmodern = x: { + overrides = y : (x.overrides y) // { + meta.broken = true; # 2018-04-10 + }; + }; } diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index d0e64a16fddf..84020a5ac2d5 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; + homepage = https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; license = licenses.amd; maintainers = [ maintainers.offline ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index 8d1eb43c9343..824979291833 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }: let - version = "5.4.0"; + version = "7.3.0"; in stdenv.mkDerivation { name = "avr-gcc-${version}"; src = fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; }; patches = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation { description = "GNU Compiler Collection, version ${version} for AVR microcontrollers"; homepage = http://gcc.gnu.org; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ mguentner ]; }; } diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index eef10f3323fe..efa76ea00a0e 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { homepage = https://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix new file mode 100644 index 000000000000..c89d2f11e954 --- /dev/null +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, libusb1 }: + +let + version = "2018-03-27"; + name = "rpiboot-unstable-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "usbboot"; + rev = "fb86716935f2e820333b037a2ff93a338ad9b695"; + sha256 = "163g7iw7kf6ra71adx6lf1xzf3kv20bppva15ljwn54jlah5mv98"; + }; + + nativeBuildInputs = [ libusb1 ]; + + patchPhase = '' + sed -i "s@/usr/@$out/@g" main.c + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/rpiboot + cp rpiboot $out/bin + cp -r msd $out/share/rpiboot + ''; + + meta = { + homepage = https://github.com/raspberrypi/usbboot; + description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; + maintainers = [ stdenv.lib.maintainers.cartr ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 8d4d0d7f4a2b..8d4d0d7f4a2b 100644 --- a/pkgs/development/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index c09fd6142703..457a9b6720af 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "26.0.1"; + version = "26.0.2"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8"; + sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk"; + sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx"; } else throw "System ${stdenv.system} not supported!"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd $out/build-tools unzip $src mv android-* ${version} - + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' cd ${version} @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { fi done ''} - + patchShebangs . ''; - + buildInputs = [ unzip file ]; } diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index db3cb07765b9..37834eff9473 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -5,9 +5,9 @@ let packages = [ - stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext + stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL ]; - libPath = "${stdenv.lib.makeLibraryPath packages}:${libGL.driverLink}/lib"; + libPath = "${stdenv.lib.makeLibraryPath packages}"; in stdenv.mkDerivation rec { name = "genymotion-${version}"; diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 17a203ed12be..9760285a915e 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,51 +1 @@ -Node.js packages -================ -The `pkgs/development/node-packages` folder contains a generated collection of -[NPM packages](https://npmjs.com/) that can be installed with the Nix package -manager. - -As a rule of thumb, the package set should only provide *end user* software -packages, such as command-line utilities. Libraries should only be added to the -package set if there is a non-NPM package that requires it. - -When it is desired to use NPM libraries in a development project, use the -`node2nix` generator directly on the `package.json` configuration file of the -project. - -The package set also provides support for multiple Node.js versions. The policy -is that a new package should be added to the collection for the latest stable LTS -release (which is currently 6.x), unless there is an explicit reason to support -a different release. - -If your package uses native addons, you need to examine what kind of native -build system it uses. Here are some examples: - -* `node-gyp` -* `node-gyp-builder` -* `node-pre-gyp` - -After you have identified the correct system, you need to override your package -expression while adding in build system as a build input. For example, `dat` -requires `node-gyp-build`, so we override its expression in `default-v6.nix`: - -```nix -dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; -}); -``` - -To add a package from NPM to nixpkgs: - - 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update - or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` - for packages depending on Node.js 4.x) - 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. - 3. Build your new package to test your changes: - `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`. - To build against a specific Node.js version (e.g. 4.x): - `nix-build -A nodePackages_4_x.<new-or-updated-package>` - 4. Add and commit all modified and generated files. - -For more information about the generation process, consult the -[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` -tool. +Moved to [/doc/languages-frameworks/node.section.md](/doc/languages-frameworks/node.section.md) diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 5fc007bbfd09..2be09eb16324 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -24,13 +24,13 @@ nodePackages // { phantomjs = nodePackages.phantomjs.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - + webdrvr = nodePackages.webdrvr.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - + preRebuild = '' mkdir $TMPDIR/webdrvr - + ln -s ${pkgs.fetchurl { url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; @@ -72,4 +72,11 @@ nodePackages // { ''; buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); + + node2nix = nodePackages.node2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }); } diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index ad9d79fd88ec..9b19a4f5a628 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -11,6 +11,8 @@ , "coinmon" , "configurable-http-proxy" , "cordova" +, "create-react-app" +, "create-react-native-app" , "csslint" , "dat" , "dhcp" @@ -73,7 +75,7 @@ , "npm-check-updates" , "nsp" , "ocaml-language-server" -, "parsoid" +, { "parsoid": "git://github.com/abbradar/parsoid#stable" } , "peerflix" , "peerflix-server" , "phantomjs" @@ -102,8 +104,10 @@ , "typings" , "uglify-js" , "ungit" +, "vue-cli" , "webdrvr" , "webpack" +, "webtorrent-cli" , "web-ext" , "wring" , "yarn" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 88a40fb04022..e5d9ff18eb0d 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -4,22 +4,40 @@ let sources = { - "@ionic/cli-framework-0.1.2" = { + "@cliqz-oss/firefox-client-0.3.1" = { + name = "_at_cliqz-oss_slash_firefox-client"; + packageName = "@cliqz-oss/firefox-client"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cliqz-oss/firefox-client/-/firefox-client-0.3.1.tgz"; + sha512 = "0mzrszrx3b26v168dxy14mafp9dnczzl10yrdg203q46xcasi6a668yg2zf3nlzmf4klylfkbca3b3amd0646barp0nkh1zkfi97vs4"; + }; + }; + "@cliqz-oss/node-firefox-connect-1.2.1" = { + name = "_at_cliqz-oss_slash_node-firefox-connect"; + packageName = "@cliqz-oss/node-firefox-connect"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cliqz-oss/node-firefox-connect/-/node-firefox-connect-1.2.1.tgz"; + sha512 = "2f8l9alm034f4mrp2shf3pgcvm1m9lvbw2n5jpjnnmk6mn36qmwz4hjnrky279z4wnphgr2wv1vksn57w6ncl3cfr13nzv93s435wiv"; + }; + }; + "@ionic/cli-framework-0.1.3" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.2.tgz"; - sha512 = "265kszf17mdz60zpfrj5i47lqwwgp6h1b7i8vymig1pnlqd3lnljibxvd2d1rfa3827ks435k9wws458z3dk7fyq8wfmzmv8fk9qjhh"; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.3.tgz"; + sha512 = "0l4lpl9477wf6i2xzqqqv5lmrmnyf82n0rbww6ynaszyb6cl38m2dpbz4xv0ksy5mayjyfkq6nj7mjzh4cvak12zfwp4cgrrai6ybkg"; }; }; - "@ionic/cli-utils-1.19.1" = { + "@ionic/cli-utils-1.19.2" = { name = "_at_ionic_slash_cli-utils"; packageName = "@ionic/cli-utils"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.1.tgz"; - sha512 = "3anhsxw0zyzi9j4kfnqxg2h4fxqjyw6pabb75z5b17hmksmjcyy6psic9fziyrgllp5rqksadqdzbkbb6lrviclhiz26sj8f7gjfi8r"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.2.tgz"; + sha512 = "10fl86bf0p911b7w0dnz2q3b8092c50h6x8kf79lwg8bg3jnmnmvz0i868xhf7qnawyaikhqdf5nifpb42f9jr3x0mxgmp4ppdwadlx"; }; }; "@ionic/discover-0.4.0" = { @@ -76,22 +94,22 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.9.5" = { + "@types/node-8.10.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.9.5"; + version = "8.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz"; - sha512 = "06wcjpwrp2zkccv51w2j75yq11jcdb69r7y04l1qihncwhd56dagwcvvn7lm48bjp7rkfcxbsfn18658wjy9wqrdvfxacpjrdddy4cd"; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.4.tgz"; + sha512 = "345l7fbkr415rdf3p0akk11k8shxibfl77crpj3wd3a8d4lbsdpylfzm8ihkg6wnj88gjpcwy4nw6vb2x58kwx15fbl09bz96dlrahn"; }; }; - "@types/node-9.4.7" = { + "@types/node-9.6.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.4.7"; + version = "9.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.4.7.tgz"; - sha512 = "1rk1inz71x7pkcc7j3w776wf7wi8byz3h2203wzl3vpmxrhmy4vfkmhy25sdhi05pc6f0dy1254qilfn1hwivm7dmfwgiwdcp9bs5p0"; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; + sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; }; }; "@types/request-2.47.0" = { @@ -121,15 +139,6 @@ let sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; - "@zeit/check-updates-1.1.0" = { - name = "_at_zeit_slash_check-updates"; - packageName = "@zeit/check-updates"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zeit/check-updates/-/check-updates-1.1.0.tgz"; - sha512 = "0pg9y2fssdvfwq19ih2w4fwma8qw3anxlsbqrzncywxl30j65k2bwwlp2djz5brkz27xixcrx9g9gx9blszhbaz0pv5xmghrw33700y"; - }; - }; "CSSselect-0.4.1" = { name = "CSSselect"; packageName = "CSSselect"; @@ -211,6 +220,15 @@ let sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; + "absolute-0.0.1" = { + name = "absolute"; + packageName = "absolute"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; + sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; + }; + }; "abstract-leveldown-0.12.4" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -301,15 +319,6 @@ let sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld"; }; }; - "acorn-dynamic-import-2.0.2" = { - name = "acorn-dynamic-import"; - packageName = "acorn-dynamic-import"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"; - sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; - }; - }; "acorn-dynamic-import-3.0.0" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; @@ -418,13 +427,13 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-0.35.0" = { + "addons-linter-0.41.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "0.35.0"; + version = "0.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.35.0.tgz"; - sha1 = "85872cce58983ff339ced297dbff486c02ecd336"; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.41.0.tgz"; + sha512 = "1cdq1s3zaz5547yn12h23434f3g6jjchrjdwv7x0qbg38zilaix5x04ajy87pw94rs1mk6kkawa517whzjn0jd7kpx6nac75qw7rcwf"; }; }; "addr-to-ip-port-1.4.3" = { @@ -526,6 +535,15 @@ let sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1"; }; }; + "airplay-js-0.3.0" = { + name = "airplay-js"; + packageName = "airplay-js"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.3.0.tgz"; + sha1 = "16bac2ef91b31249382924bfdeeabaddc9db7398"; + }; + }; "airplay-protocol-2.0.2" = { name = "airplay-protocol"; packageName = "airplay-protocol"; @@ -562,13 +580,22 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.2.1" = { + "ajv-6.3.0" = { name = "ajv"; packageName = "ajv"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.2.1.tgz"; - sha1 = "28a6abc493a2abe0fb4c8507acaedb43fa550671"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz"; + sha1 = "1650a41114ef00574cac10b8032d8f4c14812da7"; + }; + }; + "ajv-6.4.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz"; + sha1 = "d3aff78e9277549771daf0164cff48482b754fc6"; }; }; "ajv-keywords-1.5.1" = { @@ -679,13 +706,13 @@ let sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; }; }; - "ansi-diff-stream-1.2.0" = { + "ansi-diff-stream-1.2.1" = { name = "ansi-diff-stream"; packageName = "ansi-diff-stream"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; - sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; }; }; "ansi-escapes-1.4.0" = { @@ -697,13 +724,13 @@ let sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; }; }; - "ansi-escapes-3.0.0" = { + "ansi-escapes-3.1.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; - sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; }; }; "ansi-gray-0.1.1" = { @@ -715,6 +742,15 @@ let sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; }; }; + "ansi-red-0.1.1" = { + name = "ansi-red"; + packageName = "ansi-red"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz"; + sha1 = "8c638f9d1080800a353c9c28c8a81ca4705d946c"; + }; + }; "ansi-regex-0.2.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -1543,13 +1579,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.0.3" = { + "atob-2.1.0" = { name = "atob"; packageName = "atob"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; - sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; + sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; }; }; "atomic-batcher-1.0.2" = { @@ -1579,13 +1615,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.208.0" = { + "aws-sdk-2.223.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.208.0"; + version = "2.223.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.208.0.tgz"; - sha1 = "f95e44524cb62c9a6e0ef95270236fc6a62178d6"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.223.1.tgz"; + sha1 = "b264bf6407d7c74152f08b4a8fda8aad3a84baa4"; }; }; "aws-sign-0.2.0" = { @@ -1615,13 +1651,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.6.0" = { + "aws4-1.7.0" = { name = "aws4"; packageName = "aws4"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz"; }; }; "axios-0.15.3" = { @@ -1759,13 +1795,13 @@ let sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; }; }; - "azure-arm-network-4.0.1" = { + "azure-arm-network-5.1.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "4.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-4.0.1.tgz"; - sha1 = "577d8a2be2eb9e5298b561837405b2eaef283a19"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.1.0.tgz"; + sha1 = "b2be4bfc27173b1cb7fc54425cbee27824f65b52"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -2281,15 +2317,6 @@ let sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; }; }; - "base64-js-1.2.0" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; - }; - }; "base64-js-1.2.3" = { name = "base64-js"; packageName = "base64-js"; @@ -2497,13 +2524,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.26" = { + "big-integer-1.6.27" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.26"; + version = "1.6.27"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz"; - sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.27.tgz"; + sha512 = "2v5f59yjsa3hzwhk333s84nfl1x24w52h9hqpwbav0p5v5d5prkna0flw25ywccrrjziq3lylbl874qqikzljkyz2g6jjdqhlqhld9p"; }; }; "big.js-3.2.0" = { @@ -2551,6 +2578,15 @@ let sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; }; }; + "binary-search-1.3.3" = { + name = "binary-search"; + packageName = "binary-search"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.3.tgz"; + sha512 = "38zf62278y5pi773rqfsjrn9iknwhx25v4jhjc2gv8yi8hs2k8bjqg52yc07az2ipl53iid2d39r827z4jb6854x0z95m7hgfkwmy2g"; + }; + }; "binaryheap-0.0.3" = { name = "binaryheap"; packageName = "binaryheap"; @@ -2596,6 +2632,15 @@ let sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; }; }; + "bitfield-2.0.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield/-/bitfield-2.0.0.tgz"; + sha512 = "27y12y6a0jj5yrb5m8k7fp5czr6cj2x15rmd3d10q4s22i2fw23v5c731ciy9sndjic7hcgblkjc3ilayh7lpv0m4zp8f53hw6kh4z3"; + }; + }; "bitfield-rle-2.1.0" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -2632,6 +2677,33 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; + "bittorrent-dht-8.2.0" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.2.0.tgz"; + sha512 = "291qfv5f3w3d7zcq9xyjplpnaaahy7mzj664w5g9w1zgiwv3dikl38r8wx0rdb3afsv5ih0ghrzc2r1k19c52axsagnpsc10hihlkii"; + }; + }; + "bittorrent-peerid-1.2.0" = { + name = "bittorrent-peerid"; + packageName = "bittorrent-peerid"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.2.0.tgz"; + sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371"; + }; + }; + "bittorrent-protocol-2.4.0" = { + name = "bittorrent-protocol"; + packageName = "bittorrent-protocol"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.0.tgz"; + sha512 = "3xggi5fxwkzkkgy3z7v5b9w7fk2bjan077b4s9rvqfp7cmnw6l96p36qlkqgp38rd57lzdlkay42dkqhcb8r7gzszp5598nviy0p4mb"; + }; + }; "bittorrent-tracker-7.7.0" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; @@ -2641,6 +2713,15 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; + "bittorrent-tracker-9.7.0" = { + name = "bittorrent-tracker"; + packageName = "bittorrent-tracker"; + version = "9.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.7.0.tgz"; + sha512 = "06jp495xv047v5n3wclbga8laqmgjis5wjwhc7ggq2qx4xszp395mg2v0147p7v0ybpw5bpvdfhr1zp12barvn2lgj9f0c9iji4jr5r"; + }; + }; "bl-0.8.2" = { name = "bl"; packageName = "bl"; @@ -2668,13 +2749,13 @@ let sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; - "bl-1.2.1" = { + "bl-1.2.2" = { name = "bl"; packageName = "bl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; - sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; }; }; "blake2b-2.1.2" = { @@ -2731,6 +2812,15 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; + "block-stream2-1.1.0" = { + name = "block-stream2"; + packageName = "block-stream2"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream2/-/block-stream2-1.1.0.tgz"; + sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2"; + }; + }; "bluebird-2.9.34" = { name = "bluebird"; packageName = "bluebird"; @@ -2911,13 +3001,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.2" = { + "bower-1.8.4" = { name = "bower"; packageName = "bower"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -3019,13 +3109,13 @@ let sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; }; }; - "braces-2.3.1" = { + "braces-2.3.2" = { name = "braces"; packageName = "braces"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz"; - sha512 = "2fpcx8h100fhpaffr6mh5ysp6dv06nl5xkii807fw0c603i15sg3wsxmj63fdn4apxdnn8an2ks883mvrdsv7mfryhfxg1pf1h6bvj8"; + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; }; }; "broadway-0.3.6" = { @@ -3055,13 +3145,13 @@ let sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; - "browser-pack-6.0.4" = { + "browser-pack-6.1.0" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"; - sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz"; + sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks"; }; }; "browser-resolve-1.11.2" = { @@ -3109,13 +3199,13 @@ let sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; }; }; - "browserify-aes-1.1.1" = { + "browserify-aes-1.2.0" = { name = "browserify-aes"; packageName = "browserify-aes"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; - sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; }; }; "browserify-cache-api-3.0.1" = { @@ -3163,6 +3253,15 @@ let sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; }; }; + "browserify-package-json-1.0.1" = { + name = "browserify-package-json"; + packageName = "browserify-package-json"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-package-json/-/browserify-package-json-1.0.1.tgz"; + sha1 = "98dde8aa5c561fd6d3fe49bbaa102b74b396fdea"; + }; + }; "browserify-rsa-4.0.1" = { name = "browserify-rsa"; packageName = "browserify-rsa"; @@ -3217,6 +3316,15 @@ let sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; }; }; + "buffer-3.6.0" = { + name = "buffer"; + packageName = "buffer"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; + }; + }; "buffer-4.9.1" = { name = "buffer"; packageName = "buffer"; @@ -3235,6 +3343,24 @@ let sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; + "buffer-alloc-1.1.0" = { + name = "buffer-alloc"; + packageName = "buffer-alloc"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; + sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; + }; + }; + "buffer-alloc-unsafe-0.1.1" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; + sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; + }; + }; "buffer-alloc-unsafe-1.0.0" = { name = "buffer-alloc-unsafe"; packageName = "buffer-alloc-unsafe"; @@ -3298,6 +3424,33 @@ let sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; + "buffer-fill-0.1.1" = { + name = "buffer-fill"; + packageName = "buffer-fill"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; + sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; + }; + }; + "buffer-from-0.1.2" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz"; + sha512 = "2z3dp7smyppzg5yc63hvyfxgrw5d14splmxbknz4v8g6bnncca1acr4xd6l3z13lpp4vj4120pyvk87040ajbx7v24cj9mcgdx8h9a6"; + }; + }; + "buffer-from-1.0.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; + sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; + }; + }; "buffer-indexof-1.1.1" = { name = "buffer-indexof"; packageName = "buffer-indexof"; @@ -3352,6 +3505,15 @@ let sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; }; }; + "bufferutil-3.0.4" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.4.tgz"; + sha512 = "1q344kiig9b8ssskrp7r77kf3xk516bfcjlilgz0a8q5zflz35rnp8im2kx1y9smcp23hw2q1aqsi39i6cb7svzf40a7dk6h4ds54pf"; + }; + }; "bufferview-1.0.1" = { name = "bufferview"; packageName = "bufferview"; @@ -3415,13 +3577,13 @@ let sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; - "bulk-write-stream-1.1.3" = { + "bulk-write-stream-1.1.4" = { name = "bulk-write-stream"; packageName = "bulk-write-stream"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; - sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; }; }; "bunyan-1.5.1" = { @@ -3802,6 +3964,15 @@ let sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; }; }; + "caw-2.0.1" = { + name = "caw"; + packageName = "caw"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; + }; + }; "ccount-1.0.2" = { name = "ccount"; packageName = "ccount"; @@ -3892,15 +4063,6 @@ let sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; }; }; - "chalk-2.3.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; - sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; - }; - }; "chalk-2.3.2" = { name = "chalk"; packageName = "chalk"; @@ -3973,6 +4135,15 @@ let sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -4036,13 +4207,13 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.0.2" = { + "chokidar-2.0.3" = { name = "chokidar"; packageName = "chokidar"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz"; - sha512 = "1kncf65ax274b43r63m0bfbap3j5ah7dn86niqwpzzw6ilvpc7yy0fan14k584lw8ycf4nl78n5gv3bpyr4jrk5j3v441ragk1qfzcp"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz"; + sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd"; }; }; "chownr-0.0.2" = { @@ -4090,6 +4261,15 @@ let sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; }; }; + "chromecasts-1.9.1" = { + name = "chromecasts"; + packageName = "chromecasts"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.9.1.tgz"; + sha512 = "38g6qhcppxzh5fsrnvvfjnvzjiwdxsz0nsshi55prij4ifj6har7dqs6fzflqimdmkd24vgclkrgb8i96hrpm4hnfy91bp0wzpfzicy"; + }; + }; "chromium-pickle-js-0.2.0" = { name = "chromium-pickle-js"; packageName = "chromium-pickle-js"; @@ -4099,6 +4279,15 @@ let sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; + "chunk-store-stream-2.1.0" = { + name = "chunk-store-stream"; + packageName = "chunk-store-stream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-2.1.0.tgz"; + sha512 = "1c9rhwy0ac18jk67fwhgdavc4ax76i7q8qmidj2b3qqdvq9i6ir8w53ylnw7invy7msxzs0538smkvsp47hf30jh0q4xp6n6a95ymcr"; + }; + }; "ci-info-1.1.3" = { name = "ci-info"; packageName = "ci-info"; @@ -4126,6 +4315,15 @@ let sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; }; }; + "circular-append-file-1.0.1" = { + name = "circular-append-file"; + packageName = "circular-append-file"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; + }; + }; "circular-json-0.3.3" = { name = "circular-json"; packageName = "circular-json"; @@ -4252,13 +4450,13 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-spinners-1.1.0" = { + "cli-spinners-1.3.1" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "1.1.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; - sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz"; + sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm"; }; }; "cli-table-0.3.1" = { @@ -4423,13 +4621,13 @@ let sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; }; }; - "clone-1.0.3" = { + "clone-1.0.4" = { name = "clone"; packageName = "clone"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; }; }; "clone-2.1.1" = { @@ -4441,6 +4639,15 @@ let sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; }; }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; "clone-buffer-1.0.0" = { name = "clone-buffer"; packageName = "clone-buffer"; @@ -4459,13 +4666,13 @@ let sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; }; }; - "clone-regexp-1.0.0" = { + "clone-regexp-1.0.1" = { name = "clone-regexp"; packageName = "clone-regexp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz"; - sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c"; + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz"; + sha512 = "2dkam277bx7ajypbx3z8jrpigy0lqfflbj3ic5crhprjilxlfm8nh6xzpjm1p3n4ndx6pjw2pnm5shjirs2cj6lg7bnwnqiiksa7j0m"; }; }; "clone-response-1.0.2" = { @@ -4495,13 +4702,22 @@ let sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; }; }; - "cloneable-readable-1.1.1" = { + "cloneable-readable-1.1.2" = { name = "cloneable-readable"; packageName = "cloneable-readable"; - version = "1.1.1"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz"; + sha512 = "2kg2ysl15s9cxgj62p43gzagfqf3kk2zqj4i6g3ckxs2b0fvx71blw7qy7v7gmy2pi9z9jsrc81v43kz7khagrvhlpwyv55vzibxbh6"; + }; + }; + "closest-to-2.0.0" = { + name = "closest-to"; + packageName = "closest-to"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.1.tgz"; - sha512 = "3bfsmhwhasp3dqnj54lss7pcmyliy2i15x9sqm11yrlah27i6xyiiagh4f252ss7kr7b7spgqpcslv45am4vg9drm7i3a2xlaml9lqc"; + url = "https://registry.npmjs.org/closest-to/-/closest-to-2.0.0.tgz"; + sha1 = "bb2a860edb7769b62d04821748ae50da24dbefaa"; }; }; "cmd-shim-2.0.2" = { @@ -4549,6 +4765,33 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; + "co-from-stream-0.0.0" = { + name = "co-from-stream"; + packageName = "co-from-stream"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-from-stream/-/co-from-stream-0.0.0.tgz"; + sha1 = "1a5cd8ced77263946094fa39f2499a63297bcaf9"; + }; + }; + "co-fs-extra-1.2.1" = { + name = "co-fs-extra"; + packageName = "co-fs-extra"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-fs-extra/-/co-fs-extra-1.2.1.tgz"; + sha1 = "3b6ad77cf2614530f677b1cf62664f5ba756b722"; + }; + }; + "co-read-0.0.1" = { + name = "co-read"; + packageName = "co-read"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-read/-/co-read-0.0.1.tgz"; + sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; + }; + }; "coa-2.0.1" = { name = "coa"; packageName = "coa"; @@ -4621,13 +4864,13 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "color-2.0.1" = { + "color-3.0.0" = { name = "color"; packageName = "color"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-2.0.1.tgz"; - sha512 = "1gir7mfj6033amg78p7jvpj0nk2hw61hqd81r6x3a2qmgizbw3d89k0qk62680zhm9ypcx6c9p2cgwjvb8smxv0qgvblkwza9ah5ddr"; + url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; + sha512 = "3xh3l9zhh6dav7pp5hy88kbb6c52j0pf331ywpp6w2jaf94w25fjn4am930775mskxy75cxl90fji17cym40ivslxxlpcrlxgkmsalc"; }; }; "color-convert-1.9.1" = { @@ -4738,15 +4981,6 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "combine-source-map-0.7.2" = { - name = "combine-source-map"; - packageName = "combine-source-map"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; - sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; - }; - }; "combine-source-map-0.8.0" = { name = "combine-source-map"; packageName = "combine-source-map"; @@ -4873,13 +5107,13 @@ let sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; }; }; - "commander-2.15.0" = { + "commander-2.15.1" = { name = "commander"; packageName = "commander"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz"; - sha512 = "090my2m6q69l4kgn1slqs845mf9s5zx7l1p345z2qij174pyk4jr2xkalnq8k0dfhghvdmcjxba03qn959n64r8nkg2cq9d3ja647gc"; + url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; }; }; "commander-2.6.0" = { @@ -5022,7 +5256,7 @@ let packageName = "compression"; version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; + url = "http://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; }; }; @@ -5031,7 +5265,7 @@ let packageName = "compression"; version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; + url = "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; sha1 = "aaffbcd6aaf854b44ebb280353d5ad1651f59a69"; }; }; @@ -5071,13 +5305,13 @@ let sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; - "concat-stream-1.6.1" = { + "concat-stream-1.6.2" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz"; - sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; }; }; "conf-1.4.0" = { @@ -5125,13 +5359,13 @@ let sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; }; }; - "configstore-3.1.1" = { + "configstore-3.1.2" = { name = "configstore"; packageName = "configstore"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; - sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; }; }; "connect-1.9.2" = { @@ -5287,6 +5521,15 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; + "consolidate-0.14.5" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz"; + sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; + }; + }; "constantinople-3.0.2" = { name = "constantinople"; packageName = "constantinople"; @@ -5359,12 +5602,12 @@ let sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; }; }; - "content-type-git+https://github.com/wikimedia/content-type.git#master" = { + "content-type-git+https://github.com/wikimedia/content-type#master" = { name = "content-type"; packageName = "content-type"; version = "1.0.1"; src = fetchgit { - url = "https://github.com/wikimedia/content-type.git"; + url = "https://github.com/wikimedia/content-type"; rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; @@ -5387,13 +5630,13 @@ let sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; - "conventional-changelog-1.1.18" = { + "conventional-changelog-1.1.23" = { name = "conventional-changelog"; packageName = "conventional-changelog"; - version = "1.1.18"; + version = "1.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.18.tgz"; - sha512 = "02967qizq9ymmgf5yahk2rca3dkrjsslqwrdsdsw4a8qjfhkliijsngzvi8p95mkr84mh4651kapbybiwdwyfncv4cgpv36m1pgj1xk"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz"; + sha512 = "2775l94nr8rbnvhihkrwyszncc2g7z1kvbsqpbvni86h8072xvxngbba6yxzzw4dfs57ghklkh9l0ibjy17rl7ldrh6q9lpyd9xf8y8"; }; }; "conventional-changelog-angular-1.6.6" = { @@ -5405,67 +5648,67 @@ let sha512 = "0v02kj8l2ji18jmcgjqa0nqsfn4h9jklgy4g9brf1ppm0n8344in3xpmyc5y06i5k3jjxl8sv90cndh2fbg4fhn0wr1ric258ajgr5j"; }; }; - "conventional-changelog-atom-0.2.4" = { + "conventional-changelog-atom-0.2.8" = { name = "conventional-changelog-atom"; packageName = "conventional-changelog-atom"; - version = "0.2.4"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz"; - sha512 = "2b43fd5cpi069hsmfswl320lnpnvahmqmnrc9csk6qv0dq72nfj0jzafmbv5gsb3ds2ssr29lswwky61shy3n9hbxshq0qw3in6ds73"; + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz"; + sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj"; }; }; - "conventional-changelog-cli-1.3.16" = { + "conventional-changelog-cli-1.3.21" = { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; - version = "1.3.16"; + version = "1.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.16.tgz"; - sha512 = "1h3h3vq237a95wqm6ml85794lhr268mq6v3j7574hmb04ssw7mrls5b6mn5q9azs5i594xxi9klaxzbrnqwxcyyz5cnz1svngzcdl6c"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz"; + sha512 = "1n93839r75vwj9fl4i3x3l06zc84kin92cp8nrlxksga9lqdpxc8b8i72wvi9jvwk0z6i29wisxdpiw6y7rrmdl13ch9f3k7jb43m9b"; }; }; - "conventional-changelog-codemirror-0.3.4" = { + "conventional-changelog-codemirror-0.3.8" = { name = "conventional-changelog-codemirror"; packageName = "conventional-changelog-codemirror"; - version = "0.3.4"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz"; - sha512 = "33091h0zm06gdwhcqi5c3xvcjl6fw8cj3wvis9hyl5gix1vl2wd2pifymgp7rag6dbyzilb0g5q3ak29dcsrdzizqzibk8m0hdfkkph"; + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz"; + sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw"; }; }; - "conventional-changelog-core-2.0.5" = { + "conventional-changelog-core-2.0.10" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "2.0.5"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz"; - sha512 = "1agyx5rj0lbrky9ndhha25la98lh2h1lyli2r4r27r1p0pr48niwg04al4whnvcldh0592fmyrdgf8vqqp5n6xz3df43j6dkpnnrzcl"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz"; + sha512 = "19pvarpv78qfmlnsz11c8anrwfg1v04qmwrsrcnai8p3xmbzdyvp1znz9j23l0i6l26yabkd4b631wybnkgxr4qgwzgb9hvf8fhvz8l"; }; }; - "conventional-changelog-ember-0.3.6" = { + "conventional-changelog-ember-0.3.11" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.3.6"; + version = "0.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz"; - sha512 = "24dx0snmkfhr4qi7vdq0aywjw9k23x68kaqh0gn92lca7j1268zbzr6vf00izx5g86kkjihlzgsgx8piyy1mnimn9nk7bj8pv2ka4w4"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz"; + sha512 = "1pm9wncjsfizvxzf84fp9ywdfm0znj0af0h2012ylazva8iis7zp4vph9ymrnd87kfmdv5gk2s0nsq8gqm6vxh87vbdykg640zczf0j"; }; }; - "conventional-changelog-eslint-1.0.5" = { + "conventional-changelog-eslint-1.0.9" = { name = "conventional-changelog-eslint"; packageName = "conventional-changelog-eslint"; - version = "1.0.5"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz"; - sha512 = "272hf880yc54va1r1h5zg9fk2vhfcacw7jixn3ksgaxk4nld0kdlfrpnv7b2nf682dssagbk6mdkqljgc0ldig3yqwccjqf0gx2zmgc"; + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz"; + sha512 = "3nl1q7m2f7yf8fr40dpns2x6n9z3n8m4kd74fxn2z4d0v0dp2si3h2xbg339984wyfa1ina5w61n6q8n1pcybwjghyxjzbnb1yygkl7"; }; }; - "conventional-changelog-express-0.3.4" = { + "conventional-changelog-express-0.3.6" = { name = "conventional-changelog-express"; packageName = "conventional-changelog-express"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz"; - sha512 = "3w3pm3dqwn8bj29809j0ivybw8vn2grnz486h9bm4kk9bn4849k9pxiqmx2ifpqf09hdl17fjk1xw320zz33wnvjzx78kbrpmpi9r9k"; + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz"; + sha512 = "3qvnznizyjsb4nxznraiw24wydli7ky95905792az7mgm4dpc0hhxg6l9n5jlx5saglig9sm2gi3i0grqy39plvkp8ikxar2as9a9fy"; }; }; "conventional-changelog-jquery-0.1.0" = { @@ -5486,49 +5729,49 @@ let sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; }; }; - "conventional-changelog-jshint-0.3.4" = { + "conventional-changelog-jshint-0.3.8" = { name = "conventional-changelog-jshint"; packageName = "conventional-changelog-jshint"; - version = "0.3.4"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz"; - sha512 = "0lzbgx3x2bfchxp8p4ppjavnp4yywjks3486yrxanq3skq0x5g4wnbhcf2viwm167mhn3aiawxygsxql5ww8md1xzssdrqb730fmnh9"; + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz"; + sha512 = "25274wd4xzrjinpfglybkna5wm74wnfqhyll32ixz8fnq43gg50b99ip2sj17nqd5x9a5l111d0922gqv9j93q2sdwrbzs8hr9m0zw6"; }; }; - "conventional-changelog-preset-loader-1.1.6" = { + "conventional-changelog-preset-loader-1.1.8" = { name = "conventional-changelog-preset-loader"; packageName = "conventional-changelog-preset-loader"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz"; - sha512 = "12qk33piqbilkyrvin1vsjzp5pcvs7sschn5jry272r1hnv3x0jrwb1dlnik8vpp3zqai6n70h4ls55q2ch5n13a6g25c1hvhzwhqy9"; + url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz"; + sha512 = "1rl5rdcffc9nr30wxf718hl5qkcnb5hi5d85rchw48v2gyjbw371910qcd9v7pwfc9isrg1xxg8npnq2lxnv31xjp6dlqdqh4rjqj9j"; }; }; - "conventional-changelog-writer-3.0.4" = { + "conventional-changelog-writer-3.0.9" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "3.0.4"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz"; - sha512 = "1ryw2mmza9y6bk5hs2ivhvp9p5hq7hhydhis2880w41dajr193zvccwhglp7js7j435d3i2d38i5aikydqg2r4jdc7753w4d22zyiqi"; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz"; + sha512 = "3ypk00r7ddkzx8ayyzdss65167c8h4qgn7f0m2p7zif0sw55ljpbx07zr0hmw8rkyzq0dv7ydr5l14wa60c1fkja8n19ia936rrpllz"; }; }; - "conventional-commits-filter-1.1.5" = { + "conventional-commits-filter-1.1.6" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz"; - sha512 = "0dw3vksvzwig2hiiw1kky2p424136r2faa941bkcdy3ljhp7mgd9i8pz3vdccw23v51z7vhh1dkw7wg363qxg9kvcxr2lgwp1cgwgcs"; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz"; + sha512 = "38pzjvxmmjg6y92qyskzpxngphp9s5lxy89ldq9mwx4dcy4n8am2d57j1w4gb7h2fkggbfy5744xrj7ycz2v5afr8hj892a4jsf1h19"; }; }; - "conventional-commits-parser-2.1.5" = { + "conventional-commits-parser-2.1.7" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "2.1.5"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz"; - sha512 = "2nb2s8hrbv3sl19xzz9x5pqgmm4kimrsaqlzs8xa2wzr0zg68090xnlq5ifcbmcm47fg5l9m63kkri248idzrvz2y689y3jbbmhz84d"; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz"; + sha512 = "0ahfqxbkswm1pnbj477wz7kl2588dbg8skjz7xzyykv4w2bw9aal3idvs8kjchlv140s64jcfa2clli93phw4jk85wa09q4s9sim0q6"; }; }; "conventional-recommended-bump-1.2.1" = { @@ -5801,13 +6044,13 @@ let sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; }; }; - "core-js-2.5.3" = { + "core-js-2.5.5" = { name = "core-js"; packageName = "core-js"; - version = "2.5.3"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; - sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz"; + sha1 = "b14dde936c640c0579a6b50cabcc132dd6127e3b"; }; }; "core-util-is-1.0.2" = { @@ -5936,6 +6179,15 @@ let sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; }; }; + "create-torrent-3.30.0" = { + name = "create-torrent"; + packageName = "create-torrent"; + version = "3.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.30.0.tgz"; + sha512 = "15hphpabh12fwvjbaihwjr1sqzj6c4lzcms4jbyy0s2jk1rirrg3cb9743g2a8jw2ihz15yfw0dxqwnc6n5nixiazdg7hwaj8d5nfmi"; + }; + }; "cron-1.3.0" = { name = "cron"; packageName = "cron"; @@ -5954,6 +6206,15 @@ let sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; }; }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -5990,6 +6251,15 @@ let sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; }; }; + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + }; "crypt3-0.2.0" = { name = "crypt3"; packageName = "crypt3"; @@ -6395,22 +6665,22 @@ let sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; }; }; - "dat-ignore-2.0.0" = { + "dat-ignore-2.1.1" = { name = "dat-ignore"; packageName = "dat-ignore"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; - sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; }; }; - "dat-json-1.0.1" = { + "dat-json-1.0.2" = { name = "dat-json"; packageName = "dat-json"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; - sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; }; }; "dat-link-resolve-2.1.0" = { @@ -6548,15 +6818,6 @@ let sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; }; }; - "deasync-0.1.12" = { - name = "deasync"; - packageName = "deasync"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.12.tgz"; - sha512 = "1vnaqczk6nr30xzzf6qxsaa2fj00z80rr6xrb7mxwn0d41zdwrgffk5vizwf6b17bps2zdr4f87s2mdmnixhsfh41vrh185ixi9r5l2"; - }; - }; "debounce-1.1.0" = { name = "debounce"; packageName = "debounce"; @@ -6692,6 +6953,15 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; + "decompress-4.2.0" = { + name = "decompress"; + packageName = "decompress"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz"; + sha1 = "7aedd85427e5a92dacfe55674a7c505e96d01f9d"; + }; + }; "decompress-response-3.3.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -6701,6 +6971,42 @@ let sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; + "decompress-tar-4.1.1" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; + }; + }; + "decompress-tarbz2-4.1.1" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; + }; + }; + "decompress-targz-4.1.1" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; + }; + }; + "decompress-unzip-4.0.1" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; + }; + }; "decompress-zip-0.3.0" = { name = "decompress-zip"; packageName = "decompress-zip"; @@ -6791,15 +7097,6 @@ let sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; }; }; - "deepmerge-1.5.2" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; - sha512 = "2sylzgq5rwi12ac5y4fbvyyhs128zlcrp1q1i0bkp27fvlg60hr1slxzckk22x2rzgmwsqqlvzyylm9v0gwzbsbprd3c1mg78c396gp"; - }; - }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -7196,13 +7493,13 @@ let sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; }; }; - "discovery-channel-5.4.7" = { + "discovery-channel-5.5.1" = { name = "discovery-channel"; packageName = "discovery-channel"; - version = "5.4.7"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; - sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; }; }; "discovery-swarm-4.4.2" = { @@ -7214,13 +7511,13 @@ let sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; }; }; - "dispensary-0.12.0" = { + "dispensary-0.16.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.12.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.12.0.tgz"; - sha1 = "cc491bbbfa66a57414c958c68582a4c8703ff159"; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.16.0.tgz"; + sha1 = "7173f2828380135e3c8eb9f61719fa038c0cd133"; }; }; "diveSync-0.3.0" = { @@ -7232,6 +7529,15 @@ let sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; + "dlnacasts-0.1.0" = { + name = "dlnacasts"; + packageName = "dlnacasts"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dlnacasts/-/dlnacasts-0.1.0.tgz"; + sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22"; + }; + }; "dns-discovery-5.6.1" = { name = "dns-discovery"; packageName = "dns-discovery"; @@ -7241,6 +7547,15 @@ let sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; + "dns-discovery-6.1.0" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; + }; + }; "dns-equal-1.0.0" = { name = "dns-equal"; packageName = "dns-equal"; @@ -7268,6 +7583,15 @@ let sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; + "dns-packet-4.2.0" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; + }; + }; "dns-socket-1.6.3" = { name = "dns-socket"; packageName = "dns-socket"; @@ -7277,6 +7601,15 @@ let sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; + "dns-socket-3.0.0" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; + }; + }; "dns-txt-2.0.2" = { name = "dns-txt"; packageName = "dns-txt"; @@ -7304,13 +7637,13 @@ let sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "doctoc-1.3.0" = { + "doctoc-1.3.1" = { name = "doctoc"; packageName = "doctoc"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.0.tgz"; - sha1 = "7f0839851dd58c808a2cae55d9504e012d08ee30"; + url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.1.tgz"; + sha1 = "f012e3603e3156254c2ef22ac88c7190f55426ba"; }; }; "doctrine-2.1.0" = { @@ -7358,13 +7691,13 @@ let sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; }; }; - "dom-storage-2.0.2" = { + "dom-storage-2.1.0" = { name = "dom-storage"; packageName = "dom-storage"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; - sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz"; + sha512 = "3ckwbdpfa94f4kv5vav65l1qm56bg54bs2wgz9x5nx64avazbg3p07w05mjbfw066clq69vmyfg1fcph5r99i74x18l95zkcp4nk943"; }; }; "dom-walk-0.1.1" = { @@ -7511,6 +7844,24 @@ let sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; }; }; + "download-5.0.3" = { + name = "download"; + packageName = "download"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; + sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; + }; + }; + "download-git-repo-1.0.2" = { + name = "download-git-repo"; + packageName = "download-git-repo"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; + }; + }; "dreamopt-0.6.0" = { name = "dreamopt"; packageName = "dreamopt"; @@ -7628,6 +7979,15 @@ let sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; }; }; + "ecstatic-3.2.0" = { + name = "ecstatic"; + packageName = "ecstatic"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.0.tgz"; + sha512 = "2sjxkrzsvswqsxb6jrq3p75g53szmx1hwwd5yhpkkx4857avz4yr0dvfqkshhxnx88an2gw00j6crbkc39q48zlpmplyzcwzp3sb20s"; + }; + }; "editions-1.3.4" = { name = "editions"; packageName = "editions"; @@ -7773,6 +8133,15 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; + "enable-1.3.2" = { + name = "enable"; + packageName = "enable"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enable/-/enable-1.3.2.tgz"; + sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -7863,6 +8232,15 @@ let sha512 = "1qcg5b143cxb4gxa9jpj51c8q9ihwb0sscwqicgwrghmfg8y2phqjzhlaxjsrd6z8h1mpsxzy00s54w9lx6vd27f1mj9iqqk6ya4khg"; }; }; + "engine.io-3.2.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz"; + sha512 = "0mizbh339hvwkla9vy96m7jg92120wqm9af12ks998hrp2a0fzr3w0gxssjwhp0s0f3kyii24z1sz2x5xq9x3qb5cjn1q2h1fcf05lr"; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -7890,6 +8268,15 @@ let sha512 = "1zfr0lycsgvwkxc8i4qhg5rjr59ss7p66nz3j1y1awmvzgy9myn0rqrpv2hrnm76qv9kmiiss0jpxaaz9xy0lkp7857npkfb6q8fyw6"; }; }; + "engine.io-client-3.2.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz"; + sha512 = "37x70wgsxmbz24ypn1nprgrmqrbjf5ln7xjivpw5q6rw91kj2mhjq81ai8v7zs6am25h2sajk341kid215gxrmy88iwwy2n5f9ip46b"; + }; + }; "engine.io-parser-1.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -7926,15 +8313,6 @@ let sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; }; }; - "enhanced-resolve-3.4.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"; - sha1 = "0421e339fd71419b3da13d129b3979040230476e"; - }; - }; "enhanced-resolve-4.0.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -7998,6 +8376,15 @@ let sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; + "envinfo-3.4.2" = { + name = "envinfo"; + packageName = "envinfo"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-3.4.2.tgz"; + sha512 = "3m2wjc7aa1y0in84b3gg6c2r5cyzhbbcil9i09l2yh1vaw7mw8piziw9fpri3x2bzfrpjksm0sz715ki08nkgz65rrqzwyhlzxab8na"; + }; + }; "errno-0.1.7" = { name = "errno"; packageName = "errno"; @@ -8043,13 +8430,13 @@ let sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; }; }; - "es-abstract-1.10.0" = { + "es-abstract-1.11.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; - sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz"; + sha512 = "2aaq6ivy5raj1a99db6gvw7qn2vs27h0pqvgpf2fqfm9avwqsirr8gs86yx7n36qysjw1vabz6mlc8dfpi6fmz9yqvk8kapz49jnx36"; }; }; "es-to-primitive-1.1.1" = { @@ -8061,13 +8448,13 @@ let sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; }; }; - "es5-ext-0.10.40" = { + "es5-ext-0.10.42" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.40"; + version = "0.10.42"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz"; - sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz"; + sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700"; }; }; "es5-ext-0.8.2" = { @@ -8277,22 +8664,22 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "eslint-4.15.0" = { + "eslint-4.19.0" = { name = "eslint"; packageName = "eslint"; - version = "4.15.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz"; - sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.0.tgz"; + sha512 = "29dc1z24n3c60hfac5afy7rk3mqdch8hnn07fnb9314dbyk5ih2l1284vl3nsgsm5ja5w144nsgmipbycva47gwpl1qfsma5gjcpkdg"; }; }; - "eslint-4.18.2" = { + "eslint-4.19.1" = { name = "eslint"; packageName = "eslint"; - version = "4.18.2"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.18.2.tgz"; - sha512 = "0mqvxkfl52068bfkpxjn14dgwfv4vv8w0a8pq2rw54bkbshfa2y6rpx122ssk3si3dy9298g68079ns1n7m0jrzgwca7a430ggj4bmb"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; + sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -8376,13 +8763,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.0.0" = { + "esquery-1.0.1" = { name = "esquery"; packageName = "esquery"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz"; - sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; + sha512 = "0s9lxfan3qbvpprj71ldy70x9sz4xkpakhr3pymkm13bx40px4kp4xcgipscn8m21qigddin5mkr52bicbm34g46dapyn68kikv4s2a"; }; }; "esrecurse-4.2.1" = { @@ -8471,7 +8858,7 @@ let packageName = "event-stream"; version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; }; }; @@ -8480,7 +8867,7 @@ let packageName = "event-stream"; version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; }; }; @@ -8489,7 +8876,7 @@ let packageName = "event-stream"; version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; }; }; @@ -8498,7 +8885,7 @@ let packageName = "event-stream"; version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; }; }; @@ -8646,6 +9033,15 @@ let sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; }; }; + "executable-4.1.1" = { + name = "executable"; + packageName = "executable"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"; + sha512 = "0p56mwdi80mzj4q8yb6s1abff3dwpl1s887jarp0fx3x3gz92qahnn28yqn0r351wflqsw4cqa4383965pm0pbgxwhhgf7p23vkn87j"; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -8925,13 +9321,13 @@ let sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; - "external-editor-2.1.0" = { + "external-editor-2.2.0" = { name = "external-editor"; packageName = "external-editor"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz"; - sha512 = "366albydy3glqs8h6y7rdpdhmyffn7vaig5snw8cb1zmn22mgvfywr08jfbmqjiqc9pyjyaaqv6xz5sfy2j1y18590l4f8mji7j53hk"; + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; "extglob-0.3.2" = { @@ -8961,15 +9357,6 @@ let sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; }; }; - "extract-text-webpack-plugin-3.0.2" = { - name = "extract-text-webpack-plugin"; - packageName = "extract-text-webpack-plugin"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz"; - sha512 = "10rc4hfyzf8n5b30q0fpawnbnr1cs33mmrz9466hhcxjzlz7ys44zbsr5kbvr1jn5nivcr91nmfhpq2mqi1wxmr19zsnimri5kwppvf"; - }; - }; "extract-zip-1.5.0" = { name = "extract-zip"; packageName = "extract-zip"; @@ -9240,6 +9627,33 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; + "file-type-3.9.0" = { + name = "file-type"; + packageName = "file-type"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + }; + "file-type-5.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; + sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; + }; + }; + "file-type-6.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; + }; + }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -9258,6 +9672,24 @@ let sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; + "filename-reserved-regex-2.0.0" = { + name = "filename-reserved-regex"; + packageName = "filename-reserved-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229"; + }; + }; + "filenamify-2.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz"; + sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; + }; + }; "filesize-3.6.0" = { name = "filesize"; packageName = "filesize"; @@ -9267,6 +9699,15 @@ let sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3"; }; }; + "filestream-4.1.3" = { + name = "filestream"; + packageName = "filestream"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/filestream/-/filestream-4.1.3.tgz"; + sha1 = "948fcaade8221f715f5ecaddc54862faaacc9325"; + }; + }; "fill-range-2.2.3" = { name = "fill-range"; packageName = "fill-range"; @@ -9465,15 +9906,6 @@ let sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; - "firefox-client-0.3.0" = { - name = "firefox-client"; - packageName = "firefox-client"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/firefox-client/-/firefox-client-0.3.0.tgz"; - sha1 = "3794460f6eb6afcf41376addcbc7462e24a4cd8b"; - }; - }; "firefox-profile-1.1.0" = { name = "firefox-profile"; packageName = "firefox-profile"; @@ -9573,13 +10005,13 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; - "fluent-0.4.1" = { - name = "fluent"; - packageName = "fluent"; - version = "0.4.1"; + "flatten-1.0.2" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fluent/-/fluent-0.4.1.tgz"; - sha512 = "2hrbkg2399py60vsz1k5xydrm5kwfh1f6fpgpbkrs9nni1xpq4isy8aif5jq5dakyksbf0yjx3sh7jl9f54c3r6jkf3amm3grxlbaxx"; + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz"; + sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; }; }; "fluent-ffmpeg-2.1.2" = { @@ -9591,13 +10023,22 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "flush-write-stream-1.0.2" = { + "fluent-syntax-0.6.6" = { + name = "fluent-syntax"; + packageName = "fluent-syntax"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.6.6.tgz"; + sha512 = "18dv619kjzc3fdahfc242r7lb27a3pjxx5xd8shascb9xb8c1zncsrbnj0an8qjsg1pwf0az7h7gv5v0g50b3pixznr7wk7d8yqfazj"; + }; + }; + "flush-write-stream-1.0.3" = { name = "flush-write-stream"; packageName = "flush-write-stream"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; - sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz"; + sha512 = "0dycj5bh8djmx4lj5llrbg3cg0ynq32qn8pzk8zl9j8pm6nv5n1qzk4m7dq81q96ygzh8jl9chqh8826rrbl8maa9643fvl5lq5kabi"; }; }; "follow-redirects-0.0.3" = { @@ -9807,13 +10248,13 @@ let sha1 = "ef5491490f9433b705faa77249c99029ae348559"; }; }; - "formidable-1.2.0" = { + "formidable-1.2.1" = { name = "formidable"; packageName = "formidable"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.2.0.tgz"; - sha512 = "00p3bjjkrbwf4xcizvkz2bdc1h0cs8gnshfwn35ncx0zs5qy8pzgc65xg6ndma0mlfy69v5r0cg3zj8x6j6jdn4gzj2w0ibgm7mmgw6"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; }; }; "forwarded-0.1.2" = { @@ -9915,13 +10356,13 @@ let sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457"; }; }; - "fs-chunk-store-1.6.5" = { + "fs-chunk-store-1.7.0" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "1.6.5"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; - sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.7.0.tgz"; + sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a"; }; }; "fs-ext-0.6.0" = { @@ -10266,6 +10707,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-proxy-2.1.0" = { + name = "get-proxy"; + packageName = "get-proxy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; + }; + }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -10284,6 +10734,15 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; "get-stream-3.0.0" = { name = "get-stream"; packageName = "get-stream"; @@ -10311,13 +10770,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-1.2.1" = { + "getmac-1.4.1" = { name = "getmac"; packageName = "getmac"; - version = "1.2.1"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz"; - sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1"; + url = "https://registry.npmjs.org/getmac/-/getmac-1.4.1.tgz"; + sha512 = "0r7zqgvfiv3r6zy8fms9gdcf3a1r46kpf8pm5x7vwrc27vgv69ra244s89k73hb9rna6r3s9v20yzbwjmz2c13gh3s0bbd07zq7w2lr"; }; }; "getpass-0.1.7" = { @@ -10338,13 +10797,22 @@ let sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; - "git-raw-commits-1.3.4" = { + "git-clone-0.1.0" = { + name = "git-clone"; + packageName = "git-clone"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; + sha1 = "0d76163778093aef7f1c30238f2a9ef3f07a2eb9"; + }; + }; + "git-raw-commits-1.3.6" = { name = "git-raw-commits"; packageName = "git-raw-commits"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.4.tgz"; - sha512 = "0yfkxk071bahnzw2h5ip6qb7mq76psfwiqs232gkzr91hc55kqw57pjn33j04h3xiwvgrikl20mbccisi006rxyh0lwfvj7bkivwwqv"; + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz"; + sha512 = "111718czypc8jr47xq3n5xvfwx6nib7y36bpb882id57sdhv49bfpdmkgxbrb524942rw3k6wq15128mlv4q8fbkh5g3wjhmgdhmyxj"; }; }; "git-remote-origin-url-2.0.0" = { @@ -10365,13 +10833,13 @@ let sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "git-semver-tags-1.3.4" = { + "git-semver-tags-1.3.6" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.4.tgz"; - sha512 = "0hhdj4992a96ys5i9k6pjbn99wwsabb92drxr0s7vzxyxlpydrvjzbb4rwdnsd0rm7h92420yr2f3khpakkp6ivgg09fp9hhgprkvax"; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz"; + sha512 = "25114wyd4p8qn681l730d9s1wgh4kmvizin5361hx5qvpd82adi2fkjkvv289nk1vb6hx8q13ikhyc705hw8iag1b23zq37g4kfacfs"; }; }; "gitconfiglocal-1.0.0" = { @@ -10636,13 +11104,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-11.3.0" = { + "globals-11.4.0" = { name = "globals"; packageName = "globals"; - version = "11.3.0"; + version = "11.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz"; - sha512 = "1vlgbj6gcsd9dshs7xldhg92zd62r3w51jf9x80qnn0y4llbl2ji5sl7ibmv7ysr0iv8hzid151n8zxhyi84rlnczysjhb6v4l5qjlj"; + url = "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz"; + sha512 = "0fgjya5jfxjd8gzgpnpig973bbplfq2i5fkfpi5lxyjsi3988wq3by19ka2ql2j4a80l9bk5g5brq4vvd2hr61ak79pzwm5z24ycb0g"; }; }; "globals-9.18.0" = { @@ -10798,6 +11266,15 @@ let sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; }; }; + "gray-matter-2.1.1" = { + name = "gray-matter"; + packageName = "gray-matter"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; + sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; + }; + }; "grouped-queue-0.3.3" = { name = "grouped-queue"; packageName = "grouped-queue"; @@ -11050,6 +11527,15 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-generators-1.0.1" = { + name = "has-generators"; + packageName = "has-generators"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; + sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; + }; + }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -11491,6 +11977,15 @@ let sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -11644,13 +12139,13 @@ let sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; }; }; - "https-proxy-agent-2.2.0" = { + "https-proxy-agent-2.2.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.0.tgz"; - sha512 = "2ybiwjzy908vjwlhg0cfi00ylv35l1kkldn3l69j8hvng0wn7l6193054hy2zw7a69r8xgn5n6w0fx3h2pajnyggiqggjzgf5yrqidr"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz"; + sha512 = "2arj581rpjpgky9cr5hh3asan2mh7825rwxy63mp02amw9w6vsi59bay0dwp72md28mmzrmahxc909v1r1ca6y6r3f5dryna95r7w0w"; }; }; "humanize-0.0.9" = { @@ -11671,31 +12166,31 @@ let sha1 = "a65b34459ad6367adbb3707a82a3c9f916167030"; }; }; - "humanize-string-1.0.1" = { + "humanize-string-1.0.2" = { name = "humanize-string"; packageName = "humanize-string"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz"; - sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; + url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.2.tgz"; + sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw"; }; }; - "hypercore-6.12.3" = { + "hypercore-6.13.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.3"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.3.tgz"; - sha512 = "0gxq17xmp2926g01dram5fdny52r40lvvanf83d35vvrhsck95zx2ymrhn6hv81hp8wvlwlqs84zbz35xp6d0nf3396pa0kra44ma4k"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; + sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; }; }; - "hypercore-protocol-6.6.0" = { + "hypercore-protocol-6.6.4" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.6.0"; + version = "6.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.0.tgz"; - sha512 = "3kwmsg8vfza3i9nbx84v43sh4gi5bjpmj7mn15xyvxg30k0074yvgpng16g8310r88dsk055awlj9zf5zpsk1r0zy61890k9y7bpppg"; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; "hyperdrive-9.12.3" = { @@ -11725,6 +12220,15 @@ let sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; + "hyperquest-2.1.3" = { + name = "hyperquest"; + packageName = "hyperquest"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperquest/-/hyperquest-2.1.3.tgz"; + sha512 = "2ppxy7nv5yzpc9bvycyd4k2znp9grxldqrpvjzkzssn62f6xx7rzcqgrq30iykm5j91l8xahr93bznynpj30h7h5f6zmv3qn0x86jvx"; + }; + }; "i-0.3.6" = { name = "i"; packageName = "i"; @@ -11788,6 +12292,15 @@ let sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; + "iconv-lite-0.4.21" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.21"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; + sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; + }; + }; "iconv-lite-0.4.8" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -11797,6 +12310,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "ieee754-1.1.11" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz"; + sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n"; + }; + }; "ieee754-1.1.8" = { name = "ieee754"; packageName = "ieee754"; @@ -12103,13 +12625,13 @@ let sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; - "insert-module-globals-7.0.2" = { + "insert-module-globals-7.0.6" = { name = "insert-module-globals"; packageName = "insert-module-globals"; - version = "7.0.2"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz"; - sha512 = "19lb0lqjmyxr13va9m2mdyjmpfb2c4lgnnnwysri85znpa37gcgi6b57zj0h5ymk6fbl3snjfw07gb9azb8yvkldj6av6wdvs1knyx7"; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.6.tgz"; + sha512 = "3vjhls34i9vc0mm5cxlw6zbp1an494z9kbrrmj4hbv32fw0hx22nfpaj7j8i7lwkqa1sdqidxcfkga1630ya454h8h2ppbbl9s24ys7"; }; }; "insight-0.8.4" = { @@ -12166,13 +12688,13 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; - "invariant-2.2.3" = { + "invariant-2.2.4" = { name = "invariant"; packageName = "invariant"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.3.tgz"; - sha512 = "2s1gvqa56gnq2pkh0yy5ch3pb69dkwxr6myw9r3cc1c55xnrpiwzgc90ns4n9lij9slw0aayzm95k3x3rfrv0m7dnikq39hx0ylz7pd"; + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; + sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6"; }; }; "invert-kv-1.0.0" = { @@ -12238,6 +12760,15 @@ let sha1 = "e3fa357b773da619f26e95f049d055c72796f86b"; }; }; + "ipaddr.js-1.7.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.7.0.tgz"; + sha1 = "2206ed334afc32e01fed3ee838b6b2521068b9d2"; + }; + }; "irc-replies-2.0.1" = { name = "irc-replies"; packageName = "irc-replies"; @@ -12346,6 +12877,15 @@ let sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; }; }; + "is-ascii-1.0.0" = { + name = "is-ascii"; + packageName = "is-ascii"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ascii/-/is-ascii-1.0.0.tgz"; + sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; + }; + }; "is-binary-path-1.0.1" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -12517,6 +13057,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-file-1.0.0" = { + name = "is-file"; + packageName = "is-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-file/-/is-file-1.0.0.tgz"; + sha1 = "28a44cfbd9d3db193045f22b65fce8edf9620596"; + }; + }; "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; @@ -12598,6 +13147,15 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; + "is-mergeable-object-1.1.0" = { + name = "is-mergeable-object"; + packageName = "is-mergeable-object"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-mergeable-object/-/is-mergeable-object-1.1.0.tgz"; + sha512 = "03srgd19nl1p2b2ny8gamq5qvv4k124inq5fzkb1kqxdw9y45fr46g8awmpnx0hgwpfg0blysfms7r8n89sf5183hr2xd8x0l7q7z15"; + }; + }; "is-my-ip-valid-1.0.0" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; @@ -12616,6 +13174,15 @@ let sha512 = "29bla4943cs5dks8f307ykpgk5gihgjy158h8nspcxia85gb1lwaxpqywisr7621spdp8j5p4vd3zhfl2csdlihy06w9017b2r42610"; }; }; + "is-natural-number-4.0.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "ab9d76e1db4ced51e35de0c72ebecf09f734cde8"; + }; + }; "is-negated-glob-1.0.0" = { name = "is-negated-glob"; packageName = "is-negated-glob"; @@ -12706,13 +13273,13 @@ let sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; }; }; - "is-path-in-cwd-1.0.0" = { + "is-path-in-cwd-1.0.1" = { name = "is-path-in-cwd"; packageName = "is-path-in-cwd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; - sha1 = "6477582b8214d602346094567003be8a9eac04dc"; + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; + sha512 = "1lrmbdvciajn2smq4j80qvp3gpkkzqddiyay3xgbzni3gi4vljkawyyw68i6h8m1jfdg4jy8l8c16rlfvr17pnfb314xw5q6m2pad8n"; }; }; "is-path-inside-1.0.1" = { @@ -12904,13 +13471,13 @@ let sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; }; }; - "is-supported-regexp-flag-1.0.0" = { + "is-supported-regexp-flag-1.0.1" = { name = "is-supported-regexp-flag"; packageName = "is-supported-regexp-flag"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz"; - sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8"; + url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz"; + sha512 = "0lrp2yp3bjcq9v1sxn5451bmmnj129aws8g0ym3a2s4wkc2y6ym591pym51dgs2xg7cpid087hvmnvqjr36pp6gm419ibhlqmwhkxyy"; }; }; "is-symbol-1.0.1" = { @@ -12958,13 +13525,13 @@ let sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; }; }; - "is-url-1.2.2" = { + "is-url-1.2.4" = { name = "is-url"; packageName = "is-url"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz"; - sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; + url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; + sha512 = "31qfylxnpb1y8vczgi2nh57ayl7s5ppn8iskp21607l6ka7jxq409pf2mvspwnx6pj29b63ldayjgljsbhyc442gfc1i185dy5ccfr1"; }; }; "is-utf8-0.2.1" = { @@ -13039,6 +13606,15 @@ let sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; + "isarray-2.0.4" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz"; + sha512 = "1l996rw6ql1ypf4jvy0yhl3d08zislzsxc0lgbc4hh3kb4qzlxqv29d9nblq9ai6lkiwvxfgynknk8j6j9qm49jqlsnib924lx5gk0q"; + }; + }; "isbinaryfile-3.0.2" = { name = "isbinaryfile"; packageName = "isbinaryfile"; @@ -13345,15 +13921,6 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; - "json-loader-0.5.7" = { - name = "json-loader"; - packageName = "json-loader"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"; - sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0"; - }; - }; "json-merge-patch-0.2.3" = { name = "json-merge-patch"; packageName = "json-merge-patch"; @@ -13363,13 +13930,13 @@ let sha1 = "fa2c6b5af87da77bae2966a589d52e23ed81fe40"; }; }; - "json-parse-better-errors-1.0.1" = { + "json-parse-better-errors-1.0.2" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz"; - sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls"; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -13696,6 +14263,15 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; + "junk-2.1.0" = { + name = "junk"; + packageName = "junk"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/junk/-/junk-2.1.0.tgz"; + sha1 = "f431b4b7f072dc500a5f10ce7f4ec71930e70134"; + }; + }; "just-detect-adblock-1.0.0" = { name = "just-detect-adblock"; packageName = "just-detect-adblock"; @@ -13976,22 +14552,22 @@ let sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr"; }; }; - "kuduscript-1.0.15" = { + "kuduscript-1.0.16" = { name = "kuduscript"; packageName = "kuduscript"; - version = "1.0.15"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz"; - sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.16.tgz"; + sha512 = "2pws4jvqqdysxbqb5bw1m67wklk7lrxl293q5w9cd58drz6jzs4qzgiy6gg7dzx9m2pgn9kqxns8pw445d68ncqk2nxpdcimnnsbszv"; }; }; - "labeled-stream-splicer-2.0.0" = { + "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; - sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; + sha512 = "0z3ssjaq1bx4j1dcysbbmsnq24zglv2gdsm3by6dr34w10jrlg06rrh3l7qa8a3ch7ag9gmkjfrw6m448sra299gz5rvg2ifsc7hbrh"; }; }; "last-one-wins-1.0.4" = { @@ -14318,6 +14894,15 @@ let sha512 = "0r82qh90jnyg6hlqn2yni36q942y4qn6rc0rydmbsy7x1lr00a0pddw2lg8xixcjh6wnrsfb5q76m51fac7vanrz0cawsw6azy78m4g"; }; }; + "load-ip-set-1.3.1" = { + name = "load-ip-set"; + packageName = "load-ip-set"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-1.3.1.tgz"; + sha1 = "cfd050c6916e7ba0ca85d0b566e7854713eb495e"; + }; + }; "load-json-file-1.1.0" = { name = "load-json-file"; packageName = "load-json-file"; @@ -14678,15 +15263,6 @@ let sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; }; }; - "lodash.endswith-4.2.1" = { - name = "lodash.endswith"; - packageName = "lodash.endswith"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz"; - sha1 = "fed59ac1738ed3e236edd7064ec456448b37bc09"; - }; - }; "lodash.escape-3.2.0" = { name = "lodash.escape"; packageName = "lodash.escape"; @@ -14795,15 +15371,6 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "lodash.isfunction-3.0.9" = { - name = "lodash.isfunction"; - packageName = "lodash.isfunction"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; - sha512 = "0ki8njk33gc8ayf2vmnx2jrfdapwckm7dx2z4zn1ik07hwgwx5zb3fsi9mlamhg6rnj1qlvfwsbg2074x19x8gq60615fbr7lvdfah2"; - }; - }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -14957,15 +15524,6 @@ let sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; }; - "lodash.startswith-4.2.1" = { - name = "lodash.startswith"; - packageName = "lodash.startswith"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz"; - sha1 = "c598c4adce188a27e53145731cdc6c0e7177600c"; - }; - }; "lodash.template-3.6.2" = { name = "lodash.template"; packageName = "lodash.template"; @@ -15182,6 +15740,15 @@ let sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; }; }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + }; + }; "lru-2.0.1" = { name = "lru"; packageName = "lru"; @@ -15254,15 +15821,6 @@ let sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; }; }; - "lsmod-1.0.0" = { - name = "lsmod"; - packageName = "lsmod"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"; - sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; - }; - }; "ltgt-1.0.2" = { name = "ltgt"; packageName = "ltgt"; @@ -15407,13 +15965,13 @@ let sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; }; }; - "make-iterator-1.0.0" = { + "make-iterator-1.0.1" = { name = "make-iterator"; packageName = "make-iterator"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; - sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"; + sha512 = "2dhd467iqwi8rmdzm8m0921z2mmixbdbpp9hvk02f5z6k1k2324k5l971x6j46mlq8nbixf21znq376dj431jnfajxllm123mgaw657"; }; }; "map-cache-0.2.2" = { @@ -15524,13 +16082,13 @@ let sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; }; }; - "marked-0.3.17" = { + "marked-0.3.19" = { name = "marked"; packageName = "marked"; - version = "0.3.17"; + version = "0.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz"; - sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; + sha512 = "2940np3jq9midbdw8mhfry1msy3572i2gj0y3z9c8z1dyrdhxg1rivcxhgihpqs6gihqnzgdhbgmgsabm2ch7gzbvf16dxacccrxbbr"; }; }; "matcher-collection-1.0.5" = { @@ -15542,6 +16100,15 @@ let sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; }; }; + "md5-2.2.1" = { + name = "md5"; + packageName = "md5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + }; + }; "md5.js-1.3.4" = { name = "md5.js"; packageName = "md5.js"; @@ -15560,6 +16127,15 @@ let sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc"; }; }; + "mdns-js-0.5.0" = { + name = "mdns-js"; + packageName = "mdns-js"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; + sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + }; + }; "mdns-js-1.0.1" = { name = "mdns-js"; packageName = "mdns-js"; @@ -15569,6 +16145,15 @@ let sha512 = "0z9rixsyb1m6w2qjqimn0ga0qdcpnxnm0ci7zd0svzd9kivqds0zczf7r32064r8c32m94cs3lrcvwvg21d7x2s38f28r5874rjs0bp"; }; }; + "mdns-js-packet-0.2.0" = { + name = "mdns-js-packet"; + packageName = "mdns-js-packet"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; + sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + }; + }; "mdurl-1.0.1" = { name = "mdurl"; packageName = "mdurl"; @@ -15587,6 +16172,15 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; + "mediasource-2.1.3" = { + name = "mediasource"; + packageName = "mediasource"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mediasource/-/mediasource-2.1.3.tgz"; + sha1 = "27a9c1aac51bfb6eba96af2d13a84d0b2a8eac68"; + }; + }; "mediawiki-title-0.6.5" = { name = "mediawiki-title"; packageName = "mediawiki-title"; @@ -15623,6 +16217,15 @@ let sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; }; }; + "memory-chunk-store-1.3.0" = { + name = "memory-chunk-store"; + packageName = "memory-chunk-store"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz"; + sha512 = "0sgs9s743559yps61abf9vnw58jgcig5rj15y47q4dsv7bjfj4i138ycgwd384nsqnbbri9p8xm4jq986bkirhi5qmid1wafaj0xfz8"; + }; + }; "memory-fs-0.3.0" = { name = "memory-fs"; packageName = "memory-fs"; @@ -15740,6 +16343,15 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; + "metalsmith-2.3.0" = { + name = "metalsmith"; + packageName = "metalsmith"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; + sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; + }; + }; "method-override-2.3.10" = { name = "method-override"; packageName = "method-override"; @@ -15821,13 +16433,13 @@ let sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; - "micromatch-3.1.9" = { + "micromatch-3.1.10" = { name = "micromatch"; packageName = "micromatch"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz"; - sha512 = "3vfciram7xbwcwvhii8960vnvf3jczn092sfbfgx1vivk3scvkm9znjnbq2ppywg9h8i86d8vq3ha4c9a3jllaian0gcl7rrgm36lja"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; }; }; "miller-rabin-4.0.1" = { @@ -15893,6 +16505,15 @@ let sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; + "mime-2.2.2" = { + name = "mime"; + packageName = "mime"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz"; + sha512 = "2ahs0dpq95sf8rrpc024h6jqrvknjnj5v046k755kz6br3pr371y9j9df0srgfszdqviaw4fc6vgngbyik866272hmckw1qif1w7cq3"; + }; + }; "mime-db-1.12.0" = { name = "mime-db"; packageName = "mime-db"; @@ -16091,13 +16712,13 @@ let sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; }; }; - "minipass-2.2.1" = { + "minipass-2.2.4" = { name = "minipass"; packageName = "minipass"; - version = "2.2.1"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; - sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; + sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; }; }; "minizlib-1.1.0" = { @@ -16217,13 +16838,13 @@ let sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; }; }; - "modify-values-1.0.0" = { + "modify-values-1.0.1" = { name = "modify-values"; packageName = "modify-values"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; - sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz"; + sha512 = "15hcc3355684n37j7979fs72xj57d71cpl1vbqf3n0nkj3mdairyl91q80xhrhrzlpbxc1yccvqqbh31zv7p4wmilcbl5vswg2rnpf5"; }; }; "module-deps-4.1.1" = { @@ -16235,13 +16856,13 @@ let sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; - "module-deps-6.0.0" = { + "module-deps-6.0.2" = { name = "module-deps"; packageName = "module-deps"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz"; - sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.2.tgz"; + sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19"; }; }; "moment-2.1.0" = { @@ -16280,13 +16901,13 @@ let sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; - "moment-2.21.0" = { + "moment-2.22.0" = { name = "moment"; packageName = "moment"; - version = "2.21.0"; + version = "2.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz"; - sha512 = "02hkdlhchyx4dqrh4q7p3c0xggpygcf0pimjvm66sib8z87wkbndici8vp2r39b472zpmybrf85y2c92lbw3hng9j2kfifl33l7f9jc"; + url = "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz"; + sha512 = "1v5hxqrwy3yd5023aflf2r1nlkayx1sh9cjjyk3415lba199gkimbq72ba26j3rf2azc0zwhqcz86jh8garynvlh1zm6vr33w59fsyn"; }; }; "moment-2.6.0" = { @@ -16370,6 +16991,24 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; + "mp4-box-encoding-1.1.3" = { + name = "mp4-box-encoding"; + packageName = "mp4-box-encoding"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.3.tgz"; + sha512 = "0ma1r4wxwlnxb4xjmq6gga6m4ilsarrcvgj4yrjhngbh5l6gng87i4nakbkm4iqxbnchw75ybivhlfhx8bn4qm525qxirs7gh77i8c9"; + }; + }; + "mp4-stream-2.0.3" = { + name = "mp4-stream"; + packageName = "mp4-stream"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-2.0.3.tgz"; + sha512 = "3d7vh2ks36h25fkh19jfzvw8flk9f0lz8brnpj57wlwfcwx8hsw5fdr2dxr2brpxvcdv4mhfyd7g82y1n1229scchlaj6cv9wiy1p74"; + }; + }; "mpath-0.1.1" = { name = "mpath"; packageName = "mpath"; @@ -16487,13 +17126,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.3.2" = { + "ms-rest-2.3.3" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.2.tgz"; - sha512 = "04bv4p3b4k2qz7h4yqhk163fm69yhip62hph9xa6ncx5icw06jkhyjgsag12f83l2d3f95541qfdpynv388s0jjyqn57d52l6nvbhp3"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.3.tgz"; + sha512 = "2qrwz9q47d6988i8kf97zl0974msgia3qzcah3rl6gld0n99pzdnlbz2cnqbhcj7yql2jbfm682qalzfazphxl90liyl82mzvz7z3jb"; }; }; "ms-rest-azure-1.15.7" = { @@ -16505,13 +17144,13 @@ let sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; - "ms-rest-azure-2.5.4" = { + "ms-rest-azure-2.5.5" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.4.tgz"; - sha512 = "049vfg1l6jfzdn82m5shchi6zzlfk81csihlalwj1mm96j0dykbx885sbjyv3wr0iqwjwzp4i1x2kv750xvzvyljfqrlnh1kfhrq32b"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.5.tgz"; + sha512 = "37sgjm2jqs7fnlzbxihq6sdxxd4w7m5nnkmvp5rrnq9ghsfbbk9pr1z4lm6my3yg06hhqgdyg7rnnzvds26yxjwic7d1g1ab1igjwrf"; }; }; "msgpack-1.0.2" = { @@ -16568,6 +17207,15 @@ let sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; + "multicast-dns-7.0.0" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; + }; + }; "multicast-dns-service-types-1.1.0" = { name = "multicast-dns-service-types"; packageName = "multicast-dns-service-types"; @@ -16586,6 +17234,15 @@ let sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; }; }; + "multimatch-2.1.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"; + sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; + }; + }; "multiparty-2.2.0" = { name = "multiparty"; packageName = "multiparty"; @@ -16622,6 +17279,15 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; + "multistream-2.1.0" = { + name = "multistream"; + packageName = "multistream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; + sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; + }; + }; "muri-0.3.1" = { name = "muri"; packageName = "muri"; @@ -16766,6 +17432,15 @@ let sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; }; }; + "nan-2.10.0" = { + name = "nan"; + packageName = "nan"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; + }; + }; "nan-2.3.5" = { name = "nan"; packageName = "nan"; @@ -16793,15 +17468,6 @@ let sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; - "nan-2.9.2" = { - name = "nan"; - packageName = "nan"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; - sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; - }; - }; "nanoassert-1.1.0" = { name = "nanoassert"; packageName = "nanoassert"; @@ -16829,6 +17495,15 @@ let sha512 = "2bzl500sgpk3i3ird4iviglsj0gj9a0qhmj4hnky3xmxbl4ahamjhi96rslr8k65j77glmw771m3jm7r5sr5akw6ip5glmxvqkg095h"; }; }; + "nanolru-1.0.0" = { + name = "nanolru"; + packageName = "nanolru"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanolru/-/nanolru-1.0.0.tgz"; + sha512 = "1d2d6k4vxnxgs5621zpccl6hk5nk0knsmjmhfmfv30sfgzca6qc59xb3xz05gi141s4y0m5yrn0iamd7554lfq9hl5rbnipqc9j890v"; + }; + }; "nanomatch-1.2.9" = { name = "nanomatch"; packageName = "nanomatch"; @@ -16905,13 +17580,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "natives-1.1.1" = { + "natives-1.1.3" = { name = "natives"; packageName = "natives"; - version = "1.1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; - sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; + url = "https://registry.npmjs.org/natives/-/natives-1.1.3.tgz"; + sha512 = "3pbpfnk3183j5mwxprr19bzahf7lxarcka2bad0mhcywnjlj63i55phbxyk0pn4l4v7nj3wv4gjrzdk7xfxxfrjl5rvqf0qbrhr5485"; }; }; "natural-compare-1.4.0" = { @@ -16932,15 +17607,6 @@ let sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; }; }; - "ncname-1.0.0" = { - name = "ncname"; - packageName = "ncname"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz"; - sha1 = "5b57ad18b1ca092864ef62b0b1ed8194f383b71c"; - }; - }; "nconf-0.6.9" = { name = "nconf"; packageName = "nconf"; @@ -17067,12 +17733,12 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; - "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { + "negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" = { name = "negotiator"; packageName = "negotiator"; version = "0.6.1"; src = fetchgit { - url = "https://github.com/arlolra/negotiator.git"; + url = "https://github.com/arlolra/negotiator"; rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; @@ -17149,6 +17815,15 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; + "next-event-1.0.0" = { + name = "next-event"; + packageName = "next-event"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-event/-/next-event-1.0.0.tgz"; + sha1 = "e7778acde2e55802e0ad1879c39cf6f75eda61d8"; + }; + }; "next-line-1.1.0" = { name = "next-line"; packageName = "next-line"; @@ -17212,13 +17887,13 @@ let sha512 = "01a44qwlfiqbz8hlpp7yywzw9xj04h937jnzmb94dany3bsh8z3shcn1579m0702h8ah3nayb17z63ahldj9rb6k75waf7qkamawgzh"; }; }; - "node-cache-4.1.1" = { + "node-cache-4.2.0" = { name = "node-cache"; packageName = "node-cache"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz"; - sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; + url = "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz"; + sha512 = "0xw45nif5bibga7jbx0n2fv7h0jz3l4lp6ra8gfri1f7kzq0kc31q9i5zpvhi6j63785gynl2m02h8l30x04pn8raw4sjzvyzmnxd51"; }; }; "node-elm-compiler-4.3.3" = { @@ -17239,15 +17914,6 @@ let sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in"; }; }; - "node-firefox-connect-1.2.0" = { - name = "node-firefox-connect"; - packageName = "node-firefox-connect"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-firefox-connect/-/node-firefox-connect-1.2.0.tgz"; - sha1 = "42403848313240c98514ef14b3302816fe3b84e1"; - }; - }; "node-forge-0.6.23" = { name = "node-forge"; packageName = "node-forge"; @@ -17257,13 +17923,13 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "node-forge-0.7.4" = { + "node-forge-0.7.5" = { name = "node-forge"; packageName = "node-forge"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.4.tgz"; - sha512 = "0ygz69n952i01haj405jv90sa51d0yvyxqq9hn04p6fkfvbvm0yzk0310d864sjz5frvj1f6r0dl4xaiwz690hvkglazdmy9vvz8dzh"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz"; + sha512 = "0aq9ajngp210n97kmgnqyhil492amwhcn3b8bwxgsli9hq5qy4lh7qmncwbb1j0llrc4zalr0haj0fphrygz8kinzij848kcckx0rij"; }; }; "node-gyp-build-3.3.0" = { @@ -17329,40 +17995,49 @@ let sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; }; - "node-red-node-email-0.1.24" = { + "node-red-node-email-0.1.27" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.24"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz"; - sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.27.tgz"; + sha512 = "0r799aswbfv6f9rjdrh6bddfzwj1mpinlani8cwc7zbmipcf4dsyffmf3xghb3hpb15k26jvpb46f2ia8cff1vyn4i9h3jn5dnzflnc"; }; }; - "node-red-node-feedparser-0.1.10" = { + "node-red-node-feedparser-0.1.12" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.10"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.10.tgz"; - sha512 = "0d40wp93zkzw88sv839mm8ywrv0jidpfqbv5a6j0dgj5ivvi7crnsy92ciiifazdrnh9qqhg2vs7ganja4h8xrsmjal1jh48cdyxwdz"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.12.tgz"; + sha512 = "2ymvmw9wh0rq14fbxg44p3wm1r34lmr7wvh8z40g4cssrpcmb43cc3wr94z9blxpnjmf9795b3slmd3s4283snm01q5z1jppa9kn2lk"; }; }; - "node-red-node-rbe-0.2.1" = { + "node-red-node-rbe-0.2.3" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.1.tgz"; - sha512 = "3s12a0r8a6nzfqk1a1v1k5drczf4qpnia460l3rq4bixnl0k0fahc1hh4cqcw9rlzc59cz3p4dv19ixrwf2wc6nxixsyqz417li68wb"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.3.tgz"; + sha512 = "06is8ig0mlp85dl5hjp86gp7hwahssfls65gbwcql3awygilv9zlgxngm4yrl54vmkyjk2dk5gbf78r6bm4jgm3qf07xdbwvcgjvqz7"; }; }; - "node-red-node-twitter-0.1.12" = { + "node-red-node-twitter-0.1.13" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.12"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.13.tgz"; + sha512 = "0wfkdalwxzyyivqxiwiba5j8pyis83lhipiwck2xrbks3w0x1ldf12fgnzx61kq64sdmzpczqwb7588ggh5drj64ymj88vwdbca0bd9"; + }; + }; + "node-ssdp-2.9.1" = { + name = "node-ssdp"; + packageName = "node-ssdp"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.12.tgz"; - sha512 = "3h9isciksl33ajjzn4s0dp8s8m3zkijqc7rbw4v8glrhz5y3npbv8501sffak943jyd4k3dqalizv9giwaxqfd1760pkhbzh816y6j4"; + url = "https://registry.npmjs.org/node-ssdp/-/node-ssdp-2.9.1.tgz"; + sha1 = "2d6ba8e7eff9bf5b338564f91f7ac5d5cdddc55b"; }; }; "node-static-0.7.10" = { @@ -17455,6 +18130,15 @@ let sha1 = "7525a2875677ea534784a5e10ac78956139614df"; }; }; + "nodebmc-0.0.7" = { + name = "nodebmc"; + packageName = "nodebmc"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nodebmc/-/nodebmc-0.0.7.tgz"; + sha1 = "fae179165265509302cefbebeabd29bd4035184d"; + }; + }; "nodemailer-0.3.35" = { name = "nodemailer"; packageName = "nodemailer"; @@ -17671,13 +18355,13 @@ let sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "npm-5.6.0" = { + "npm-6.0.0-next.0" = { name = "npm"; packageName = "npm"; - version = "5.6.0"; + version = "6.0.0-next.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; - sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0-next.0.tgz"; + sha512 = "06yn34ji94fcadvnj3mafxlv8hnin0mgrdpdjplk33nkjc8niq5kr1kfwikqxj36kyzwdcz8a27599sakryvgvb14mqjabc525ik35x"; }; }; "npm-bundled-1.0.3" = { @@ -17689,6 +18373,15 @@ let sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; }; }; + "npm-conf-1.1.3" = { + name = "npm-conf"; + packageName = "npm-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; + }; + }; "npm-keyword-5.0.0" = { name = "npm-keyword"; packageName = "npm-keyword"; @@ -17960,13 +18653,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-hash-1.2.0" = { + "object-hash-1.3.0" = { name = "object-hash"; packageName = "object-hash"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz"; - sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j"; + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz"; + sha512 = "2qnadlb3xqg732666500m9gssayfvlzrhipcl3hyw3qm1yhmvnz72slbmzlbfi8kgzl95a32a896f1lf175ql4jmn9f2j95pm1v74nk"; }; }; "object-keys-1.0.11" = { @@ -18154,7 +18847,7 @@ let packageName = "onetime"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; @@ -18230,13 +18923,13 @@ let sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; }; }; - "opentracing-0.14.1" = { + "opentracing-0.14.3" = { name = "opentracing"; packageName = "opentracing"; - version = "0.14.1"; + version = "0.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.1.tgz"; - sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.3.tgz"; + sha1 = "23e3ad029fa66a653926adbe57e834469f8550aa"; }; }; "opn-4.0.2" = { @@ -18257,6 +18950,15 @@ let sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5"; }; }; + "opn-5.3.0" = { + name = "opn"; + packageName = "opn"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; + sha512 = "3d5s5y22sx4wfswzs8fmhr7sarmjigs8qhmmyrkiplfda6kkfk3kv67fs8npdklf8zbc9hmx76zsxqfv4bn5qlpzbfq96nfyailg0kd"; + }; + }; "optimist-0.2.8" = { name = "optimist"; packageName = "optimist"; @@ -18500,13 +19202,13 @@ let sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; }; }; - "p-cancelable-0.4.0" = { + "p-cancelable-0.4.1" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.0.tgz"; - sha512 = "3bd5qxdbz8icpcdb0mnhbfb5p4vzqx0jf02ii71prl6kgnaiki21agp84imr0id9fiwk0h8yi0wchmsy749r98ldscg3jxmyyl1s2pw"; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; + sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw"; }; }; "p-finally-1.0.0" = { @@ -18626,6 +19328,15 @@ let sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; }; }; + "package-json-versionify-1.0.4" = { + name = "package-json-versionify"; + packageName = "package-json-versionify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json-versionify/-/package-json-versionify-1.0.4.tgz"; + sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; + }; + }; "pad-0.0.5" = { name = "pad"; packageName = "pad"; @@ -19238,22 +19949,22 @@ let sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; }; }; - "peer-wire-protocol-0.7.0" = { + "peer-wire-protocol-0.7.1" = { name = "peer-wire-protocol"; packageName = "peer-wire-protocol"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; - sha1 = "6c015abf24b4877ed9eca3822b22d996078011da"; + url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.1.tgz"; + sha512 = "2dzhv7b379pzls7q7kd168h4ckh3gnfxcizknb8bvqrpxrm847vjc8c0vpn1b490k94sgl5yxndfiw30rply4phymrx6z2wyrmi7njp"; }; }; - "peer-wire-swarm-0.12.1" = { + "peer-wire-swarm-0.12.2" = { name = "peer-wire-swarm"; packageName = "peer-wire-swarm"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.1.tgz"; - sha1 = "51b75da99c335c64c9ba9ef99fe27a4a5951ff42"; + url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.2.tgz"; + sha512 = "3bchr23xpdvjf588f8qx52ylri5kcqnqi4lf4mgh3i0j8sk1cljvsikd47l09jk4v3drg500q3p5q01nm2z4xfj4fk5xxnbfkb9k1dh"; }; }; "peerflix-0.34.0" = { @@ -19274,12 +19985,12 @@ let sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { + "pegjs-git+https://github.com/tstarling/pegjs#fork" = { name = "pegjs"; packageName = "pegjs"; version = "0.8.0"; src = fetchgit { - url = "https://github.com/tstarling/pegjs.git"; + url = "https://github.com/tstarling/pegjs"; rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; }; @@ -19329,6 +20040,15 @@ let sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; }; + "piece-length-1.0.0" = { + name = "piece-length"; + packageName = "piece-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/piece-length/-/piece-length-1.0.0.tgz"; + sha1 = "4db7167157fd69fef14caf7262cd39f189b24508"; + }; + }; "pify-2.3.0" = { name = "pify"; packageName = "pify"; @@ -19365,13 +20085,22 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-4.10.3" = { + "pino-4.14.0" = { name = "pino"; packageName = "pino"; - version = "4.10.3"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.10.3.tgz"; - sha512 = "2kg8qqb15pav0a2f16xmj5iqzkx28d0c6i1ydy3vzn71hfv7b7kvsbv917bwj68bh8m2mgy9j0kj8j4npy14hg2h09q4h85sz8wm990"; + url = "https://registry.npmjs.org/pino/-/pino-4.14.0.tgz"; + sha512 = "1x3dsg8pg321khfaf3dd91ykkwhdn60wk169l3b2kp8wkbw242ld99qiv7cmbn76ccba75wdydv8mb2v4fg58lrfnn7jf5pvk2x7qwy"; + }; + }; + "pino-std-serializers-1.2.0" = { + name = "pino-std-serializers"; + packageName = "pino-std-serializers"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-1.2.0.tgz"; + sha512 = "0h8xndhy3qwgkycbmypfp7a2dvk875prgnfg46zj9vz14i24xqqdw1xp748hkv2xl2phwhyaa82yr1ym6jn6r61527kz5f7f8qird78"; }; }; "pkg-dir-2.0.0" = { @@ -19455,13 +20184,22 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; - "plist-2.1.0" = { + "plist-3.0.1" = { name = "plist"; packageName = "plist"; - version = "2.1.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; - sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; + url = "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz"; + sha512 = "12n868myk28as4ivyihfw9ai50y0vc1jrr77r55drlidyi7qpwlm23aj9n05qqlzhs544yah6p535b5hiayh6xykf81q68wg8f2z60s"; + }; + }; + "plist-with-patches-0.5.1" = { + name = "plist-with-patches"; + packageName = "plist-with-patches"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz"; + sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d"; }; }; "pluralize-1.2.1" = { @@ -19572,22 +20310,22 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "postcss-6.0.14" = { + "postcss-6.0.19" = { name = "postcss"; packageName = "postcss"; - version = "6.0.14"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz"; - sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz"; + sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; - "postcss-6.0.19" = { + "postcss-6.0.21" = { name = "postcss"; packageName = "postcss"; - version = "6.0.19"; + version = "6.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz"; - sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz"; + sha512 = "1vvp2mzw4gq6zm875fi7hgyypy0a44mbdpv0i4aqxsq8xajdxfyaz4ap4idh29v74ag4z26wla48k315yyg3d0h83zxkn1kniywmxnb"; }; }; "prebuild-install-2.1.2" = { @@ -19599,6 +20337,15 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; + "prebuild-install-2.5.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz"; + sha512 = "013s09xwdppxw3n9h0vz22br6q1dc5rkh8pk9nk3xl0pqsv495qj1y8k5srgmgm7692q1hlyj08nrfbr9nr232bsrkcvhbkm8pzsdfw"; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -19698,13 +20445,13 @@ let sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; }; }; - "probe-image-size-3.2.0" = { + "probe-image-size-4.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; - version = "3.2.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-3.2.0.tgz"; - sha512 = "2ss74kxzba7k01p9fz756q4q9g6m29h49s5pp9wg1larrjmlcm1avhy7rwmqqkpd8azblwa3wk736xz1nrlvzc1h274g863ywifckic"; + url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-4.0.0.tgz"; + sha512 = "1qwy2hmhw201igjdk90dpky6b1qpc9b2jm7nxrsshcagf0ln73s62mwfd2j0mkfx29bhsndjmm8v2fk3nwk8jinzavcz9iicnyx2vly"; }; }; "process-0.11.10" = { @@ -20049,13 +20796,13 @@ let sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; }; }; - "pug-2.0.1" = { + "pug-2.0.3" = { name = "pug"; packageName = "pug"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pug/-/pug-2.0.1.tgz"; - sha1 = "27c151612b53d729abe8e8285aac6bc89345b5d0"; + url = "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz"; + sha1 = "71cba82537c95a5eab7ed04696e4221f53aa878e"; }; }; "pug-attrs-2.0.3" = { @@ -20085,13 +20832,13 @@ let sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26"; }; }; - "pug-filters-3.0.1" = { + "pug-filters-3.1.0" = { name = "pug-filters"; packageName = "pug-filters"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.0.1.tgz"; - sha1 = "163ef73bfbb1f1544d032b2b40f45130eb52dccb"; + url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz"; + sha1 = "27165555bc04c236e4aa2b0366246dfa021b626e"; }; }; "pug-lexer-4.0.0" = { @@ -20193,13 +20940,13 @@ let sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581"; }; }; - "pull-stream-3.6.2" = { + "pull-stream-3.6.7" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.2"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.2.tgz"; - sha1 = "1ea14c6f13174e6ac4def0c2a4e76567b7cb0c5c"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.7.tgz"; + sha512 = "0cq5h32fsfnhxa9wbgk55jhr0z4mx6zmm42nx9r6n3j4bpl6sw2a6vh41raicq2q11bxh1vg7jxv2cdqw7nq6zb0fxm5nj8ipz3dlax"; }; }; "pull-window-2.1.4" = { @@ -20238,6 +20985,15 @@ let sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + }; + }; "pumpify-1.4.0" = { name = "pumpify"; packageName = "pumpify"; @@ -20481,13 +21237,13 @@ let sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; - "query-string-5.1.0" = { + "query-string-5.1.1" = { name = "query-string"; packageName = "query-string"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.0.tgz"; - sha512 = "04m33y2wlmhz19y109cv7l537bdagzl15jv3y0jc3mb7wrw3jpz15pws8m7pbfbqv9nwad46cg3c4cd620f27mwzs1hml2q373y8w0p"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; + sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2"; }; }; "querystring-0.2.0" = { @@ -20535,15 +21291,6 @@ let sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6"; }; }; - "random-access-file-1.8.1" = { - name = "random-access-file"; - packageName = "random-access-file"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; - sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; - }; - }; "random-access-file-2.0.1" = { name = "random-access-file"; packageName = "random-access-file"; @@ -20643,13 +21390,22 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "raven-2.3.0" = { + "range-slice-stream-1.2.0" = { + name = "range-slice-stream"; + packageName = "range-slice-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-1.2.0.tgz"; + sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; + }; + }; + "raven-2.4.2" = { name = "raven"; packageName = "raven"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.3.0.tgz"; - sha1 = "96f15346bdaa433b3b6d47130804506155833d69"; + url = "https://registry.npmjs.org/raven/-/raven-2.4.2.tgz"; + sha1 = "0129e2adc30788646fd530b67d08a8ce25d4f6dc"; }; }; "raw-body-0.0.3" = { @@ -20715,13 +21471,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.5" = { + "rc-1.2.6" = { name = "rc"; packageName = "rc"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; - sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; + sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; }; }; "rc-config-loader-2.0.1" = { @@ -20769,6 +21525,15 @@ let sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; }; }; + "read-metadata-1.0.0" = { + name = "read-metadata"; + packageName = "read-metadata"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz"; + sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6"; + }; + }; "read-only-stream-2.0.0" = { name = "read-only-stream"; packageName = "read-only-stream"; @@ -20886,13 +21651,13 @@ let sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; - "readable-stream-2.3.5" = { + "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; - sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; }; }; "readdirp-2.1.0" = { @@ -20940,6 +21705,15 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; + "record-cache-1.0.1" = { + name = "record-cache"; + packageName = "record-cache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.1.tgz"; + sha512 = "3a25qmwmlljwlcc1zpn80lrq3hmwwaykiac95q2gcm1im4wchk9mdhbgak2lidqijaf6mil2rp5sbm0zfzvvh39nz1lmlz72sll39iy"; + }; + }; "recursive-readdir-2.2.2" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -20949,13 +21723,13 @@ let sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; }; }; - "recursive-watch-1.1.3" = { + "recursive-watch-1.1.4" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; - sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; }; }; "redent-1.0.0" = { @@ -21084,6 +21858,15 @@ let sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; }; }; + "regexpp-1.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; + sha512 = "21xg69jgy5r7mffh5gjaqsv6izqvqh466q3fanmnzsgk33xhxp68nnszw4jcxk2w8lnc92phy26sr7xqq3ni36mg9yh2xb0bbqg1qrc"; + }; + }; "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -21174,6 +21957,15 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; + "render-media-2.12.0" = { + name = "render-media"; + packageName = "render-media"; + version = "2.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/render-media/-/render-media-2.12.0.tgz"; + sha512 = "1y1njral1kn6s6g797ji5pl475zcmvcmrgdnv1vliq8q33vw3b4i4i5fsx9yj2ap7jdpb461507wpijixf56rc5q4r97542zvzxq0by"; + }; + }; "render-readme-1.3.1" = { name = "render-readme"; packageName = "render-readme"; @@ -21300,15 +22092,6 @@ let sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; - }; - }; "request-2.85.0" = { name = "request"; packageName = "request"; @@ -21363,13 +22146,13 @@ let sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; }; }; - "require-from-string-2.0.1" = { + "require-from-string-2.0.2" = { name = "require-from-string"; packageName = "require-from-string"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.1.tgz"; - sha1 = "c545233e9d7da6616e9d59adfb39fc9f588676ff"; + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "09yzgr8s5p0rb2ic71zylyy7dcxk9xskcmkgh7bddq4h383nn34g47wry2yvw7flxzjzsbak6d1n9cabfgh5gnb2kifrccixrcjgzax"; }; }; "require-main-filename-1.0.1" = { @@ -21417,13 +22200,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.5.0" = { + "resolve-1.7.0" = { name = "resolve"; packageName = "resolve"; - version = "1.5.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz"; + sha512 = "2f21aw16zyl0cnz3cr5pvskv4f4lxhp2c14ak8p80kam37nayxdsi9j9n9bcdpilnqbw2pbipxc4nx4vqhyg3mnlhjn1mfip3jikn21"; }; }; "resolve-dir-1.0.1" = { @@ -21705,13 +22488,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "run-parallel-1.1.7" = { + "run-parallel-1.1.8" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.7"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz"; + sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv"; + }; + }; + "run-parallel-limit-1.0.4" = { + name = "run-parallel-limit"; + packageName = "run-parallel-limit"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.7.tgz"; - sha512 = "322cb6n7h8761gprij4m1z52rizyzvxwviima893gphrbrxkhjv6q4ifwspd0w9jhlk7jj0x64449aagms18v7ps6hr774ymvavh7lw"; + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz"; + sha512 = "2y7d7x3kwlwgyqvhlklxl08rkc63c2ww0jf8pcwlnw4nl2k3wcbkid5fwg130cbkwzslv8c4xrrxccng4yqib8dbcgivyq0h855k4yf"; }; }; "run-queue-1.0.3" = { @@ -21723,13 +22515,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "run-series-1.1.4" = { + "run-series-1.1.6" = { name = "run-series"; packageName = "run-series"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz"; - sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.6.tgz"; + sha512 = "2rpksrvsfrz5kv3cwr448d60521dlky61p5hp3ci7g8140yfm58g7xak4gkqysfc9cm6hknxyizfs832939fxg01qslxrzlx7l805a1"; }; }; "rusha-0.8.13" = { @@ -21786,13 +22578,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-5.5.6" = { + "rxjs-5.5.8" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.6"; + version = "5.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz"; - sha512 = "293yj2n5f5bj8b8y9czwgm5l3bqa0g3bbghnxsxwdpiz6s2mxiw6a79w3sqq3c1by3avmb5bgk8xgi0yss5y09pxw87055l60f3k15z"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz"; + sha512 = "32whnkvnay58zbcwimj3lpagg52k7swjdcys6i14a0im2hj1svh602bpvpb3zrqv36k96a1gsjjzbjxvfy6aj89i838l06mxsiflgh7"; }; }; "safe-buffer-5.0.1" = { @@ -21840,6 +22632,15 @@ let sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; }; }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + }; + }; "sanitize-html-1.18.2" = { name = "sanitize-html"; packageName = "sanitize-html"; @@ -21903,15 +22704,6 @@ let sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; - "schema-utils-0.3.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz"; - sha1 = "f5877222ce3e931edae039f17eb3716e7137f8cf"; - }; - }; "schema-utils-0.4.5" = { name = "schema-utils"; packageName = "schema-utils"; @@ -21930,6 +22722,15 @@ let sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; + "seek-bzip-1.0.5" = { + name = "seek-bzip"; + packageName = "seek-bzip"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz"; + sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc"; + }; + }; "semaphore-async-await-1.5.1" = { name = "semaphore-async-await"; packageName = "semaphore-async-await"; @@ -22047,13 +22848,13 @@ let sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; }; }; - "semver-utils-1.1.1" = { + "semver-utils-1.1.2" = { name = "semver-utils"; packageName = "semver-utils"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz"; - sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; + url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.2.tgz"; + sha512 = "09ryf3nvrfjqr93b8fj691lh48pvqhrpah5a5fm87szs42xcnl33sss49piv1grb9h2i7icdvz0i0m5yak5ccxa6xbv4x294rsfs6zr"; }; }; "send-0.0.3" = { @@ -22182,13 +22983,13 @@ let sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; - "serve-favicon-2.4.5" = { + "serve-favicon-2.5.0" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.5"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; - sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz"; + sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; "serve-index-1.7.3" = { @@ -22263,13 +23064,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.5.2" = { + "service-runner-2.3.0" = { name = "service-runner"; packageName = "service-runner"; - version = "2.5.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.2.tgz"; - sha1 = "3a1b8f85625d0cb9154dcbe34d578142c95f1cc7"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.3.0.tgz"; + sha1 = "09039dfdcc40cdbd0259dd3f982916675838cb59"; }; }; "set-blocking-2.0.0" = { @@ -22335,13 +23136,13 @@ let sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; }; }; - "sha.js-2.4.10" = { + "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.10"; + version = "2.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz"; - sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; }; }; "shallow-clone-0.1.2" = { @@ -22461,13 +23262,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-0.2.2" = { + "sign-addon-0.3.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.2.2.tgz"; - sha512 = "3v5myvfbil1c5fsvqx32vqdv7mk62059isry4811avmkgzfv95scw8pnkwa77m6zg9g8vgsp3glqjm65k3rj8xfxnqv24mcmhjk78bz"; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.0.tgz"; + sha512 = "2czjlarf0pa0svlhbdb9i6hrk429za0gsialmxbmgwgbhyjx7mxkgf5mww4rkmsbncdi2va8p64rxjxf7gv8b0jd2a87cvm7rw5pky5"; }; }; "signal-exit-3.0.2" = { @@ -22551,6 +23352,15 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; + "simple-peer-9.0.0" = { + name = "simple-peer"; + packageName = "simple-peer"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.0.0.tgz"; + sha512 = "1fwihnw60ayp1hyj2rp40cshqhi32rj1gjhr060awg35rk762z9a4d15zapvxi76bmdhgs3vs8lv7xmdqxbabg8d3z1xlkq5vnhq0d1"; + }; + }; "simple-plist-0.2.1" = { name = "simple-plist"; packageName = "simple-plist"; @@ -22587,6 +23397,15 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; + "simple-websocket-7.0.2" = { + name = "simple-websocket"; + packageName = "simple-websocket"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.0.2.tgz"; + sha512 = "2x42bhq5w7k053k2jdhvhd2p7lmr407fkb7fwi0k7glaggf6hb452704yh1zvx83mrhdvyscmpyp971p2slmisiffmfvd6cl5md423h"; + }; + }; "simplediff-0.1.1" = { name = "simplediff"; packageName = "simplediff"; @@ -22839,13 +23658,13 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.70.0" = { + "snyk-1.71.0" = { name = "snyk"; packageName = "snyk"; - version = "1.70.0"; + version = "1.71.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.70.0.tgz"; - sha1 = "141a5ab88c262ef1bd6cb2b590bc50d4f46f4dc8"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.71.0.tgz"; + sha1 = "842cfed35ffac591ac34824ce0f1467655c5f8f1"; }; }; "snyk-config-1.0.1" = { @@ -22857,13 +23676,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.4.5" = { + "snyk-go-plugin-1.4.6" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.5.tgz"; - sha512 = "0m7m3yjv33vq1p6gwn30vxmacrahvw08j432pva601fm2b48j9f5hq8v6zdrzna2yw6xqg1dnhd7gxskpivvl4rzs3fji23yfvxgqxs"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.6.tgz"; + sha512 = "3002f73liv15dpg1ls92j4m50374z69p9ic74zpqmr8mjlxcdv09gcxkdmg0bdkzlj3s02bpmdj7vrkw5jb2k2f6zbrr5g4d18pjy8n"; }; }; "snyk-gradle-plugin-1.2.0" = { @@ -22920,13 +23739,13 @@ let sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc"; }; }; - "snyk-python-plugin-1.5.6" = { + "snyk-python-plugin-1.5.7" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.6.tgz"; - sha512 = "1iv7h9k0vj7g2zzx8nzighx84q70kwvl4hhzd4fzxmc8vv06ymwwn4v7cirgbksqrjf9z1bfxq8id308ifb1flyas7blz8zs7xf4w30"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz"; + sha512 = "3fqq6dbx31yysvd835ng60linxmbkzixiqqf28yxq9pdx3x8dq55syhv1g6as3s85wd04q5vc5qlfgdl91jlhwcgjvdwjjr2wwp84pq"; }; }; "snyk-resolve-1.0.0" = { @@ -23010,6 +23829,15 @@ let sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; }; + "socket.io-2.1.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; + sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; + }; + }; "socket.io-adapter-0.2.0" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -23073,6 +23901,15 @@ let sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; }; }; + "socket.io-client-2.1.0" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.0.tgz"; + sha512 = "1xkd66603gshd7s080j107ms405z18mljc7gbmnkllph1zfg82sz5mgvsyhi1zs3bbv5lgvv29gxfn624gpv46v5mwy610wpnj8zwjf"; + }; + }; "socket.io-parser-2.1.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -23109,6 +23946,15 @@ let sha512 = "3pd3lbxawkd1zs739v0vv81vhf6pyax989j96hrc7vhql0xv7kn13sr893hrnn6m71jngw5h61523dq0b0p8drvff0fm0lbz8fbcil3"; }; }; + "socket.io-parser-3.2.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; + sha512 = "10calkdapaxrn8pjqghqxl9h2s6bm76wdd7rp3fd468zz43xcyx6qvywfdivrb2r1dsddig2byv2mbymiyb2q4r628s7z6wpb3q320m"; + }; + }; "socks-1.1.10" = { name = "socks"; packageName = "socks"; @@ -23136,22 +23982,22 @@ let sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; }; }; - "sodium-javascript-0.5.4" = { + "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; - sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.4" = { + "sodium-native-2.1.5" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; - sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; + sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; }; }; "sodium-universal-2.0.0" = { @@ -23334,31 +24180,22 @@ let sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb"; }; }; - "source-map-support-0.5.0" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz"; - sha512 = "3nwgpximc17yn0lfg8658fxkm2hwbpvnbx5x1g0qgqvjm3vzld96rh1gf6iw1srbkicp0m825sq92r9bnj2r2gl8ys0f7fzivf0sjmx"; - }; - }; - "source-map-support-0.5.1" = { + "source-map-support-0.5.3" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.1.tgz"; - sha512 = "276x5a16yv0nlzjdvspsnbkxqhv8lvfj7a0sfzkaasfcwa2rm1ni3h3c0fva63bfqnazbywvs4pzrnbwg43j7gpymjd9cbbndq5x4qi"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz"; + sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; }; }; - "source-map-support-0.5.3" = { + "source-map-support-0.5.4" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz"; - sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz"; + sha512 = "1vfdnbvldylljhm89hfxwsr3pd108my5z1l9gx8ld1j2v2bfpranqc7kc8i9mj24lbq6c4xxs181anrsa5ypbfd3r08v3c1dqyd4i1w"; }; }; "source-map-url-0.4.0" = { @@ -23577,13 +24414,13 @@ let sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; - "sshpk-1.13.1" = { + "sshpk-1.14.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.13.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; "sshpk-1.7.1" = { @@ -23604,13 +24441,13 @@ let sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; }; }; - "ssri-5.2.4" = { + "ssri-5.3.0" = { name = "ssri"; packageName = "ssri"; - version = "5.2.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz"; - sha512 = "2si1dr4dwg0bkvsn38d6rk5raw5lbn2m9giwf8pnhy55wqgxsvv7b1pn252wj166cd8j302a2gwjy00ni473yr1vrxrzmssqs000waj"; + url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; + sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; }; }; "stable-0.1.6" = { @@ -23640,6 +24477,15 @@ let sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; }; + "stat-mode-0.2.2" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; + sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + }; + }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -23694,6 +24540,15 @@ let sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; }; }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -23775,13 +24630,13 @@ let sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; - "stream-http-2.8.0" = { + "stream-http-2.8.1" = { name = "stream-http"; packageName = "stream-http"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz"; - sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz"; + sha512 = "3fbvnv92iyjjnbpggg15blfwzyk4q0f5rsdz2wyyd20j05vw8qgmr185r1r36i3m6qqb82il99qn0b09bb4b7s1myvccbf1bsij63bi"; }; }; "stream-parser-0.3.1" = { @@ -23820,6 +24675,24 @@ let sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353"; }; }; + "stream-to-blob-1.0.0" = { + name = "stream-to-blob"; + packageName = "stream-to-blob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.0.tgz"; + sha1 = "9f7a1ada39e16ea282ebb7e4cda307edabde658d"; + }; + }; + "stream-to-blob-url-2.1.0" = { + name = "stream-to-blob-url"; + packageName = "stream-to-blob-url"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.0.tgz"; + sha1 = "c341d10502ec51250607327258ec2f586b07d626"; + }; + }; "stream-to-promise-2.2.0" = { name = "stream-to-promise"; packageName = "stream-to-promise"; @@ -23856,6 +24729,15 @@ let sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; }; }; + "stream-with-known-length-to-buffer-1.0.1" = { + name = "stream-with-known-length-to-buffer"; + packageName = "stream-with-known-length-to-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.1.tgz"; + sha512 = "07gzjgqphsbkfbc3f594kfja4kwr0sa8ss7arj47znz5wy5m2sw3qkfzgfxpaaijiliwbr3wny331q83kj55j72jsgm0jbsad5m8mdf"; + }; + }; "streamline-0.10.17" = { name = "streamline"; packageName = "streamline"; @@ -24000,13 +24882,13 @@ let sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; - "string.prototype.codepointat-0.2.0" = { + "string.prototype.codepointat-0.2.1" = { name = "string.prototype.codepointat"; packageName = "string.prototype.codepointat"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; - sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; + url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; + sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r"; }; }; "string2compact-1.2.2" = { @@ -24036,6 +24918,15 @@ let sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; }; }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + }; + }; "stringify-entities-1.3.1" = { name = "stringify-entities"; packageName = "stringify-entities"; @@ -24162,6 +25053,15 @@ let sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; }; }; + "strip-dirs-2.1.0" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; + }; + }; "strip-eof-1.0.0" = { name = "strip-eof"; packageName = "strip-eof"; @@ -24216,6 +25116,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "strip-outer-1.0.1" = { + name = "strip-outer"; + packageName = "strip-outer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; + }; + }; "strong-data-uri-1.0.5" = { name = "strong-data-uri"; packageName = "strong-data-uri"; @@ -24405,15 +25314,6 @@ let sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; }; }; - "table-4.0.3" = { - name = "table"; - packageName = "table"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; - sha512 = "0m684sf5sicq9hlavaw7wrm8d10p2vm1cvvrxgl7f2rpqbn5cm6hhsbzb0is6r1bm19p7960dwxif6lc48bz712kx27s176hhafgfjb"; - }; - }; "tabtab-1.3.2" = { name = "tabtab"; packageName = "tabtab"; @@ -24505,13 +25405,13 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.4.0" = { + "tar-4.4.1" = { name = "tar"; packageName = "tar"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz"; - sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; + sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; }; }; "tar-fs-1.16.0" = { @@ -24757,6 +25657,15 @@ let sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; }; }; + "thunkify-wrap-1.0.4" = { + name = "thunkify-wrap"; + packageName = "thunkify-wrap"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify-wrap/-/thunkify-wrap-1.0.4.tgz"; + sha1 = "b52be548ddfefda20e00b58c6096762b43dd6880"; + }; + }; "thunky-0.1.0" = { name = "thunky"; packageName = "thunky"; @@ -24874,13 +25783,13 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; - "titleize-1.0.0" = { + "titleize-1.0.1" = { name = "titleize"; packageName = "titleize"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz"; - sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; + url = "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz"; + sha512 = "1xp43r14ynva5c21rihxm625x47109zj7k3j0cpdmm74lc4fwml3vags077221gz2gf7vafwnskncmag4wnsisiz0bmiawapc70ck5d"; }; }; "tmp-0.0.28" = { @@ -25063,6 +25972,15 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; + "torrent-discovery-8.4.0" = { + name = "torrent-discovery"; + packageName = "torrent-discovery"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.0.tgz"; + sha512 = "39hhpi3mzygr52pgdah0fvll7mdgmchilxshqjykypiz9167p476sjph4w1qbv98254ij6kdwn9b0j4bwqkcbnr3mspmjh1sm5n8fak"; + }; + }; "torrent-piece-1.1.1" = { name = "torrent-piece"; packageName = "torrent-piece"; @@ -25072,13 +25990,13 @@ let sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "torrent-stream-1.0.3" = { + "torrent-stream-1.0.4" = { name = "torrent-stream"; packageName = "torrent-stream"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.3.tgz"; - sha1 = "d8c043b44c3c448c9397a3aec42d2df55887037b"; + url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.4.tgz"; + sha512 = "3ka40l845bfjydjk9jbiz27x4cqd8birv5zfzvdm7ciij7r53ydz6y7pwmk0628qwdnkchgh10z4kdc3408zi8a8pimq7506qrji010"; }; }; "tosource-1.0.0" = { @@ -25234,6 +26152,15 @@ let sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; }; }; + "trim-repeated-1.0.0" = { + name = "trim-repeated"; + packageName = "trim-repeated"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; + }; + }; "trim-right-1.0.1" = { name = "trim-right"; packageName = "trim-right"; @@ -25441,6 +26368,15 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd"; + }; + }; "typescript-2.7.2" = { name = "typescript"; packageName = "typescript"; @@ -25450,6 +26386,15 @@ let sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; }; + "typescript-2.8.1" = { + name = "typescript"; + packageName = "typescript"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; + sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; + }; + }; "typewise-1.0.3" = { name = "typewise"; packageName = "typewise"; @@ -25558,13 +26503,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.3.14" = { + "uglify-js-3.3.20" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.14"; + version = "3.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz"; - sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; + sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; }; }; "uglify-js-3.3.6" = { @@ -25585,22 +26530,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "uglifyjs-webpack-plugin-0.4.6" = { + "uglifyjs-webpack-plugin-1.2.4" = { name = "uglifyjs-webpack-plugin"; packageName = "uglifyjs-webpack-plugin"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz"; - sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; - }; - }; - "uglifyjs-webpack-plugin-1.2.3" = { - name = "uglifyjs-webpack-plugin"; - packageName = "uglifyjs-webpack-plugin"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.3.tgz"; - sha512 = "3dhgxlb6k66s9ah10iapb3lsyygxg6hxrdrs734pgppyrqf8h9ib6mv1vhja19j1chnhffqryl84i6p77qmdq86i53f5fkmgv9zkkva"; + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz"; + sha512 = "14jcr2nd1d4l940llkm93b2rm9886qi9vz16ab85nji84bmsr99rvzvv4vwzj3j0m2lpkkm2gskd4p29lv4vzjr76zp6vxwjn71nhng"; }; }; "uid-0.0.2" = { @@ -25666,13 +26602,22 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; - "uint64be-2.0.1" = { + "uint64be-1.0.1" = { name = "uint64be"; packageName = "uint64be"; - version = "2.0.1"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-1.0.1.tgz"; + sha1 = "1f7154202f2a1b8af353871dda651bf34ce93e95"; + }; + }; + "uint64be-2.0.2" = { + name = "uint64be"; + packageName = "uint64be"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; - sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; }; }; "ultron-1.0.2" = { @@ -25693,13 +26638,22 @@ let sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; }; }; - "umd-3.0.2" = { + "umd-3.0.3" = { name = "umd"; packageName = "umd"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/umd/-/umd-3.0.2.tgz"; - sha512 = "0wgy2hbi34ncj74m0vw30yjcrw0wg3m465r28y458kvvkp7lsmm3klki0f79slyspfnr4c3l0qzcmpggcybk4d6lcb05kh0aj5c2rx6"; + url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"; + sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0"; + }; + }; + "unbzip2-stream-1.2.5" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; }; }; "unc-path-regex-0.1.2" = { @@ -26035,6 +26989,15 @@ let sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; }; }; + "unyield-0.0.1" = { + name = "unyield"; + packageName = "unyield"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unyield/-/unyield-0.0.1.tgz"; + sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; + }; + }; "unzip-response-1.0.2" = { name = "unzip-response"; packageName = "unzip-response"; @@ -26053,15 +27016,6 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; - "upath-1.0.2" = { - name = "upath"; - packageName = "upath"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.0.2.tgz"; - sha512 = "19nv38v416yy515gbq0lvg549w1m48mg17ibl9jp6g0pzlzg6j3lzygbw3c4ia2i9vk0ij0g4fcwfvsa9snxpgdk4a7qbprnj7s4abw"; - }; - }; "upath-1.0.4" = { name = "upath"; packageName = "upath"; @@ -26071,6 +27025,15 @@ let sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; }; }; + "update-check-1.2.0" = { + name = "update-check"; + packageName = "update-check"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-check/-/update-check-1.2.0.tgz"; + sha512 = "1w28g23994qxxlkbmahrqsakjmr6hhknxyg6y109y5ghgph52w51wzyxz2y2z22417298cmyinbc8fjkv64840g61cqv0iziy7bsy14"; + }; + }; "update-notifier-0.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -26098,6 +27061,15 @@ let sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; }; }; + "update-notifier-2.4.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; + sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + }; + }; "update-section-0.3.3" = { name = "update-section"; packageName = "update-section"; @@ -26107,6 +27079,24 @@ let sha1 = "458f17820d37820dc60e20b86d94391b00123158"; }; }; + "upnp-device-client-1.0.2" = { + name = "upnp-device-client"; + packageName = "upnp-device-client"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upnp-device-client/-/upnp-device-client-1.0.2.tgz"; + sha1 = "91f84705f2349bf89082855fff4e3006ac435337"; + }; + }; + "upnp-mediarenderer-client-1.2.4" = { + name = "upnp-mediarenderer-client"; + packageName = "upnp-mediarenderer-client"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upnp-mediarenderer-client/-/upnp-mediarenderer-client-1.2.4.tgz"; + sha1 = "0c63a51802082b6b03b596c475cc64fc1e0877c8"; + }; + }; "upper-case-1.1.3" = { name = "upper-case"; packageName = "upper-case"; @@ -26152,6 +27142,15 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; + "url-join-2.0.5" = { + name = "url-join"; + packageName = "url-join"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz"; + sha1 = "5af22f18c052a000a48d7b82c5e9c2e2feeda728"; + }; + }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -26215,6 +27214,24 @@ let sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0"; }; }; + "ut_metadata-3.2.0" = { + name = "ut_metadata"; + packageName = "ut_metadata"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.0.tgz"; + sha512 = "3c8a0bnic4symhd8m0gy22adlj8pkmiclsxbr6j979fwabrj0z74xp2bknfqp57vndr4f79d4mnhygrbvp69xdn911j0q6ljgd1bw8i"; + }; + }; + "ut_pex-1.2.0" = { + name = "ut_pex"; + packageName = "ut_pex"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.0.tgz"; + sha512 = "3b2f0jrvzj2rij8wi7jwy4r7ijqsfv8a9qjqf67gxmlfmyglz8hr51d8f10hdyx1di88a0f3kba1jp583a643mxjfxlaq1dsxy96a10"; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -26323,22 +27340,22 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; - "utp-native-1.6.2" = { + "utp-native-1.7.0" = { name = "utp-native"; packageName = "utp-native"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; - sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; + sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; }; }; - "uue-3.1.1" = { + "uue-3.1.2" = { name = "uue"; packageName = "uue"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.1.1.tgz"; - sha512 = "29ykgvcsrhwbifm7aa4mf8876c6z2ksc26cnpxf3ljwhg7vfrjz2asvl7ylkjj91alnp2d7n1xvi5qphmn0a1ci091a20mdmnbzg91i"; + url = "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz"; + sha512 = "0pcj6km8jmr85nr0xvnq9nmicnz9a2ysy8bj7s9qxin8c0hzd992bwx8bsnxlmbw02iynqyp0l7a9c7zi2ipqrsfczx5ddhb9fqn4kb"; }; }; "uuid-2.0.3" = { @@ -26611,6 +27628,15 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; + "videostream-2.4.2" = { + name = "videostream"; + packageName = "videostream"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/videostream/-/videostream-2.4.2.tgz"; + sha1 = "9560254d00fabdc40955c1a3c282057d8db1d115"; + }; + }; "vinyl-0.4.6" = { name = "vinyl"; packageName = "vinyl"; @@ -26674,6 +27700,15 @@ let sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239"; }; }; + "vlc-command-1.1.1" = { + name = "vlc-command"; + packageName = "vlc-command"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.1.tgz"; + sha1 = "349b85def831f980cd6eec560b1990fd989eaf92"; + }; + }; "vm-browserify-0.0.4" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -26728,13 +27763,22 @@ let sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y"; }; }; - "vscode-languageclient-4.0.0" = { + "vscode-jsonrpc-3.6.1" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.1.tgz"; + sha512 = "1npkazmy51c215nfgg2jiidabqh8kxd87my3xw19jq413h8lbchxc40wacl5g6gxyijvlc40b2fail6nlgb6rmzsfhjv47n2w7zwipq"; + }; + }; + "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz"; - sha512 = "26vnna1pgmd2l4al7p76v5jqv5jnbljan1wjqywnn1h4wypx3bilgfnir5xmyj356hyvcikihbj7m030blp0nn9a7cmdmwrws110vf1"; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz"; + sha512 = "28c35r5m72hcg1g7lbrilwj29403sl9mq13w5zkl97cqx8hg2p1pw6gxjnysqjwg2rdy9hs2mb925krhvs24cp3y24lfck97xk83yyi"; }; }; "vscode-languageserver-3.5.1" = { @@ -26782,13 +27826,13 @@ let sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; }; }; - "vscode-languageserver-types-3.6.1" = { + "vscode-languageserver-types-3.7.1" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.6.1"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz"; - sha512 = "2ci0g6n2903n20zdbgjbvj3wxn7fh09f9pmbgnwyjjnxwfvmgni244v0k5y31jlv351bdk8cqk4p81wdb9qkyfchxwwqn8lr25vg61n"; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.1.tgz"; + sha512 = "3msj9sf465hb8j4x9diw4qadgf4h8vks2avw2p42pp5d70v9m1f515mblbwmxh17h1321ivsa63pph8q96fx1kh70vp57j0px9rzlby"; }; }; "vscode-uri-1.0.3" = { @@ -26800,13 +27844,13 @@ let sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52"; }; }; - "walk-2.3.9" = { + "walk-2.3.13" = { name = "walk"; packageName = "walk"; - version = "2.3.9"; + version = "2.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; - sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; + url = "https://registry.npmjs.org/walk/-/walk-2.3.13.tgz"; + sha512 = "2g4ayyccqgq4fx68dhds9pwhvj2344n9p0lhb4z1hnsi882apm64s434lqz57rx4b0r1x9w1njfqrywd1la0ljqm7j4xxg8nixqri7g"; }; }; "walk-sync-0.3.2" = { @@ -26827,15 +27871,6 @@ let sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; }; }; - "watchpack-1.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; - sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; - }; - }; "watchpack-1.5.0" = { name = "watchpack"; packageName = "watchpack"; @@ -26872,15 +27907,6 @@ let sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; }; }; - "webpack-3.10.0" = { - name = "webpack"; - packageName = "webpack"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz"; - sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; - }; - }; "webpack-sources-1.1.0" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -26917,13 +27943,22 @@ let sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; }; }; - "whatwg-fetch-2.0.3" = { + "webtorrent-0.98.24" = { + name = "webtorrent"; + packageName = "webtorrent"; + version = "0.98.24"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.98.24.tgz"; + sha512 = "1jf65qy9fq5ngb1sv296r6wbahjwac8vkdddpfhwmyvmbxabfyn8vz09d5di8sy69d4w0kyi74kjx09v7rd954cg135kr9smyy615yk"; + }; + }; + "whatwg-fetch-2.0.4" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; - sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; + sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m"; }; }; "whatwg-url-6.3.0" = { @@ -27007,6 +28042,15 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "which-pm-runs-1.0.0" = { + name = "which-pm-runs"; + packageName = "which-pm-runs"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; + sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + }; + }; "wide-align-1.1.2" = { name = "wide-align"; packageName = "wide-align"; @@ -27043,6 +28087,15 @@ let sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; }; }; + "win-fork-1.1.1" = { + name = "win-fork"; + packageName = "win-fork"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; + sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; + }; + }; "win-release-1.1.1" = { name = "win-release"; packageName = "win-release"; @@ -27106,6 +28159,15 @@ let sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5"; }; }; + "winreg-1.2.4" = { + name = "winreg"; + packageName = "winreg"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz"; + sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; + }; + }; "winser-0.1.6" = { name = "winser"; packageName = "winser"; @@ -27358,6 +28420,24 @@ let sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy"; }; }; + "ws-4.1.0" = { + name = "ws"; + packageName = "ws"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz"; + sha512 = "1ldy8hddsvy7lb045cx4jrnx09962j98zp7y16f64gkw8z99ww61w91mjhrm85bqpsf3b158yhfh6yf01g1a2zrgm6v9bkx87r7ys34"; + }; + }; + "ws-5.1.1" = { + name = "ws"; + packageName = "ws"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz"; + sha512 = "01whkym8fx8qjmx8s548zzw3ba05x8canb59v5yzidbwxdm7w1kfcfqhzzrxni1r9idqgla5ll5d3kp6fmk1sdn0k7d9lwvj2zarsvc"; + }; + }; "wtf-8-1.0.0" = { name = "wtf-8"; packageName = "wtf-8"; @@ -27421,15 +28501,6 @@ let sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; }; }; - "xml-char-classes-1.0.0" = { - name = "xml-char-classes"; - packageName = "xml-char-classes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz"; - sha1 = "64657848a20ffc5df583a42ad8a277b4512bbc4d"; - }; - }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -27737,6 +28808,15 @@ let sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; }; }; + "yaml-js-0.0.8" = { + name = "yaml-js"; + packageName = "yaml-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.0.8.tgz"; + sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; + }; + }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -27746,22 +28826,31 @@ let sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; }; }; - "yargs-10.0.3" = { + "yargs-10.1.2" = { name = "yargs"; packageName = "yargs"; - version = "10.0.3"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; - sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; + url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz"; + sha512 = "25gvc8vjalpbv69v0frmh10x203dsnl0jrnx8c2mww3qrxl69kms5ppzry3lp51lgaby524hc6qa80kgrz0zcdvas8flq26l33aix4a"; }; }; - "yargs-10.1.2" = { + "yargs-11.0.0" = { name = "yargs"; packageName = "yargs"; - version = "10.1.2"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz"; - sha512 = "25gvc8vjalpbv69v0frmh10x203dsnl0jrnx8c2mww3qrxl69kms5ppzry3lp51lgaby524hc6qa80kgrz0zcdvas8flq26l33aix4a"; + url = "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz"; + sha512 = "03n9lfnyx1dfj5sm811f3d96djsr6fixd5qi6cl6wj8xf0y01sgn7w3ynv5gn2vl30dwq5mz2hw5f522v8xbwc8m9h6nf8hqsa7wfj6"; + }; + }; + "yargs-11.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz"; + sha512 = "3j5awbfcbh8ik0kz01mycydpi1bz9fg70xc66lk1r1qvrs5x41i2w8nvgj0aip7z9vypcsxks76z75sz4lr6z3ida9c04inkvsbl19p"; }; }; "yargs-3.10.0" = { @@ -27881,6 +28970,15 @@ let sha512 = "0jyff04yy5xlrgvccky4f7phgp99lk2r1n7dk67hkb0picdjpa2ap27g4jrm94cw1d31vw8sh2b5cvnvga2w838bgh6l1kwld1bmzy8"; }; }; + "yargs-parser-9.0.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz"; + sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + }; + }; "yauzl-2.4.1" = { name = "yauzl"; packageName = "yauzl"; @@ -27926,22 +29024,22 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-2.0.5" = { + "yeoman-environment-2.0.6" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.5.tgz"; - sha512 = "3kfwj39dplgp9w79zmk9p5hm4dfw21304srx68f0hzxhak45iql4j8gzxj4l3q9p4jcmwf25ar0ak4sm57rzx46bv4z2f3q3vybpxgb"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.6.tgz"; + sha512 = "0z4544lfc7gzyp98fihqwi42p0j2dqwgrcl99i1d0b04qkslfv3im5r0xvp8rvapiqlwjg48b63kr5p1japcz3548wg445w7i6w2ccg"; }; }; - "yosay-2.0.1" = { + "yosay-2.0.2" = { name = "yosay"; packageName = "yosay"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz"; - sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4"; + url = "https://registry.npmjs.org/yosay/-/yosay-2.0.2.tgz"; + sha512 = "1n24pfz9fc1pd1p1cc2bl3jy6nb9xxbqadmzx3grims5xmk9r64xy98ybnim6wwz4kj3z91qc391v785s4876ki6749xcly7ngzmxba"; }; }; "zen-observable-0.5.2" = { @@ -27962,6 +29060,15 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; + "zero-fill-2.2.3" = { + name = "zero-fill"; + packageName = "zero-fill"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz"; + sha1 = "a3def06ba5e39ae644850bb4ca2ad4112b4855e9"; + }; + }; "zip-1.2.0" = { name = "zip"; packageName = "zip"; @@ -28004,10 +29111,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.11.0.tgz"; - sha512 = "0ix07a7vxyrlkplb3wxfpflg7yhcb9csh1k8410rjkrqmshviiiw8iwysf36936mrm5qz66v8mx5r9r7ky46zwi82mgdn66w0ag0865"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.12.0.tgz"; + sha512 = "1sk9p5lng0hwngvzbz28nwaamf73hyz4pa14fxzmwq11syjfiw8b3p95vig8sabn2zfwi8ddginhg5rvf10a5rgpq3cy608yy7qk21z"; }; dependencies = [ sources."JSV-4.0.2" @@ -28035,16 +29142,14 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."balanced-match-1.0.0" - sources."bindings-1.2.1" sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.2.1" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" - sources."core-js-2.5.3" - sources."deasync-0.1.12" + sources."core-js-2.5.5" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."ejs-2.5.7" @@ -28066,7 +29171,7 @@ in sources."home-or-tmp-2.0.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.5" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."is-3.2.1" sources."is-finite-1.0.2" sources."is-windows-1.0.2" @@ -28090,7 +29195,6 @@ in sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."ms-2.0.0" - sources."nan-2.9.2" sources."node.extend-2.0.0" sources."nomnom-1.8.1" sources."number-is-nan-1.0.1" @@ -28103,7 +29207,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."sax-0.5.8" sources."slash-1.0.0" sources."source-map-0.6.1" @@ -28144,7 +29248,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."binary-0.3.0" @@ -28156,7 +29260,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { @@ -28222,7 +29326,7 @@ in sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string_decoder-0.10.31" sources."stringstream-0.0.5" sources."tmp-0.0.28" @@ -28251,15 +29355,15 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.17"; + version = "0.10.18"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.17.tgz"; - sha1 = "e991dfa17dc5d7d91731180851fd9cbfbadf73c3"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.18.tgz"; + sha512 = "05k876g0s9ac53vrqqcn5h2l6s9ccawihr29gxvj8fib49qg2mhf1v52277r2wgcjxibj7vq2b3zp2jkp0vwd6d1pkv8alwf84ri6wc"; }; dependencies = [ sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.9.5" + sources."@types/node-8.10.4" sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" @@ -28276,7 +29380,7 @@ in sources."async-1.4.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."azure-arm-authorization-2.0.0" (sources."azure-arm-batch-0.3.0" // { dependencies = [ @@ -28326,7 +29430,7 @@ in sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" sources."azure-arm-iothub-1.0.1-preview" - sources."azure-arm-network-4.0.1" + sources."azure-arm-network-5.1.0" (sources."azure-arm-powerbiembedded-0.1.0" // { dependencies = [ sources."async-0.2.7" @@ -28433,16 +29537,17 @@ in sources."brace-expansion-1.1.11" sources."browserify-mime-1.2.9" sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-1.0.0" sources."caller-id-0.1.0" sources."caseless-0.12.0" sources."chalk-0.4.0" - sources."clone-1.0.3" + sources."clone-1.0.4" sources."co-4.6.0" sources."colors-1.1.2" sources."combined-stream-1.0.6" sources."commander-1.0.4" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ @@ -28523,7 +29628,7 @@ in sources."jws-3.1.4" sources."jwt-decode-2.2.0" sources."keypress-0.1.0" - (sources."kuduscript-1.0.15" // { + (sources."kuduscript-1.0.16" // { dependencies = [ sources."commander-1.1.1" sources."streamline-0.4.11" @@ -28537,8 +29642,8 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.21.0" - (sources."ms-rest-2.3.2" // { + sources."moment-2.22.0" + (sources."ms-rest-2.3.3" // { dependencies = [ sources."extend-3.0.1" sources."request-2.85.0" @@ -28546,12 +29651,12 @@ in sources."tunnel-0.0.5" ]; }) - (sources."ms-rest-azure-2.5.4" // { + (sources."ms-rest-azure-2.5.5" // { dependencies = [ - sources."@types/node-9.4.7" + sources."@types/node-9.6.2" (sources."adal-node-0.1.28" // { dependencies = [ - sources."@types/node-8.9.5" + sources."@types/node-8.10.4" ]; }) sources."async-2.6.0" @@ -28606,7 +29711,7 @@ in sources."boom-2.10.1" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."cryptiles-2.0.5" sources."extend-3.0.1" sources."form-data-1.0.1" @@ -28633,7 +29738,7 @@ in sources."asn1-0.1.11" ]; }) - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stack-trace-0.0.10" sources."stream-combiner-0.0.4" sources."streamline-0.10.17" @@ -28646,8 +29751,8 @@ in dependencies = [ sources."caseless-0.11.0" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."then-request-2.2.0" @@ -28692,10 +29797,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; }; buildInputs = globalBuildInputs; meta = { @@ -28718,7 +29823,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.0" - sources."bower-1.8.2" + sources."bower-1.8.4" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -28772,7 +29877,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."natives-1.1.1" + sources."natives-1.1.3" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -28848,26 +29953,27 @@ in sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-5.1.0" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" @@ -28900,29 +30006,18 @@ in sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.0.2" // { - dependencies = [ - sources."combine-source-map-0.7.2" - sources."concat-stream-1.5.2" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) + sources."insert-module-globals-7.0.6" sources."is-buffer-1.1.6" - sources."isarray-1.0.0" + sources."isarray-2.0.4" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - (sources."labeled-stream-splicer-2.0.0" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) + sources."labeled-stream-splicer-2.0.1" sources."lexical-scope-1.2.0" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.4" @@ -28932,7 +30027,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."module-deps-6.0.0" // { + (sources."module-deps-6.0.2" // { dependencies = [ sources."acorn-5.5.3" sources."minimist-1.2.0" @@ -28949,7 +30044,7 @@ in sources."path-platform-0.11.15" sources."pbkdf2-3.0.14" sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."querystring-0.2.0" @@ -28957,21 +30052,22 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.5" // { + (sources."readable-stream-2.3.6" // { dependencies = [ - sources."process-nextick-args-2.0.0" + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" - sources."sha.js-2.4.10" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."source-map-0.5.7" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" sources."string_decoder-1.0.3" (sources."subarg-1.0.0" // { @@ -28986,7 +30082,7 @@ in sources."to-arraybuffer-1.0.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" - sources."umd-3.0.2" + sources."umd-3.0.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -29033,7 +30129,7 @@ in sources."async-0.2.10" sources."aws-sign-0.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.0" + sources."base64-js-1.2.3" sources."bencode-2.0.0" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" @@ -29043,9 +30139,12 @@ in sources."bncode-0.5.3" sources."boom-0.3.8" sources."brace-expansion-1.1.11" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."bufferview-1.0.1" sources."builtin-modules-1.1.1" sources."bytebuffer-3.5.5" @@ -29062,10 +30161,10 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."cookie-jar-0.2.0" sources."core-util-is-1.0.2" sources."cryptiles-0.1.3" @@ -29097,7 +30196,7 @@ in sources."flatten-0.0.1" sources."forever-agent-0.2.0" sources."form-data-0.0.10" - (sources."fs-chunk-store-1.6.5" // { + (sources."fs-chunk-store-1.7.0" // { dependencies = [ sources."mkdirp-0.5.1" ]; @@ -29126,7 +30225,7 @@ in }) sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.7.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -29179,8 +30278,8 @@ in sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" - sources."peer-wire-protocol-0.7.0" - (sources."peer-wire-swarm-0.12.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; @@ -29197,9 +30296,9 @@ in sources."object-assign-4.1.1" sources."once-1.2.0" sources."parse-torrent-file-2.1.4" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."thirty-two-0.0.2" sources."thunky-1.0.2" sources."ultron-1.0.2" @@ -29218,7 +30317,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."plist-2.1.0" + sources."plist-3.0.1" sources."process-nextick-args-2.0.0" sources."promiscuous-0.6.0" sources."protobufjs-3.8.2" @@ -29226,7 +30325,8 @@ in sources."qap-3.3.1" sources."qs-0.5.6" sources."query-string-1.0.1" - sources."random-access-file-1.8.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -29255,8 +30355,8 @@ in sources."request-2.16.6" sources."rimraf-2.6.2" sources."router-0.6.2" - sources."run-parallel-1.1.7" - sources."run-series-1.1.4" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" sources."rusha-0.8.13" sources."rx-2.5.3" sources."safe-buffer-5.1.1" @@ -29282,8 +30382,8 @@ in (sources."srt2vtt-1.3.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."stream-transcoder-0.0.5" @@ -29304,7 +30404,7 @@ in ]; }) sources."torrent-piece-1.1.1" - (sources."torrent-stream-1.0.3" // { + (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.8.0" sources."debug-2.6.9" @@ -29330,12 +30430,8 @@ in sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" sources."ws-1.1.5" - (sources."xml2js-0.4.19" // { - dependencies = [ - sources."xmlbuilder-9.0.7" - ]; - }) - sources."xmlbuilder-8.2.2" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xspfr-0.3.1" sources."xtend-4.0.1" @@ -29400,13 +30496,13 @@ in sources."axios-0.17.1" sources."chalk-2.3.2" sources."cli-cursor-2.1.0" - sources."cli-spinners-1.1.0" + sources."cli-spinners-1.3.1" sources."cli-table2-0.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.2.1" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.4.1" @@ -29501,11 +30597,11 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.1" - sources."big-integer-1.6.26" + sources."big-integer-1.6.27" sources."block-stream-0.0.9" sources."bn.js-4.11.8" (sources."body-parser-1.18.2" // { @@ -29518,7 +30614,7 @@ in sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -29529,7 +30625,7 @@ in sources."isarray-1.0.0" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" @@ -29537,6 +30633,7 @@ in sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" sources."buffer-5.1.0" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" @@ -29551,7 +30648,7 @@ in sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."compressible-2.0.13" sources."compression-1.7.2" sources."concat-map-0.0.1" @@ -29581,14 +30678,13 @@ in (sources."cordova-js-4.2.2" // { dependencies = [ sources."acorn-5.5.3" - sources."isarray-0.0.1" + sources."isarray-2.0.4" ]; }) (sources."cordova-lib-8.0.0" // { dependencies = [ sources."acorn-4.0.13" sources."base64-js-1.2.3" - sources."combine-source-map-0.7.2" sources."glob-7.1.1" sources."hash-base-2.0.2" sources."isarray-1.0.0" @@ -29689,15 +30785,11 @@ in sources."hoek-2.16.3" sources."hosted-git-info-2.6.0" sources."htmlescape-1.1.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."imurmurhash-0.1.4" sources."indexof-0.0.1" sources."infinity-agent-2.0.3" @@ -29707,7 +30799,11 @@ in sources."init-package-json-1.10.3" sources."inline-source-map-0.6.2" sources."inquirer-0.10.1" - sources."insert-module-globals-7.0.2" + (sources."insert-module-globals-7.0.6" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) (sources."insight-0.8.4" // { dependencies = [ (sources."configstore-1.4.0" // { @@ -29734,11 +30830,11 @@ in sources."is-redirect-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-url-1.2.2" + sources."is-url-1.2.4" sources."isarray-0.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-parse-better-errors-1.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" @@ -29750,14 +30846,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."labeled-stream-splicer-2.0.0" + sources."labeled-stream-splicer-2.0.1" sources."latest-version-1.0.1" sources."lexical-scope-1.2.0" sources."lodash-3.10.1" sources."lodash._getnative-3.9.1" sources."lodash.debounce-3.1.1" sources."lodash.memoize-3.0.4" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."md5.js-1.3.4" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -29825,19 +30921,28 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" sources."read-package-json-2.0.13" - sources."readable-stream-2.3.5" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."registry-url-3.1.0" sources."repeating-1.1.3" sources."request-2.79.0" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" sources."ripemd160-2.0.1" @@ -29850,7 +30955,7 @@ in sources."send-0.16.2" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" - sources."sha.js-2.4.10" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."shelljs-0.5.3" @@ -29863,7 +30968,7 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29872,11 +30977,11 @@ in sources."stream-browserify-2.0.1" sources."stream-buffers-2.2.0" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-shift-1.0.0" sources."stream-splicer-2.0.0" sources."string-length-1.0.1" - sources."string.prototype.codepointat-0.2.0" + sources."string.prototype.codepointat-0.2.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" @@ -29896,7 +31001,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."umd-3.0.2" + sources."umd-3.0.3" sources."underscore-1.8.3" sources."unorm-1.4.1" sources."unpipe-1.0.0" @@ -29948,6 +31053,143 @@ in production = true; bypassCache = false; }; + create-react-app = nodeEnv.buildNodePackage { + name = "create-react-app"; + packageName = "create-react-app"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz"; + sha512 = "20yr02pv4sg07navr76mzp7fkna2n0ja4k08glrka1x021xm9fykay2gbyrjjkclavb12pkfs01j6y6mpd3yfsxvaiacsnkqz70hxmy"; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."balanced-match-1.0.0" + sources."block-stream-0.0.9" + sources."brace-expansion-1.1.11" + sources."buffer-from-0.1.2" + sources."builtins-1.0.3" + sources."chalk-1.1.3" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-4.0.2" + sources."debug-2.6.9" + sources."duplexer2-0.0.2" + sources."envinfo-3.4.2" + sources."escape-string-regexp-1.0.5" + sources."fs-extra-1.0.0" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."fstream-ignore-1.0.5" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + (sources."hyperquest-2.1.3" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."lru-cache-4.1.2" + sources."macos-release-1.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."once-1.4.0" + sources."os-name-2.0.1" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."readable-stream-1.1.14" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."string_decoder-0.10.31" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."tar-2.2.1" + (sources."tar-pack-3.4.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."minimist-0.0.8" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."through2-0.6.5" + sources."tmp-0.0.31" + sources."uid-number-0.0.6" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-name-3.0.0" + sources."which-1.3.0" + sources."win-release-1.1.1" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Create React apps with no build configuration."; + homepage = "https://github.com/facebookincubator/create-react-app#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + create-react-native-app = nodeEnv.buildNodePackage { + name = "create-react-native-app"; + packageName = "create-react-native-app"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-1.0.0.tgz"; + sha1 = "fc6046f4407bde2727ce0c4eb1354bb1a8c0f9e6"; + }; + dependencies = [ + sources."ansi-styles-3.2.1" + sources."babel-runtime-6.26.0" + sources."chalk-2.3.2" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."core-js-2.5.5" + sources."cross-spawn-5.1.0" + sources."escape-string-regexp-1.0.5" + sources."fs-extra-4.0.3" + sources."graceful-fs-4.1.11" + sources."has-flag-3.0.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."lru-cache-4.1.2" + sources."minimist-1.2.0" + sources."path-exists-3.0.0" + sources."pseudomap-1.0.2" + sources."regenerator-runtime-0.11.1" + sources."semver-5.5.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."source-map-0.5.7" + sources."source-map-support-0.4.18" + sources."supports-color-5.3.0" + sources."universalify-0.1.1" + sources."which-1.3.0" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Create React Native apps with no build configuration."; + homepage = https://github.com/react-community/create-react-native-app; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; csslint = nodeEnv.buildNodePackage { name = "csslint"; packageName = "csslint"; @@ -29957,7 +31199,7 @@ in sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; dependencies = [ - sources."clone-2.1.1" + sources."clone-2.1.2" sources."parserlib-1.1.1" ]; buildInputs = globalBuildInputs; @@ -29980,7 +31222,7 @@ in dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - sources."ansi-diff-stream-1.2.0" + sources."ansi-diff-stream-1.2.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" @@ -29996,7 +31238,7 @@ in sources."asynckit-0.4.0" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bencode-1.0.0" @@ -30016,13 +31258,18 @@ in sources."kind-of-4.0.0" ]; }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" - sources."bulk-write-stream-1.1.3" + sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" sources."chalk-2.3.2" + sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -30032,7 +31279,7 @@ in sources."colors-1.2.1" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" @@ -30048,13 +31295,16 @@ in (sources."dat-doctor-1.3.1" // { dependencies = [ sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."lru-2.0.1" + sources."multicast-dns-6.2.3" sources."pump-1.0.3" ]; }) sources."dat-encoding-5.0.1" - sources."dat-ignore-2.0.0" - (sources."dat-json-1.0.1" // { + sources."dat-ignore-2.1.1" + (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" sources."debug-2.6.9" @@ -30072,6 +31322,7 @@ in }) (sources."dat-node-3.5.8" // { dependencies = [ + sources."buffer-alloc-unsafe-0.1.1" sources."minimist-0.0.8" sources."process-nextick-args-1.0.7" sources."pump-1.0.3" @@ -30088,15 +31339,24 @@ in sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" sources."directory-index-html-2.1.0" - sources."discovery-channel-5.4.7" + (sources."discovery-channel-5.5.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) (sources."discovery-swarm-4.4.2" // { dependencies = [ + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) sources."thunky-0.1.0" ]; }) sources."dns-discovery-5.6.1" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" + sources."dns-packet-4.2.0" + sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" sources."duplexify-3.5.4" @@ -30134,12 +31394,12 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.3" // { + (sources."hypercore-6.13.0" // { dependencies = [ sources."varint-5.0.0" ]; }) - sources."hypercore-protocol-6.6.0" + sources."hypercore-protocol-6.6.4" (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" @@ -30201,11 +31461,12 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.3" + sources."multicast-dns-7.0.0" sources."multicb-1.2.2" + sources."multistream-2.1.0" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -30258,8 +31519,8 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.5" - sources."recursive-watch-1.1.3" + sources."readable-stream-2.3.6" + sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -30274,14 +31535,14 @@ in sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" - sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.4" + sources."sodium-javascript-0.5.5" + sources."sodium-native-2.1.5" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stack-trace-0.0.10" sources."status-logger-3.1.1" sources."stream-collector-1.0.1" @@ -30289,7 +31550,7 @@ in sources."stream-parser-0.3.1" sources."stream-shift-1.0.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-4.0.0" (sources."subcommand-2.1.0" // { @@ -30314,14 +31575,14 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uint64be-2.0.1" + sources."uint64be-2.0.2" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.6.2" + sources."utp-native-1.7.0" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -30349,10 +31610,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.10"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.10.tgz"; - sha512 = "04a373cxgb6b43gzymh1z71aas9c7nx9ap9q11bsc5jgrhx9q6b9204w08qrlrmgn72kj1csiadl8zlm5031097a8paczgzi9653k3m"; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.11.tgz"; + sha512 = "287rcz01q13rn3b83ds5kh05l176wag4p9vxxzrx3q63nhjmy6pvkxf1c1d7k0bd8r8nhqdldn5f1p50r4a1y1ybgy9zz0gqfbwb0d7"; }; dependencies = [ sources."minimist-1.2.0" @@ -30445,7 +31706,7 @@ in sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.9.2" + sources."nan-2.10.0" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -30540,8 +31801,8 @@ in (sources."fs-blob-store-5.2.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."inherits-2.0.3" @@ -30591,9 +31852,9 @@ in dependencies = [ sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."split2-2.2.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."through2-2.0.3" ]; }) @@ -30607,7 +31868,7 @@ in sources."pull-level-2.0.4" sources."pull-live-1.0.1" sources."pull-pushable-2.2.0" - sources."pull-stream-3.6.2" + sources."pull-stream-3.6.7" sources."pull-window-2.1.4" sources."pump-1.0.3" (sources."pumpify-1.4.0" // { @@ -30628,10 +31889,10 @@ in sources."string_decoder-0.10.31" (sources."tar-stream-1.5.5" // { dependencies = [ - sources."bl-1.2.1" + sources."bl-1.2.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."through-2.3.8" @@ -30661,10 +31922,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.7.tgz"; - sha512 = "07fvd6djvw50nbjimxyvl9jv86lky0wz6v5mrj8q4fgdpwgb70636bgsg13plj83jl33lk9mk7ixmidp85zikv4w4cwnli53hi4r8vi"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.8.tgz"; + sha512 = "3bahinp16ajfxy06ihrl022906h6zdxhsgmwh28k1p04blzqzgddbryx4l1a8ncg5fdjlj7ka9k3f6lam68fanjw4093hgyns7iclf4"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -30673,9 +31934,9 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.208.0" + sources."aws-sdk-2.223.1" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" @@ -30735,7 +31996,7 @@ in sources."safe-buffer-5.1.1" sources."sax-1.2.1" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stringstream-0.0.5" sources."through-2.3.8" sources."tough-cookie-2.3.4" @@ -30777,7 +32038,7 @@ in sources."async-each-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."binary-extensions-1.11.0" @@ -30806,7 +32067,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -30887,7 +32148,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."murmur-hash-js-1.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" (sources."node-elm-compiler-4.3.3" // { dependencies = [ sources."firstline-1.2.0" @@ -30918,7 +32179,7 @@ in }) ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -30930,12 +32191,12 @@ in sources."set-immediate-shim-1.0.1" sources."sntp-1.0.9" sources."split-1.0.1" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."supports-color-4.2.0" @@ -30972,7 +32233,7 @@ in sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z"; }; dependencies = [ - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" sources."arch-2.1.0" @@ -31013,7 +32274,7 @@ in sources."concat-map-0.0.1" sources."conf-1.4.0" sources."convert-source-map-1.5.1" - sources."core-js-2.5.3" + sources."core-js-2.5.5" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" @@ -31041,7 +32302,7 @@ in sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.21" (sources."import-jsx-1.3.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -31060,7 +32321,7 @@ in ]; }) sources."ink-text-input-1.1.1" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -31086,7 +32347,7 @@ in sources."log-update-2.3.0" sources."loose-envify-1.3.1" sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-obj-1.0.1" @@ -31143,6 +32404,7 @@ in sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" @@ -31171,7 +32433,7 @@ in sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."validate-npm-package-license-3.0.3" - sources."whatwg-fetch-2.0.3" + sources."whatwg-fetch-2.0.4" sources."which-1.3.0" sources."wrap-ansi-3.0.1" sources."write-file-atomic-2.3.0" @@ -31189,10 +32451,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.18.2"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.18.2.tgz"; - sha512 = "0mqvxkfl52068bfkpxjn14dgwfv4vv8w0a8pq2rw54bkbshfa2y6rpx122ssk3si3dy9298g68079ns1n7m0jrzgwca7a430ggj4bmb"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; + sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; }; dependencies = [ sources."acorn-5.5.3" @@ -31203,7 +32465,7 @@ in }) sources."ajv-5.5.2" sources."ajv-keywords-2.1.1" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -31218,6 +32480,7 @@ in }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-2.3.2" // { @@ -31234,7 +32497,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."debug-3.1.0" @@ -31246,11 +32509,11 @@ in sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.4" sources."esprima-4.0.0" - sources."esquery-1.0.0" + sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -31260,12 +32523,12 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.3.0" + sources."globals-11.4.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.21" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -31273,7 +32536,7 @@ in sources."inquirer-3.3.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" @@ -31308,7 +32571,8 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" + sources."regexpp-1.1.0" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" @@ -31317,6 +32581,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -31324,7 +32589,7 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" (sources."strip-ansi-4.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -31357,10 +32622,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.2.2"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.2.2.tgz"; - sha512 = "32h5278qn4pnlm2wl573mhg112diqpiazr07vxj0la2qwc3a1dlva5gsbyypnbnsis7r05kcx173qhb4wdl9w8spc7g3zk1575ciirc"; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.0.tgz"; + sha512 = "3ljw58bs13867i67mmw78w0a2ckn0cp5kffd878czkkpg7ahbgpxxq2jcqgjvqrrm2pava47a8fli1srxgzghwfqjq400shkakpqa71"; }; dependencies = [ sources."acorn-5.5.3" @@ -31371,7 +32636,7 @@ in }) sources."ajv-5.5.2" sources."ajv-keywords-2.1.1" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -31386,6 +32651,7 @@ in }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -31401,7 +32667,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."debug-3.1.0" @@ -31409,7 +32675,7 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.18.2" // { + (sources."eslint-4.19.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -31426,11 +32692,11 @@ in sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.4" sources."esprima-4.0.0" - sources."esquery-1.0.0" + sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -31440,12 +32706,12 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.3.0" + sources."globals-11.4.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.21" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -31453,7 +32719,7 @@ in sources."inquirer-3.3.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" @@ -31472,6 +32738,7 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" + sources."nanolru-1.0.0" sources."natural-compare-1.4.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -31489,9 +32756,10 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" + sources."regexpp-1.1.0" sources."require-uncached-1.0.3" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" @@ -31499,6 +32767,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -31506,7 +32775,7 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" (sources."supports-color-3.2.3" // { @@ -31570,7 +32839,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."builtin-modules-1.1.1" @@ -31579,7 +32848,7 @@ in sources."caseless-0.12.0" sources."chalk-1.1.3" sources."cli-cursor-1.0.2" - sources."cli-spinners-1.1.0" + sources."cli-spinners-1.3.1" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -31692,7 +32961,7 @@ in sources."qs-6.5.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.85.0" @@ -31706,8 +32975,8 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" - sources."string_decoder-1.0.3" + sources."sshpk-1.14.1" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -31746,7 +33015,7 @@ in sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; }; dependencies = [ - sources."bower-1.8.2" + sources."bower-1.8.4" sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" sources."glob-3.2.11" @@ -31794,7 +33063,7 @@ in sources."colors-1.0.3" ]; }) - sources."clone-1.0.3" + sources."clone-1.0.4" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -31855,7 +33124,7 @@ in sources."minimist-0.0.10" sources."mkdirp-0.5.1" sources."mute-stream-0.0.7" - sources."nan-2.9.2" + sources."nan-2.10.0" (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -31892,7 +33161,7 @@ in ]; }) sources."read-1.0.7" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -31905,7 +33174,7 @@ in sources."set-immediate-shim-1.0.1" sources."shush-1.0.0" sources."stack-trace-0.0.10" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-json-comments-0.1.3" sources."tape-2.3.3" sources."through-2.3.8" @@ -32062,7 +33331,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."msgpack-1.0.2" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."optimist-0.3.7" sources."pop-iterate-1.0.1" sources."promise-6.1.0" @@ -32126,7 +33395,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."atob-2.0.3" + sources."atob-2.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -32140,10 +33409,11 @@ in }) sources."beeper-1.1.1" sources."brace-expansion-1.1.11" - (sources."braces-2.3.1" // { + (sources."braces-2.3.2" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" ]; }) sources."cache-base-1.0.1" @@ -32153,7 +33423,7 @@ in sources."define-property-0.2.5" ]; }) - sources."clone-1.0.3" + sources."clone-1.0.4" sources."clone-stats-0.0.1" sources."collection-visit-1.0.0" sources."color-support-1.1.3" @@ -32187,11 +33457,7 @@ in ]; }) sources."fancy-log-1.3.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."fill-range-4.0.0" sources."find-index-0.1.1" (sources."findup-sync-2.0.0" // { dependencies = [ @@ -32230,8 +33496,8 @@ in (sources."gulp-util-3.0.8" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."gulplog-1.0.0" @@ -32280,7 +33546,6 @@ in sources."is-extendable-1.0.1" sources."is-number-4.0.0" sources."isarray-1.0.0" - sources."kind-of-3.2.2" ]; }) sources."lodash-1.0.2" @@ -32301,10 +33566,10 @@ in sources."lodash.template-3.6.2" sources."lodash.templatesettings-3.1.1" sources."lru-cache-2.7.3" - sources."make-iterator-1.0.0" + sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - (sources."micromatch-3.1.9" // { + (sources."micromatch-3.1.10" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -32327,7 +33592,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.9" - sources."natives-1.1.1" + sources."natives-1.1.3" sources."object-assign-3.0.0" sources."object-copy-0.1.0" sources."object-visit-1.0.1" @@ -32353,7 +33618,7 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -32377,10 +33642,14 @@ in }) (sources."snapdragon-node-2.1.1" // { dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ sources."kind-of-3.2.2" ]; }) - sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" sources."source-map-url-0.4.0" @@ -32562,29 +33831,27 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.10"; + version = "3.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.10.tgz"; - sha512 = "1kbzriri14n8z4mjn3a8azsvspj4lzdhzp3nsagkja15py5q35k4cf2py19x37bg0irifbi1k4jyn6nn952fqqm2sp0h6484w1j5kz5"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.14.tgz"; + sha512 = "0ai1rga42v2z8mbnn2kv238fzi9p2nxzj7l2b4csgcg4wddmh697h1s4kmwipqqfd6ppi6xd26m2ynipkjm63sj48kjb0sh73mz165i"; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.1.11" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."he-1.1.1" sources."lower-case-1.1.4" - sources."ncname-1.0.0" sources."no-case-2.3.2" sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.14" // { + (sources."uglify-js-3.3.20" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."upper-case-1.1.3" - sources."xml-char-classes-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -32598,14 +33865,14 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.19.1"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.19.1.tgz"; - sha512 = "11hpd51qzi8fms87q1xqwc347dp9mxhvzci2jlw94ayvs1v2n3iaqwdic1g1213k91xwzp52z6y17a08via45l936bgda3pi6zfbmsk"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.20.0.tgz"; + sha512 = "2a051r5s0p9ihcahqysmbjklhivms8rlv5zxxi7bqrxa3x8sqqpyhbjpl7z5k4263vmfkqj3qmzciz6kbyivgk3arz22jqfqsxczqn9"; }; dependencies = [ - sources."@ionic/cli-framework-0.1.2" - (sources."@ionic/cli-utils-1.19.1" // { + sources."@ionic/cli-framework-0.1.3" + (sources."@ionic/cli-utils-1.19.2" // { dependencies = [ sources."bytes-1.0.0" sources."debug-2.6.9" @@ -32613,14 +33880,15 @@ in sources."is-glob-3.1.0" sources."mime-1.4.1" sources."raw-body-1.1.7" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" sources."string_decoder-0.10.31" sources."yallist-3.0.2" ]; }) sources."@ionic/discover-0.4.0" sources."accepts-1.3.5" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" @@ -32637,7 +33905,7 @@ in sources."balanced-match-1.0.0" sources."basic-auth-1.1.0" sources."binary-extensions-1.11.0" - sources."bl-1.2.1" + sources."bl-1.2.2" sources."body-5.1.0" sources."body-parser-1.18.2" sources."brace-expansion-1.1.11" @@ -32688,9 +33956,13 @@ in sources."eventemitter3-1.2.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - sources."express-4.16.3" + (sources."express-4.16.3" // { + dependencies = [ + sources."setprototypeof-1.1.0" + ]; + }) sources."extend-3.0.1" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."extglob-0.3.2" sources."faye-websocket-0.10.0" sources."figures-2.0.0" @@ -32700,7 +33972,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."form-data-2.3.2" - sources."formidable-1.2.0" + sources."formidable-1.2.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-minipass-1.2.5" @@ -32711,11 +33983,7 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-parser-js-0.4.11" sources."http-proxy-1.16.2" sources."http-proxy-middleware-0.17.4" @@ -32768,12 +34036,12 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.2.1" + sources."minipass-2.2.4" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."netmask-1.0.6" @@ -32783,7 +34051,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."parse-glob-3.0.4" @@ -32805,8 +34073,13 @@ in ]; }) sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."readable-stream-2.3.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -32826,20 +34099,20 @@ in sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" sources."ssh-config-1.1.3" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-template-0.2.1" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."superagent-3.8.2" sources."supports-color-5.3.0" - (sources."tar-4.4.0" // { + (sources."tar-4.4.1" // { dependencies = [ sources."minimist-0.0.8" ]; @@ -33010,7 +34283,7 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -33035,12 +34308,12 @@ in sources."mz-2.7.0" sources."node-int64-0.4.0" sources."object-assign-4.1.1" - sources."object-hash-1.2.0" + sources."object-hash-1.3.0" sources."once-1.4.0" - sources."opentracing-0.14.1" + sources."opentracing-0.14.3" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" - sources."rxjs-5.5.6" + sources."rxjs-5.5.8" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."string-template-0.2.1" @@ -33051,7 +34324,7 @@ in sources."thriftrw-3.11.2" sources."type-detect-4.0.8" sources."typescript-2.7.2" - sources."vscode-jsonrpc-3.6.0" + sources."vscode-jsonrpc-3.6.1" (sources."vscode-languageserver-3.5.1" // { dependencies = [ sources."vscode-jsonrpc-3.5.0" @@ -33059,7 +34332,7 @@ in ]; }) sources."vscode-languageserver-protocol-3.5.1" - sources."vscode-languageserver-types-3.6.1" + sources."vscode-languageserver-types-3.7.1" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" sources."xorshift-0.2.1" @@ -33114,7 +34387,7 @@ in sources."graceful-fs-4.1.11" sources."js2xmlparser-3.0.0" sources."klaw-2.0.0" - sources."marked-0.3.17" + sources."marked-0.3.19" sources."minimist-0.0.8" sources."mkdirp-0.5.1" (sources."requizzle-0.2.1" // { @@ -33219,7 +34492,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -33327,7 +34600,7 @@ in sources."esprima-4.0.0" sources."extend-3.0.1" sources."form-data-2.3.2" - sources."formidable-1.2.0" + sources."formidable-1.2.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" @@ -33343,11 +34616,11 @@ in sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."superagent-3.8.2" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" @@ -33380,10 +34653,14 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."basic-auth-2.0.0" sources."bcrypt-pbkdf-1.0.1" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."boxen-1.3.0" sources."bytes-3.0.0" @@ -33391,6 +34668,7 @@ in sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."chalk-2.3.2" + sources."ci-info-1.1.3" sources."cli-boxes-1.0.0" sources."cliui-4.0.0" sources."co-4.6.0" @@ -33400,7 +34678,7 @@ in sources."combined-stream-1.0.6" sources."compressible-2.0.13" sources."compression-1.7.2" - sources."configstore-3.1.1" + sources."configstore-3.1.2" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -33435,7 +34713,7 @@ in sources."execa-0.7.0" (sources."express-4.16.3" // { dependencies = [ - sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" ]; }) (sources."express-urlrewrite-1.2.0" // { @@ -33464,11 +34742,7 @@ in sources."has-flag-3.0.0" sources."hawk-6.0.2" sources."hoek-4.2.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."import-lazy-2.1.0" @@ -33477,6 +34751,7 @@ in sources."ini-1.3.5" sources."invert-kv-1.0.0" sources."ipaddr.js-1.6.0" + sources."is-ci-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -33503,7 +34778,7 @@ in sources."lodash-4.17.5" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."media-typer-0.3.0" @@ -33547,8 +34822,13 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."request-2.85.0" @@ -33561,13 +34841,13 @@ in sources."serve-static-1.13.2" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."steno-0.4.4" sources."string-width-2.1.1" sources."stringstream-0.0.5" @@ -33584,7 +34864,7 @@ in sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" - sources."update-notifier-2.3.0" + sources."update-notifier-2.4.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" sources."uuid-3.2.1" @@ -33686,7 +34966,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" (sources."axios-0.15.3" // { dependencies = [ sources."debug-2.6.9" @@ -33706,7 +34986,11 @@ in sources."blob-0.0.4" sources."bluebird-3.5.1" sources."bn.js-4.11.8" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { @@ -33715,7 +34999,7 @@ in ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -33724,20 +35008,20 @@ in (sources."browserify-14.5.0" // { dependencies = [ sources."acorn-5.5.3" - sources."combine-source-map-0.7.2" sources."hash-base-2.0.2" - sources."isarray-0.0.1" + sources."isarray-2.0.4" sources."process-nextick-args-2.0.0" sources."source-map-0.5.7" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-5.1.0" + sources."buffer-from-1.0.0" sources."buffer-more-ints-0.0.2" sources."buffer-xor-1.0.3" sources."buildmail-4.0.1" @@ -33755,7 +35039,7 @@ in sources."combine-lists-1.0.1" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -33776,7 +35060,7 @@ in sources."content-type-1.0.4" sources."convert-source-map-1.1.3" sources."cookie-0.3.1" - sources."core-js-2.5.3" + sources."core-js-2.5.5" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.0" sources."create-hash-1.1.3" @@ -33886,11 +35170,7 @@ in sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" sources."htmlescape-1.1.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-proxy-1.16.2" sources."http-proxy-agent-1.0.0" sources."http-signature-1.2.0" @@ -33899,13 +35179,17 @@ in sources."https-browserify-1.0.0" sources."https-proxy-agent-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflection-1.10.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.0.2" + (sources."insert-module-globals-7.0.6" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) sources."ip-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -33936,7 +35220,7 @@ in sources."jsonpointer-4.0.1" sources."jsprim-1.4.1" sources."kind-of-3.2.2" - sources."labeled-stream-splicer-2.0.0" + sources."labeled-stream-splicer-2.0.1" sources."levn-0.3.0" sources."lexical-scope-1.2.0" sources."libbase64-0.1.0" @@ -33996,7 +35280,7 @@ in sources."mkdirp-0.5.1" sources."module-deps-4.1.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."netmask-1.0.6" sources."node-uuid-1.4.8" @@ -34069,11 +35353,17 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.5" // { + (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) sources."readdirp-2.1.0" @@ -34087,14 +35377,14 @@ in sources."request-2.85.0" sources."requestretry-1.13.0" sources."requires-port-1.0.0" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."rimraf-2.6.2" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" - sources."sha.js-2.4.10" + sources."setprototypeof-1.1.0" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."slack-node-0.2.0" @@ -34116,11 +35406,11 @@ in sources."socks-1.1.10" sources."socks-proxy-agent-2.1.1" sources."source-map-0.6.1" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" sources."streamroller-0.7.0" sources."string_decoder-1.0.3" @@ -34146,7 +35436,7 @@ in sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."ultron-1.1.1" - sources."umd-3.0.2" + sources."umd-3.0.3" sources."underscore-1.7.0" sources."unpipe-1.0.0" (sources."url-0.11.0" // { @@ -34329,7 +35619,7 @@ in sources."ms-0.7.1" ]; }) - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."stream-counter-0.2.0" sources."string_decoder-0.10.31" sources."tsscmp-1.0.5" @@ -34354,17 +35644,17 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.9.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.9.0.tgz"; - sha512 = "18aayy3dsb36bz3rrvbmg1pfvc4zsxqmiax923v738dlp7nw68y5gndi268db91cyzjxwpdimppqfb84z9ywi79mhlak4i73flxgazh"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.10.1.tgz"; + sha512 = "1y2pnipc1wsra1gdj77c4217xcycdwycda28drnh7sf43hcw4ang1x859i95m084v9ahcjysdb7ap2c3zk6ivm0q3way48k1xxnci57"; }; dependencies = [ sources."JSONStream-1.3.2" sources."add-stream-1.0.0" sources."align-text-0.1.4" sources."amdefine-1.0.1" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" @@ -34377,6 +35667,7 @@ in sources."async-1.5.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" sources."byline-5.0.0" sources."camelcase-1.2.1" @@ -34389,7 +35680,7 @@ in sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."cliui-2.1.0" - sources."clone-1.0.3" + sources."clone-1.0.4" sources."cmd-shim-2.0.2" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" @@ -34398,9 +35689,9 @@ in sources."command-join-2.0.0" sources."compare-func-1.3.2" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" - (sources."conventional-changelog-1.1.18" // { + (sources."conventional-changelog-1.1.23" // { dependencies = [ sources."camelcase-4.1.0" sources."map-obj-1.0.1" @@ -34408,8 +35699,8 @@ in ]; }) sources."conventional-changelog-angular-1.6.6" - sources."conventional-changelog-atom-0.2.4" - (sources."conventional-changelog-cli-1.3.16" // { + sources."conventional-changelog-atom-0.2.8" + (sources."conventional-changelog-cli-1.3.21" // { dependencies = [ sources."camelcase-2.1.1" sources."camelcase-keys-4.2.0" @@ -34432,22 +35723,22 @@ in sources."yargs-3.10.0" ]; }) - sources."conventional-changelog-codemirror-0.3.4" - (sources."conventional-changelog-core-2.0.5" // { + sources."conventional-changelog-codemirror-0.3.8" + (sources."conventional-changelog-core-2.0.10" // { dependencies = [ sources."meow-4.0.0" ]; }) - sources."conventional-changelog-ember-0.3.6" - sources."conventional-changelog-eslint-1.0.5" - sources."conventional-changelog-express-0.3.4" + sources."conventional-changelog-ember-0.3.11" + sources."conventional-changelog-eslint-1.0.9" + sources."conventional-changelog-express-0.3.6" sources."conventional-changelog-jquery-0.1.0" sources."conventional-changelog-jscs-0.1.0" - sources."conventional-changelog-jshint-0.3.4" - sources."conventional-changelog-preset-loader-1.1.6" - sources."conventional-changelog-writer-3.0.4" - sources."conventional-commits-filter-1.1.5" - sources."conventional-commits-parser-2.1.5" + sources."conventional-changelog-jshint-0.3.8" + sources."conventional-changelog-preset-loader-1.1.8" + sources."conventional-changelog-writer-3.0.9" + sources."conventional-commits-filter-1.1.6" + sources."conventional-commits-parser-2.1.7" (sources."conventional-recommended-bump-1.2.1" // { dependencies = [ sources."meow-3.7.0" @@ -34473,7 +35764,7 @@ in sources."error-ex-1.3.1" sources."escape-string-regexp-1.0.5" sources."execa-0.8.0" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."figures-2.0.0" sources."find-up-2.1.0" sources."fs-extra-4.0.3" @@ -34484,14 +35775,14 @@ in sources."get-port-3.2.0" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" - (sources."git-raw-commits-1.3.4" // { + (sources."git-raw-commits-1.3.6" // { dependencies = [ sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" ]; }) sources."git-remote-origin-url-2.0.0" - sources."git-semver-tags-1.3.4" + sources."git-semver-tags-1.3.6" sources."gitconfiglocal-1.0.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" @@ -34506,7 +35797,7 @@ in sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.21" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" sources."inflight-1.0.6" @@ -34538,7 +35829,7 @@ in sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."json-parse-better-errors-1.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonparse-1.3.1" @@ -34558,7 +35849,7 @@ in sources."lodash.templatesettings-4.1.0" sources."longest-1.0.1" sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-obj-1.0.1" @@ -34578,8 +35869,8 @@ in sources."minimist-0.0.8" sources."minimist-options-3.0.2" sources."mkdirp-0.5.1" - sources."modify-values-1.0.0" - sources."moment-2.21.0" + sources."modify-values-1.0.1" + sources."moment-2.22.0" sources."mute-stream-0.0.7" sources."normalize-package-data-2.4.0" sources."npm-run-path-2.0.2" @@ -34620,11 +35911,11 @@ in sources."pseudomap-1.0.2" sources."q-1.5.1" sources."quick-lru-1.1.0" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."read-cmd-shim-1.0.1" sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -34639,6 +35930,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" @@ -34654,7 +35946,7 @@ in sources."split-1.0.1" sources."split2-2.2.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" @@ -34751,7 +36043,7 @@ in sources."assert-plus-0.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" sources."boom-2.10.1" sources."caseless-0.12.0" @@ -34802,7 +36094,7 @@ in sources."safe-buffer-5.1.1" sources."sntp-1.0.9" sources."source-map-0.5.7" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -34865,10 +36157,10 @@ in sources."kind-of-4.0.0" ]; }) - sources."clone-2.1.1" + sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.1" + sources."cloneable-readable-1.1.2" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-util-is-1.0.2" @@ -34944,7 +36236,7 @@ in }) ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -34952,7 +36244,7 @@ in sources."replace-ext-1.0.0" sources."safe-buffer-5.1.1" sources."stream-shift-1.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-bom-2.0.0" sources."strip-bom-stream-1.0.0" sources."through2-2.0.3" @@ -34964,7 +36256,7 @@ in sources."vinyl-2.1.0" (sources."vinyl-fs-2.4.4" // { dependencies = [ - sources."clone-1.0.3" + sources."clone-1.0.4" sources."clone-stats-0.0.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" @@ -35011,7 +36303,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -35020,7 +36312,11 @@ in sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."blob-0.0.4" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { @@ -35057,16 +36353,8 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.1.6" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."entities-1.1.1" sources."escape-html-1.0.3" @@ -35075,7 +36363,7 @@ in sources."expand-range-1.8.2" (sources."express-4.16.3" // { dependencies = [ - sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" ]; }) sources."extend-3.0.1" @@ -35105,11 +36393,7 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."html-entities-1.2.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."indexof-0.0.1" @@ -35153,14 +36437,14 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" sources."object-component-0.0.3" sources."object.omit-2.0.1" sources."on-finished-2.3.0" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."parse-glob-3.0.4" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -35183,8 +36467,13 @@ in ]; }) sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."readable-stream-2.3.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -35195,24 +36484,21 @@ in sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."sntp-2.1.0" - (sources."socket.io-2.0.4" // { + (sources."socket.io-2.1.0" // { dependencies = [ + sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - (sources."socket.io-parser-3.1.3" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" - sources."string_decoder-1.0.3" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."to-array-0.1.4" sources."tough-cookie-2.3.4" @@ -35225,7 +36511,6 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-9.14.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" @@ -35300,11 +36585,7 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."http-auth-3.1.3" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-parser-js-0.4.11" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" @@ -35334,14 +36615,14 @@ in ]; }) sources."ms-0.7.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."object-assign-4.1.1" sources."object.omit-2.0.1" sources."on-finished-2.3.0" sources."on-headers-1.0.1" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."parse-glob-3.0.4" sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" @@ -35359,7 +36640,7 @@ in ]; }) sources."range-parser-1.2.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -35380,11 +36661,11 @@ in ]; }) sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."split-0.3.3" sources."statuses-1.3.1" sources."stream-combiner-0.0.4" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."through-2.3.8" sources."unix-crypt-td-js-1.0.0" sources."unpipe-1.0.0" @@ -35443,10 +36724,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz"; - sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; + sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -35494,7 +36775,7 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."core-util-is-1.0.2" @@ -35503,7 +36784,7 @@ in sources."esprima-4.0.0" sources."extend-3.0.1" sources."form-data-2.3.2" - sources."formidable-1.2.0" + sources."formidable-1.2.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" @@ -35520,11 +36801,11 @@ in sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."superagent-3.8.2" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" @@ -35576,17 +36857,18 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."config-chain-1.1.11" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -35639,7 +36921,7 @@ in sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" - sources."minipass-2.2.1" + sources."minipass-2.2.4" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ncp-0.4.2" @@ -35668,7 +36950,7 @@ in sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.10.1" sources."rimraf-2.2.8" @@ -35683,10 +36965,10 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" - sources."ssri-5.2.4" + sources."sshpk-1.14.1" + sources."ssri-5.3.0" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-3.1.15" @@ -35701,7 +36983,7 @@ in sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" - sources."walk-2.3.9" + sources."walk-2.3.13" sources."wide-align-1.1.2" sources."wrappy-1.0.2" sources."yallist-3.0.2" @@ -35733,7 +37015,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" @@ -35804,7 +37086,7 @@ in sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -35812,9 +37094,9 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" @@ -35877,7 +37159,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.1" @@ -35886,7 +37168,7 @@ in sources."yargs-1.3.3" ]; }) - sources."big-integer-1.6.26" + sources."big-integer-1.6.27" sources."block-stream-0.0.9" (sources."body-parser-1.18.2" // { dependencies = [ @@ -35959,11 +37241,7 @@ in sources."headless-0.1.7" sources."hoek-2.16.3" sources."hosted-git-info-2.6.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."iconv-lite-0.4.19" sources."indent-string-2.1.0" @@ -36007,7 +37285,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.39" sources."nopt-4.0.1" @@ -36043,11 +37321,16 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.81.0" @@ -36055,7 +37338,11 @@ in sources."safe-buffer-5.1.1" sources."semver-4.3.6" sources."send-0.16.2" - sources."serve-favicon-2.4.5" + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."serve-static-1.13.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.0" @@ -36065,14 +37352,14 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."statuses-1.4.0" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -36132,124 +37419,77 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.8.0.tgz"; - sha512 = "3z3mz92ya4hx3mg902sb6kwlkfz8dkc12hxcnp4sygbiahbiknzh585jrf9zf3bqd9xgsh9109dz5mqwjh268zl0nmn2n30fl7cqa49"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; + sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" - sources."caseless-0.12.0" sources."chownr-1.0.1" - sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."dashdash-1.14.1" + sources."debug-2.6.9" sources."deep-extend-0.4.2" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" - sources."fast-json-stable-stringify-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."getpass-0.1.7" sources."glob-7.1.2" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" - sources."http-signature-1.2.0" + sources."iconv-lite-0.4.21" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-fullwidth-code-point-1.0.0" - sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.2.1" + sources."minipass-2.2.4" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."needle-2.2.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" sources."npm-packlist-1.1.10" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" - sources."qs-6.5.1" - (sources."rc-1.2.5" // { + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.5" - sources."request-2.83.0" + sources."readable-stream-2.3.6" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" - sources."sshpk-1.13.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" - sources."stringstream-0.0.5" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.0" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."tar-4.4.1" sources."util-deprecate-1.0.2" - sources."uuid-3.2.1" - sources."verror-1.10.0" sources."wide-align-1.1.2" sources."wrappy-1.0.2" sources."yallist-3.0.2" @@ -36266,10 +37506,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.17.1"; + version = "1.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.1.tgz"; - sha512 = "2dnscknr22xf5r06zcrjz0ljaa2agbrnczh4faf42qsmqfpcng6znv6138nwyyr16fpqk28wgfab1bw3snrsyfz8pirmjl9ywdqibx7"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; + sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; }; dependencies = [ sources."abbrev-1.1.1" @@ -36290,7 +37530,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."atob-2.0.3" + sources."atob-2.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -36305,7 +37545,7 @@ in sources."binary-extensions-1.11.0" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.1" // { + (sources."braces-2.3.2" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" @@ -36316,7 +37556,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-2.3.2" - (sources."chokidar-2.0.2" // { + (sources."chokidar-2.0.3" // { dependencies = [ sources."debug-2.6.9" sources."define-property-1.0.0" @@ -36339,8 +37579,10 @@ in sources."kind-of-3.2.2" ]; }) + sources."kind-of-3.2.2" ]; }) + sources."ci-info-1.1.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -36352,7 +37594,7 @@ in sources."color-name-1.1.3" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."configstore-3.1.1" + sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" @@ -36407,6 +37649,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-ci-1.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" @@ -36429,13 +37672,13 @@ in sources."isobject-3.0.1" sources."kind-of-6.0.2" sources."latest-version-3.1.0" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" - (sources."micromatch-3.1.9" // { + (sources."micromatch-3.1.10" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -36455,7 +37698,7 @@ in sources."minimist-1.2.0" sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."nopt-1.0.10" sources."normalize-path-2.1.1" @@ -36478,8 +37721,8 @@ in sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."rc-1.2.5" - sources."readable-stream-2.3.5" + sources."rc-1.2.6" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" @@ -36509,11 +37752,7 @@ in sources."kind-of-4.0.0" ]; }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" @@ -36528,7 +37767,7 @@ in sources."static-extend-0.1.2" sources."stream-combiner-0.0.4" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -36562,7 +37801,7 @@ in }) sources."unzip-response-2.0.1" sources."upath-1.0.4" - sources."update-notifier-2.3.0" + sources."update-notifier-2.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" (sources."use-3.1.0" // { @@ -36612,18 +37851,19 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."basic-auth-2.0.0" sources."bcrypt-1.0.3" sources."bcrypt-pbkdf-1.0.1" sources."bcryptjs-2.4.3" - sources."bl-1.2.1" + sources."bl-1.2.2" sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boolbase-1.0.0" sources."boom-4.3.1" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."buildmail-2.0.0" sources."busboy-0.2.14" sources."bytes-3.0.0" @@ -36641,7 +37881,7 @@ in sources."commander-2.13.0" sources."commist-1.0.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -36685,7 +37925,6 @@ in sources."etag-1.8.1" (sources."express-4.16.2" // { dependencies = [ - sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) @@ -36728,11 +37967,7 @@ in sources."domelementtype-1.3.0" ]; }) - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."i18next-1.10.6" sources."i18next-client-1.10.3" @@ -36808,7 +38043,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.21.0" + sources."moment-2.22.0" sources."moment-timezone-0.5.14" (sources."mqtt-2.15.1" // { dependencies = [ @@ -36832,10 +38067,10 @@ in sources."needle-0.11.0" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.36" - (sources."node-red-node-email-0.1.24" // { + (sources."node-red-node-email-0.1.27" // { dependencies = [ sources."addressparser-1.0.1" - sources."clone-1.0.3" + sources."clone-1.0.4" sources."isarray-0.0.1" sources."minimist-0.0.10" sources."readable-stream-1.1.14" @@ -36843,13 +38078,13 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."node-red-node-feedparser-0.1.10" // { + (sources."node-red-node-feedparser-0.1.12" // { dependencies = [ sources."addressparser-1.0.1" ]; }) - sources."node-red-node-rbe-0.2.1" - sources."node-red-node-twitter-0.1.12" + sources."node-red-node-rbe-0.2.3" + sources."node-red-node-twitter-0.1.13" sources."nodemailer-1.11.0" sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" @@ -36891,9 +38126,15 @@ in sources."qs-6.5.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" - sources."readable-stream-2.3.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."setprototypeof-1.0.3" + ]; + }) + sources."rc-1.2.6" + sources."readable-stream-2.3.6" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."request-2.85.0" @@ -36906,19 +38147,19 @@ in sources."sentiment-2.1.0" sources."serve-static-1.13.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."smtp-connection-1.3.8" sources."sntp-2.1.0" sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" @@ -36945,7 +38186,7 @@ in sources."utf7-1.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uue-3.1.1" + sources."uue-3.1.2" sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" @@ -37049,7 +38290,7 @@ in sources."ms-0.1.0" sources."muri-0.3.1" sources."nan-1.0.0" - sources."natives-1.1.1" + sources."natives-1.1.3" (sources."net-ping-1.1.7" // { dependencies = [ sources."nan-2.3.5" @@ -37103,10 +38344,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.7.1"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz"; - sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g"; + url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; + sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; }; buildInputs = globalBuildInputs; meta = { @@ -37137,7 +38378,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" (sources."block-stream-0.0.9" // { @@ -37219,7 +38460,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" - sources."natives-1.1.1" + sources."natives-1.1.3" sources."ncp-0.4.2" sources."nopt-2.2.1" (sources."npm-registry-client-0.2.27" // { @@ -37246,7 +38487,7 @@ in sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.6.0" sources."rimraf-2.6.2" @@ -37256,9 +38497,9 @@ in sources."signal-exit-3.0.2" sources."slide-1.1.6" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" (sources."tar-0.1.17" // { @@ -37282,7 +38523,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."verror-1.10.0" - sources."walk-2.3.9" + sources."walk-2.3.13" sources."wide-align-1.1.2" sources."wrappy-1.0.2" ]; @@ -37325,6 +38566,7 @@ in sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" sources."chalk-1.1.3" + sources."ci-info-1.1.3" sources."cint-8.2.1" sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" @@ -37337,7 +38579,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" (sources."configstore-1.4.0" // { dependencies = [ @@ -37380,7 +38622,7 @@ in sources."has-flag-3.0.0" sources."hasbin-1.2.3" sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.21" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."infinity-agent-2.0.3" @@ -37391,6 +38633,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" sources."is-extendable-0.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" @@ -37423,7 +38666,7 @@ in sources."lodash.defaultsdeep-4.6.0" sources."lodash.mergewith-4.6.1" sources."longest-1.0.1" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."minimatch-3.0.4" @@ -37479,29 +38722,30 @@ in sources."pseudomap-1.0.2" sources."punycode-1.3.2" sources."querystring-0.2.0" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."rc-config-loader-2.0.1" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."require-directory-2.1.1" - sources."require-from-string-2.0.1" + sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."restore-cursor-1.0.1" sources."right-align-0.1.3" sources."run-async-2.3.0" sources."rx-4.1.0" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.5.0" sources."semver-diff-2.1.0" - sources."semver-utils-1.1.1" + sources."semver-utils-1.1.2" sources."set-blocking-2.0.0" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -37512,7 +38756,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - (sources."snyk-1.70.0" // { + (sources."snyk-1.71.0" // { dependencies = [ sources."async-0.9.2" sources."camelcase-3.0.0" @@ -37537,7 +38781,7 @@ in sources."debug-2.6.9" ]; }) - sources."snyk-go-plugin-1.4.5" + sources."snyk-go-plugin-1.4.6" sources."snyk-gradle-plugin-1.2.0" (sources."snyk-module-1.8.1" // { dependencies = [ @@ -37556,7 +38800,7 @@ in sources."debug-2.6.9" ]; }) - sources."snyk-python-plugin-1.5.6" + sources."snyk-python-plugin-1.5.7" (sources."snyk-resolve-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -37590,7 +38834,7 @@ in sources."stream-shift-1.0.0" sources."string-length-1.0.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" @@ -37610,14 +38854,14 @@ in sources."undefsafe-0.0.3" sources."unique-string-1.0.0" sources."unzip-response-1.0.2" - (sources."update-notifier-2.3.0" // { + (sources."update-notifier-2.4.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."boxen-1.3.0" sources."camelcase-4.1.0" sources."chalk-2.3.2" - sources."configstore-3.1.1" + sources."configstore-3.1.2" sources."dot-prop-4.2.0" sources."got-6.7.1" sources."is-fullwidth-code-point-2.0.0" @@ -37676,7 +38920,7 @@ in }; dependencies = [ sources."agent-base-4.2.0" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."boom-5.2.0" @@ -37705,7 +38949,7 @@ in sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."figures-2.0.0" sources."find-up-2.1.0" sources."get-caller-file-1.0.2" @@ -37714,8 +38958,8 @@ in sources."has-flag-3.0.0" sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" - sources."https-proxy-agent-2.2.0" - sources."iconv-lite-0.4.19" + sources."https-proxy-agent-2.2.1" + sources."iconv-lite-0.4.21" (sources."inquirer-3.3.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -37766,6 +39010,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" @@ -37811,10 +39056,10 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.28"; + version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.28.tgz"; - sha512 = "2brmnb1vvd9aw553ngmvfsf5m9wl3i4ykjlms5khiplp02hvsj7g8ag9vn6dznp1r1jg6v5w8sg77z5d23n354jfnfwpxpwl571d307"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.34.tgz"; + sha512 = "216lq2hh4mmk0lzkn381p0l4lgr84xmv6jdjc42yry1yb695zy7bs36n40dmvc81afgsnc51b1rcbn51438ysk59w0drrxd8x43zykr"; }; dependencies = [ sources."async-2.6.0" @@ -37833,10 +39078,10 @@ in sources."path-is-absolute-1.0.1" sources."pegjs-0.10.0" sources."vscode-jsonrpc-3.6.0" - sources."vscode-languageclient-4.0.0" + sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.6.1" + sources."vscode-languageserver-types-3.7.1" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -37849,13 +39094,14 @@ in production = true; bypassCache = false; }; - parsoid = nodeEnv.buildNodePackage { + "parsoid-git://github.com/abbradar/parsoid#stable" = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.8.0.tgz"; - sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9"; + src = fetchgit { + url = "git://github.com/abbradar/parsoid"; + rev = "89958e4f9e5583e0fdc5447103392e3d749d500b"; + sha256 = "1af850ced5bd8db64e20ad30bf59d99c14624efba3127759ca1c34088a0aadd7"; }; dependencies = [ sources."accepts-1.3.5" @@ -37871,15 +39117,16 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."babybird-0.0.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" - sources."bl-1.2.1" + sources."bl-1.2.2" sources."bluebird-3.5.1" (sources."body-parser-1.18.2" // { dependencies = [ sources."content-type-1.0.4" + sources."setprototypeof-1.0.3" ]; }) sources."boom-4.3.1" @@ -37903,10 +39150,10 @@ in sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" sources."content-disposition-0.5.2" - sources."content-type-git+https://github.com/wikimedia/content-type.git#master" + sources."content-type-git+https://github.com/wikimedia/content-type#master" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.5.3" + sources."core-js-2.5.5" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ @@ -37923,7 +39170,7 @@ in sources."dicer-0.2.5" sources."diff-1.4.0" sources."dnscache-1.0.1" - sources."dom-storage-2.0.2" + sources."dom-storage-2.1.0" sources."domino-1.0.30" sources."dtrace-provider-0.8.6" sources."ecc-jsbn-0.1.1" @@ -37937,7 +39184,7 @@ in (sources."express-4.16.3" // { dependencies = [ sources."content-type-1.0.4" - sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" ]; }) (sources."express-handlebars-3.0.0" // { @@ -37951,7 +39198,11 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."finalhandler-1.1.1" + (sources."finalhandler-1.1.1" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) sources."find-up-1.1.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -37974,11 +39225,7 @@ in sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" sources."hot-shots-4.8.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."inflight-1.0.6" @@ -38024,13 +39271,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mkdirp-0.5.1" - sources."moment-2.21.0" + sources."moment-2.22.0" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" - sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" + sources."negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" @@ -38047,7 +39294,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."path-type-1.1.0" - sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" + sources."pegjs-git+https://github.com/tstarling/pegjs#fork" sources."performance-now-2.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -38059,7 +39306,12 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-1.1.14" @@ -38073,19 +39325,23 @@ in sources."safe-json-stringify-1.1.0" sources."semver-5.5.0" sources."send-0.16.2" - sources."serve-favicon-2.4.5" + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."serve-static-1.13.2" - (sources."service-runner-2.5.2" // { + (sources."service-runner-2.3.0" // { dependencies = [ sources."isarray-1.0.0" sources."minimist-0.0.8" sources."ms-0.7.3" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."simplediff-0.1.1" sources."sntp-2.1.0" sources."source-map-0.4.4" @@ -38094,8 +39350,8 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" sources."string_decoder-0.10.31" @@ -38136,7 +39392,6 @@ in buildInputs = globalBuildInputs; meta = { description = "Mediawiki parser for the VisualEditor."; - homepage = "https://github.com/wikimedia/parsoid#readme"; license = "GPL-2.0+"; }; production = true; @@ -38163,7 +39418,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.26" + sources."big-integer-1.6.27" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" @@ -38174,9 +39429,12 @@ in sources."bplist-creator-0.0.6" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" @@ -38188,7 +39446,7 @@ in sources."code-point-at-1.1.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."consume-http-header-1.0.0" sources."consume-until-1.0.0" sources."core-util-is-1.0.2" @@ -38212,7 +39470,7 @@ in sources."figures-1.7.0" sources."find-up-1.1.2" sources."flatten-0.0.1" - (sources."fs-chunk-store-1.6.5" // { + (sources."fs-chunk-store-1.7.0" // { dependencies = [ sources."mkdirp-0.5.1" ]; @@ -38239,7 +39497,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.7.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -38299,8 +39557,8 @@ in sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" - sources."peer-wire-protocol-0.7.0" - (sources."peer-wire-swarm-0.12.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; @@ -38311,23 +39569,24 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.0" sources."pump-1.0.3" - sources."random-access-file-1.8.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" sources."restore-cursor-1.0.1" sources."reverse-http-1.3.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."run-parallel-1.1.7" - sources."run-series-1.1.4" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" sources."rusha-0.8.13" sources."rx-4.1.0" sources."safe-buffer-5.1.1" @@ -38353,7 +39612,7 @@ in sources."stream-buffers-2.2.0" sources."string-width-1.0.2" sources."string2compact-1.2.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -38368,12 +39627,12 @@ in sources."bencode-0.8.0" sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."torrent-piece-1.1.1" - (sources."torrent-stream-1.0.3" // { + (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.7.0" sources."end-of-stream-0.1.5" @@ -38448,9 +39707,12 @@ in sources."body-parser-1.13.3" sources."boom-0.3.8" sources."brace-expansion-1.1.11" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."bytes-2.1.0" sources."callsite-1.0.0" sources."combined-stream-0.0.7" @@ -38530,7 +39792,7 @@ in sources."form-data-0.0.10" sources."forwarded-0.1.2" sources."fresh-0.3.0" - (sources."fs-chunk-store-1.6.5" // { + (sources."fs-chunk-store-1.7.0" // { dependencies = [ sources."mkdirp-0.5.1" ]; @@ -38606,8 +39868,8 @@ in sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" sources."pause-0.1.0" - sources."peer-wire-protocol-0.7.0" - (sources."peer-wire-swarm-0.12.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; @@ -38617,7 +39879,8 @@ in sources."proxy-addr-1.0.10" sources."pump-1.0.3" sources."qs-6.5.1" - sources."random-access-file-1.8.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" @@ -38644,8 +39907,8 @@ in }) sources."rimraf-2.6.2" sources."rndm-1.2.0" - sources."run-parallel-1.1.7" - sources."run-series-1.1.4" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" sources."rusha-0.8.13" sources."safe-buffer-5.1.1" (sources."send-0.13.0" // { @@ -38690,7 +39953,7 @@ in ]; }) sources."speedometer-0.1.4" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."stream-counter-0.2.0" sources."string2compact-1.2.2" sources."string_decoder-0.10.31" @@ -38699,19 +39962,17 @@ in sources."to-array-0.1.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" - (sources."torrent-stream-1.0.3" // { + (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.8.0" - sources."debug-2.6.9" sources."end-of-stream-0.1.5" sources."isarray-1.0.0" sources."minimist-1.2.0" sources."mkdirp-0.3.5" - sources."ms-2.0.0" sources."once-1.3.3" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."ultron-1.1.1" ]; }) @@ -38767,7 +40028,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -38839,7 +40100,7 @@ in sources."request-progress-2.0.1" sources."rimraf-2.6.2" sources."sntp-1.0.9" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -38927,7 +40188,7 @@ in sources."astw-2.2.0" sources."async-1.5.2" sources."async-each-1.0.1" - sources."atob-2.0.3" + sources."atob-2.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -38943,13 +40204,13 @@ in sources."binary-extensions-1.11.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" - (sources."braces-2.3.1" // { + (sources."braces-2.3.2" // { dependencies = [ sources."is-extendable-0.1.1" ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -38958,18 +40219,17 @@ in (sources."browserify-13.3.0" // { dependencies = [ sources."acorn-5.5.3" - sources."combine-source-map-0.7.2" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" ]; }) sources."hash-base-2.0.2" - sources."isarray-0.0.1" + sources."isarray-2.0.4" sources."process-nextick-args-2.0.0" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cache-api-3.0.1" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" @@ -38983,11 +40243,12 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" sources."cached-path-relative-1.0.1" - (sources."chokidar-2.0.2" // { + (sources."chokidar-2.0.3" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" @@ -39006,7 +40267,7 @@ in sources."combine-source-map-0.8.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" @@ -39065,12 +40326,16 @@ in sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.0.2" + (sources."insert-module-globals-7.0.6" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -39090,13 +40355,13 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."kind-of-6.0.2" - sources."labeled-stream-splicer-2.0.0" + sources."labeled-stream-splicer-2.0.1" sources."lexical-scope-1.2.0" sources."lodash.memoize-3.0.4" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.4" - sources."micromatch-3.1.9" + sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" sources."mime-1.6.0" sources."minimalistic-assert-1.0.0" @@ -39107,7 +40372,7 @@ in sources."module-deps-4.1.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."neo-async-2.5.0" (sources."node-static-0.7.10" // { @@ -39145,10 +40410,10 @@ in sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.5" // { + (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" ]; }) sources."readdirp-2.1.0" @@ -39156,7 +40421,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."rimraf-2.2.8" @@ -39165,7 +40430,7 @@ in sources."safe-regex-1.1.0" sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" - sources."sha.js-2.4.10" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" (sources."snapdragon-0.8.2" // { @@ -39179,11 +40444,7 @@ in sources."kind-of-4.0.0" ]; }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" @@ -39197,7 +40458,7 @@ in sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" sources."string-stream-0.0.7" sources."string_decoder-0.10.31" @@ -39214,7 +40475,7 @@ in sources."tree-kill-1.2.0" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" - sources."umd-3.0.2" + sources."umd-3.0.3" (sources."union-value-1.0.0" // { dependencies = [ sources."set-value-0.4.3" @@ -39270,6 +40531,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."kind-of-3.2.2" ]; }) sources."which-1.3.0" @@ -39306,7 +40568,6 @@ in }) sources."ajv-4.11.8" sources."align-text-0.1.4" - sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" @@ -39316,15 +40577,19 @@ in sources."assert-plus-0.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."basic-auth-2.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bindings-1.2.1" - sources."bl-1.2.1" - sources."body-parser-1.18.2" + sources."bl-1.2.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-2.10.1" sources."bufferutil-2.0.1" sources."bytes-3.0.0" @@ -39333,12 +40598,12 @@ in sources."center-align-0.1.3" sources."character-parser-2.2.0" sources."chownr-1.0.1" - sources."clean-css-3.4.28" + sources."clean-css-4.1.11" sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -39346,7 +40611,7 @@ in sources."cookie-0.3.1" sources."cookie-parser-1.4.3" sources."cookie-signature-1.0.6" - sources."core-js-2.5.3" + sources."core-js-2.5.5" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."dashdash-1.14.1" @@ -39370,7 +40635,7 @@ in sources."expand-template-1.1.0" (sources."express-4.16.3" // { dependencies = [ - sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" ]; }) sources."extend-3.0.1" @@ -39385,18 +40650,13 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."graceful-fs-4.1.11" - sources."graceful-readlink-1.0.1" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-1.0.1" sources."has-unicode-2.0.1" sources."hawk-3.1.3" sources."hoek-2.16.3" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."httpolyglot-0.1.2" sources."iconv-lite-0.4.19" @@ -39476,21 +40736,15 @@ in sources."promise-7.3.1" sources."proxy-addr-2.0.3" sources."prr-1.0.1" - (sources."pug-2.0.1" // { + (sources."pug-2.0.3" // { dependencies = [ sources."acorn-4.0.13" - sources."commander-2.8.1" - sources."source-map-0.4.4" ]; }) sources."pug-attrs-2.0.3" sources."pug-code-gen-2.0.1" sources."pug-error-1.3.2" - (sources."pug-filters-3.0.1" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."pug-filters-3.1.0" sources."pug-lexer-4.0.0" sources."pug-linker-3.0.5" sources."pug-load-2.0.11" @@ -39503,13 +40757,18 @@ in sources."qs-6.5.1" sources."qtdatastream-0.7.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" - sources."readable-stream-2.3.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" + sources."readable-stream-2.3.6" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" sources."request-2.81.0" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" sources."semver-5.5.0" @@ -39523,19 +40782,19 @@ in }) sources."serve-static-1.13.2" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."simple-get-1.4.3" sources."sntp-1.0.9" sources."source-map-0.5.7" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" @@ -39591,7 +40850,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -39600,7 +40859,7 @@ in sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" sources."graceful-fs-4.1.11" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.21" sources."inflight-1.0.6" sources."inherits-2.0.3" (sources."jstransform-10.1.0" // { @@ -39616,6 +40875,7 @@ in sources."private-0.1.8" sources."q-1.5.1" sources."recast-0.11.23" + sources."safer-buffer-2.1.2" sources."source-map-0.5.7" sources."wrappy-1.0.2" ]; @@ -39708,7 +40968,7 @@ in sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."buffer-crc32-0.2.1" @@ -39811,7 +41071,7 @@ in sources."sax-1.2.4" sources."send-0.1.4" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" @@ -39852,17 +41112,12 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.5.3.tgz"; - sha512 = "1jywhr5vn5y47j4zh87vgh214j2zyd28j9jzcqdp7i9wdmv2v1i5yy3zfz7bb620md2v5fvz9x7ca6i1n9vihvg8xgm1mpijvnv3i3g"; + url = "https://registry.npmjs.org/serve/-/serve-6.5.4.tgz"; + sha512 = "3dhp8p2c9i86bwaxlxxlhml4p7ps2ph09pap35g5ivy0ndxv6av87axckmm4g7dwvz6c8y6mvc8c0v93m9hlk2rqm07y211621b1hhh"; }; dependencies = [ - (sources."@zeit/check-updates-1.1.0" // { - dependencies = [ - sources."chalk-2.3.0" - ]; - }) sources."accepts-1.3.5" sources."address-1.0.3" sources."align-text-0.1.4" @@ -39882,7 +41137,6 @@ in sources."boxen-1.3.0" sources."bytes-3.0.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" (sources."chalk-2.3.2" // { dependencies = [ @@ -39901,24 +41155,15 @@ in sources."color-name-1.1.3" sources."compressible-2.0.13" sources."compression-1.7.2" - sources."configstore-3.1.1" sources."content-type-1.0.4" - sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" sources."dargs-5.1.0" sources."debug-2.6.9" sources."decamelize-1.2.0" sources."deep-extend-0.4.2" sources."depd-1.1.1" sources."destroy-1.0.4" - (sources."detect-port-1.2.2" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."dot-prop-4.2.0" - sources."duplexer3-0.1.4" + sources."detect-port-1.2.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."escape-html-1.0.3" @@ -39929,52 +41174,38 @@ in sources."fresh-0.5.2" sources."fs-extra-5.0.0" sources."get-stream-3.0.0" - sources."global-dirs-0.1.1" - sources."got-6.7.1" sources."graceful-fs-4.1.11" (sources."handlebars-4.0.11" // { dependencies = [ sources."camelcase-1.2.1" - sources."minimist-0.0.10" sources."wordwrap-0.0.2" ]; }) sources."has-flag-2.0.0" sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ip-1.1.5" sources."is-buffer-1.1.6" sources."is-fullwidth-code-point-2.0.0" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."is-wsl-1.1.0" sources."isexe-2.0.0" sources."jsonfile-4.0.0" sources."kind-of-3.2.2" - sources."latest-version-3.1.0" sources."lazy-cache-1.0.4" sources."lodash-4.17.5" sources."longest-1.0.1" - sources."lowercase-keys-1.0.0" sources."lru-cache-4.1.2" - sources."make-dir-1.2.0" sources."micro-9.1.0" sources."micro-compress-1.0.0" sources."mime-1.4.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."minimist-1.2.0" + sources."minimist-0.0.10" sources."mri-1.1.0" - sources."ms-2.1.1" + sources."ms-2.0.0" sources."negotiator-0.6.1" sources."node-version-1.1.0" sources."npm-run-path-2.0.2" @@ -39984,28 +41215,24 @@ in sources."opn-5.2.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" - sources."package-json-4.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-type-3.0.0" sources."pify-3.0.0" sources."pkginfo-0.4.1" - sources."prepend-http-1.0.4" sources."pseudomap-1.0.2" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" - sources."semver-5.5.0" - sources."semver-diff-2.1.0" (sources."send-0.16.2" // { dependencies = [ sources."depd-1.1.2" - sources."ms-2.0.0" + sources."statuses-1.4.0" ]; }) sources."setprototypeof-1.0.3" @@ -40013,7 +41240,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."source-map-0.4.4" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-similarity-1.2.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -40021,26 +41248,24 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-4.5.0" sources."term-size-1.2.0" - sources."timed-out-4.0.1" (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."uglify-to-browserify-1.0.2" - sources."unique-string-1.0.0" sources."universalify-0.1.1" sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.3.0" - sources."url-parse-lax-1.0.0" + (sources."update-check-1.2.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."vary-1.1.2" sources."which-1.3.0" sources."widest-line-2.0.0" sources."window-size-0.1.0" sources."wordwrap-0.0.3" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" sources."yargs-3.10.0" ]; @@ -40073,7 +41298,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" @@ -40097,7 +41322,7 @@ in }) sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -40160,11 +41385,7 @@ in sources."entities-1.0.0" ]; }) - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."indexof-0.0.1" @@ -40211,7 +41432,12 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."read-1.0.7" sources."readable-stream-1.1.14" sources."request-2.85.0" @@ -40241,7 +41467,7 @@ in sources."socket.io-client-1.0.6" sources."socket.io-parser-2.2.0" sources."split-0.3.3" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."statuses-1.4.0" sources."stream-combiner-0.0.4" sources."string_decoder-0.10.31" @@ -40293,7 +41519,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" (sources."body-parser-1.18.2" // { @@ -40301,7 +41527,12 @@ in sources."bytes-3.0.0" sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) ]; }) sources."boom-4.3.1" @@ -40318,7 +41549,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."compressible-2.0.13" (sources."compression-1.7.2" // { dependencies = [ @@ -40387,9 +41618,10 @@ in sources."highlight.js-8.9.1" sources."hoek-4.2.1" sources."htmlparser2-3.9.2" - (sources."http-errors-1.6.2" // { + (sources."http-errors-1.6.3" // { dependencies = [ - sources."depd-1.1.1" + sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) sources."http-signature-1.2.0" @@ -40428,10 +41660,10 @@ in sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.21.0" + sources."moment-2.22.0" sources."ms-2.0.0" sources."mv-2.1.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."number-is-nan-1.0.1" @@ -40444,7 +41676,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" - sources."postcss-6.0.19" + sources."postcss-6.0.21" sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" @@ -40459,7 +41691,7 @@ in }) (sources."render-readme-1.3.1" // { dependencies = [ - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."source-map-0.6.1" ]; }) @@ -40488,9 +41720,9 @@ in sources."source-map-0.1.43" sources."sprintf-js-1.0.3" sources."srcset-1.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."statuses-1.3.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."supports-color-5.3.0" sources."through-2.3.8" @@ -40546,11 +41778,11 @@ in sources."lodash-4.17.5" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -40592,7 +41824,7 @@ in sources."ecc-jsbn-0.1.1" sources."escape-regexp-component-1.0.2" sources."extsprintf-1.2.0" - sources."formidable-1.2.0" + sources."formidable-1.2.1" sources."glob-6.0.4" sources."http-signature-0.11.0" sources."inflight-1.0.6" @@ -40609,7 +41841,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -40619,7 +41851,7 @@ in sources."precond-0.2.3" sources."process-nextick-args-2.0.0" sources."qs-3.1.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" @@ -40673,7 +41905,7 @@ in ]; }) sources."stream-transform-0.1.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -40701,10 +41933,10 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; - sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; + sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; }; dependencies = [ sources."accepts-1.3.5" @@ -40721,17 +41953,9 @@ in sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."cookie-0.3.1" - sources."debug-2.6.9" - (sources."engine.io-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.1.6" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."debug-3.1.0" + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."has-binary2-1.0.2" sources."has-cors-1.1.0" @@ -40746,15 +41970,10 @@ in sources."parseuri-0.0.5" sources."safe-buffer-5.1.1" sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - (sources."socket.io-parser-3.1.3" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."to-array-0.1.4" sources."ultron-1.1.1" - sources."uws-9.14.0" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" @@ -40800,7 +42019,7 @@ in sources."hashring-3.2.0" sources."keypress-0.1.0" sources."modern-syslog-1.1.2" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."sequence-2.2.1" sources."simple-lru-cache-0.0.2" sources."winser-0.1.6" @@ -40921,7 +42140,7 @@ in sources."domelementtype-1.3.0" sources."domutils-1.5.1" sources."entities-1.1.1" - sources."es-abstract-1.10.0" + sources."es-abstract-1.11.0" sources."es-to-primitive-1.1.1" sources."esprima-4.0.0" sources."foreach-2.0.5" @@ -40985,10 +42204,10 @@ in sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" sources."prr-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."resolve-from-2.0.0" sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."tapable-0.2.8" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -41022,7 +42241,7 @@ in sources."async-2.1.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" sources."boom-2.10.1" sources."camelcase-1.2.1" @@ -41033,7 +42252,7 @@ in sources."co-4.6.0" sources."colors-1.1.2" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" @@ -41128,7 +42347,7 @@ in sources."source-map-0.1.32" sources."source-map-support-0.3.2" sources."sprintf-0.1.5" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -41169,10 +42388,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.7.2"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; - sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; + sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; }; buildInputs = globalBuildInputs; meta = { @@ -41206,9 +42425,11 @@ in sources."bluebird-3.5.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" + sources."ci-info-1.1.3" sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" (sources."cli-truncate-1.1.0" // { @@ -41217,14 +42438,14 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."clone-1.0.3" + sources."clone-1.0.4" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."columnify-1.5.4" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" - sources."configstore-3.1.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -41261,9 +42482,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."is-absolute-0.2.6" sources."is-arrayish-0.2.1" + sources."is-ci-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -41286,7 +42508,7 @@ in sources."lockfile-1.0.3" sources."log-update-1.0.2" sources."loose-envify-1.3.1" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."make-error-1.3.4" @@ -41319,12 +42541,12 @@ in sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - (sources."rc-1.2.5" // { + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."restore-cursor-1.0.1" @@ -41339,7 +42561,7 @@ in sources."sort-keys-1.1.2" sources."string-template-1.0.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" @@ -41352,7 +42574,7 @@ in sources."touch-1.0.0" sources."tough-cookie-2.3.4" sources."typedarray-0.0.6" - sources."typescript-2.7.2" + sources."typescript-2.8.1" (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" @@ -41361,7 +42583,7 @@ in sources."unc-path-regex-0.1.2" sources."unique-string-1.0.0" sources."unzip-response-2.0.1" - (sources."update-notifier-2.3.0" // { + (sources."update-notifier-2.4.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.3.2" @@ -41394,19 +42616,19 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.14"; + version = "3.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz"; - sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; + sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; }; dependencies = [ - sources."commander-2.14.1" + sources."commander-2.15.1" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = http://lisperator.net/uglifyjs; + homepage = "https://github.com/mishoo/UglifyJS2#readme"; license = "BSD-2-Clause"; }; production = true; @@ -41415,10 +42637,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.12"; + version = "1.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.12.tgz"; - sha512 = "2g1lac2bgp7zgrl4jvmapyqy51rvzmphx3nlvy1hmy6ld2k5dycmhbv6qqq740ypdi57wd7vch5nlrf2w833mbk54rglhq80ly7vwk6"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.18.tgz"; + sha512 = "3mdb4qpdmm6n3c34z8pkrn3yx2nxyvqszw3rb24lcf8mbpbx2d534bpb3mcg2lg4lxsysijp652pkwbxd492sm7z9bz296r8cgppmqm"; }; dependencies = [ sources."abbrev-1.1.1" @@ -41436,7 +42658,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -41446,24 +42668,30 @@ in sources."blob-0.0.4" sources."bluebird-3.5.1" sources."blueimp-md5-2.10.0" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."bytes-3.0.0" sources."callsite-1.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" + sources."charenc-0.0.2" (sources."cliui-4.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) - sources."clone-2.1.1" + sources."clone-2.1.2" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."color-2.0.1" + sources."color-3.0.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."color-string-1.5.2" @@ -41473,7 +42701,7 @@ in sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -41485,6 +42713,7 @@ in sources."crc-3.4.4" sources."cross-spawn-5.1.0" sources."crossroads-0.12.2" + sources."crypt-0.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" @@ -41510,16 +42739,8 @@ in sources."editions-1.3.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.1.6" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -41527,7 +42748,7 @@ in sources."execa-0.7.0" (sources."express-4.16.3" // { dependencies = [ - sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" ]; }) sources."express-session-1.15.6" @@ -41548,7 +42769,7 @@ in sources."gauge-2.7.4" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" - sources."getmac-1.2.1" + sources."getmac-1.4.1" sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" @@ -41562,11 +42783,7 @@ in sources."hoek-4.2.1" sources."hogan.js-3.0.2" sources."hosted-git-info-2.6.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."ignore-3.3.7" @@ -41577,6 +42794,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.6.0" sources."is-arrayish-0.3.1" + sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" @@ -41604,7 +42822,7 @@ in sources."locate-path-2.0.0" sources."lodash-4.17.5" sources."lru-cache-4.1.2" - sources."lsmod-1.0.0" + sources."md5-2.2.1" sources."media-typer-0.3.0" sources."mem-1.1.0" (sources."memorystore-1.6.0" // { @@ -41621,13 +42839,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.20.1" + sources."moment-2.22.0" sources."ms-2.0.0" sources."negotiator-0.6.1" - sources."node-cache-4.1.1" + sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" - sources."npm-5.6.0" + sources."npm-6.0.0-next.0" sources."npm-package-arg-6.0.0" (sources."npm-registry-client-8.5.1" // { dependencies = [ @@ -41636,8 +42854,8 @@ in sources."extend-3.0.1" sources."form-data-2.3.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."npm-run-path-2.0.2" @@ -41679,13 +42897,18 @@ in sources."qs-6.5.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - (sources."raven-2.3.0" // { + (sources."raven-2.4.2" // { dependencies = [ sources."uuid-3.0.0" ]; }) - sources."raw-body-2.3.2" - (sources."rc-1.2.5" // { + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -41698,11 +42921,11 @@ in sources."retry-0.10.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" + sources."semver-5.5.0" sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -41711,27 +42934,24 @@ in sources."slide-1.1.6" sources."snapsvg-0.5.1" sources."sntp-2.1.0" - (sources."socket.io-2.0.4" // { + (sources."socket.io-2.1.0" // { dependencies = [ sources."component-emitter-1.2.1" + sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - (sources."socket.io-parser-3.1.3" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" - sources."ssri-5.2.4" + sources."sshpk-1.14.1" + sources."ssri-5.3.0" sources."stack-trace-0.0.9" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."stringstream-0.0.5" @@ -41747,10 +42967,10 @@ in sources."delayed-stream-1.0.0" sources."extend-3.0.1" sources."form-data-2.3.2" - sources."formidable-1.2.0" + sources."formidable-1.2.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) (sources."temp-0.8.3" // { @@ -41773,12 +42993,11 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-9.14.0" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."whatwg-fetch-2.0.3" + sources."whatwg-fetch-2.0.4" sources."which-1.3.0" sources."which-module-2.0.0" sources."wide-align-1.1.2" @@ -41798,7 +43017,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."y18n-3.2.1" sources."yallist-2.1.2" - (sources."yargs-10.1.2" // { + (sources."yargs-11.1.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -41806,7 +43025,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."yargs-parser-8.1.0" + sources."yargs-parser-9.0.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -41818,6 +43037,308 @@ in production = true; bypassCache = false; }; + vue-cli = nodeEnv.buildNodePackage { + name = "vue-cli"; + packageName = "vue-cli"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; + sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + }; + dependencies = [ + sources."absolute-0.0.1" + sources."ajv-5.5.2" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.1.0" + sources."ansi-red-0.1.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + sources."argparse-1.0.10" + sources."array-differ-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.2" + sources."bluebird-3.5.1" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-3.6.0" + sources."buffer-crc32-0.2.13" + sources."builtins-1.0.3" + sources."camelcase-1.2.1" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."center-align-0.1.3" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."co-3.1.0" + sources."co-from-stream-0.0.0" + sources."co-fs-extra-1.2.1" + sources."co-read-0.0.1" + sources."coffee-script-1.12.7" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."config-chain-1.1.11" + sources."consolidate-0.14.5" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + (sources."decompress-4.2.0" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" + sources."delayed-stream-1.0.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."enable-1.3.2" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."extend-3.0.1" + sources."extend-shallow-2.0.1" + sources."external-editor-2.2.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."figures-2.0.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."git-clone-0.1.0" + sources."glob-7.1.2" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."gray-matter-2.1.1" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-generators-1.0.1" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.21" + sources."ieee754-1.1.11" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-natural-number-4.0.1" + sources."is-object-1.0.1" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."klaw-1.3.1" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."log-symbols-2.2.0" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + (sources."make-dir-1.2.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."metalsmith-2.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."multimatch-2.1.0" + sources."mute-stream-0.0.7" + sources."npm-conf-1.1.3" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optimist-0.6.1" + sources."ora-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."read-metadata-1.0.0" + sources."readable-stream-2.3.6" + sources."recursive-readdir-2.2.2" + sources."repeat-string-1.6.1" + (sources."request-2.85.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."seek-bzip-1.0.5" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."stat-mode-0.2.2" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + sources."strip-dirs-2.1.0" + sources."strip-outer-1.0.1" + sources."supports-color-5.3.0" + sources."tar-stream-1.5.5" + sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."thunkify-wrap-1.0.4" + sources."tildify-1.2.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."toml-2.3.3" + sources."tough-cookie-2.3.4" + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-0.0.2" + sources."unbzip2-stream-1.2.5" + sources."unyield-0.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."ware-1.3.0" + sources."win-fork-1.1.1" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yaml-js-0.0.8" + sources."yargs-3.10.0" + sources."yauzl-2.9.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple CLI for scaffolding Vue.js projects."; + homepage = "https://github.com/vuejs/vue-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; webdrvr = nodeEnv.buildNodePackage { name = "webdrvr"; packageName = "webdrvr"; @@ -41843,7 +43364,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -41934,7 +43455,7 @@ in sources."rimraf-2.6.2" sources."semver-2.3.2" sources."sntp-1.0.9" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -41969,15 +43490,15 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.1.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.1.1.tgz"; - sha512 = "2gs8dnr0n1p7npwjb37f3mh08gfrab0xcfp6cwm4zyxvx5lkx2hvqr81sd8mcyys9062f2pvx7njbr6zzwbr68lr37kcbkjrlgll31z"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz"; + sha512 = "3m4zqjmw0byxpxxx35zfrpng2sawkk71mna6b7b5vx1ba534kvsrs3i6332vz7m0dskp9k8ywqv545kg8x7xnv8xvl6x709yjrdjsp8"; }; dependencies = [ sources."acorn-5.5.3" sources."acorn-dynamic-import-3.0.0" - sources."ajv-6.2.1" + sources."ajv-6.4.0" sources."ajv-keywords-3.1.0" sources."anymatch-2.0.0" sources."aproba-1.2.0" @@ -41989,7 +43510,7 @@ in sources."assert-1.4.1" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."atob-2.0.3" + sources."atob-2.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -42008,25 +43529,27 @@ in sources."bluebird-3.5.1" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" - (sources."braces-2.3.1" // { + (sources."braces-2.3.2" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" ]; }) sources."brorand-1.1.0" - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-4.9.1" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cacache-10.0.4" sources."cache-base-1.0.1" - sources."chokidar-2.0.2" + sources."chokidar-2.0.3" sources."chownr-1.0.1" sources."chrome-trace-event-0.1.2" sources."cipher-base-1.0.4" @@ -42040,7 +43563,7 @@ in sources."commondir-1.0.1" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."copy-concurrently-1.0.5" @@ -42085,14 +43608,10 @@ in }) sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."fill-range-4.0.0" sources."find-cache-dir-1.0.0" sources."find-up-2.1.0" - sources."flush-write-stream-1.0.2" + sources."flush-write-stream-1.0.3" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from2-2.3.0" @@ -42113,7 +43632,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."iferr-0.1.5" sources."imurmurhash-0.1.4" sources."indexof-0.0.1" @@ -42145,7 +43664,7 @@ in sources."map-visit-1.0.0" sources."md5.js-1.3.4" sources."memory-fs-0.4.1" - (sources."micromatch-3.1.9" // { + (sources."micromatch-3.1.10" // { dependencies = [ sources."has-values-0.1.4" (sources."is-accessor-descriptor-0.1.6" // { @@ -42173,13 +43692,14 @@ in sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."neo-async-2.5.0" (sources."node-libs-browser-2.1.0" // { dependencies = [ sources."hash-base-2.0.2" sources."inherits-2.0.1" + sources."punycode-1.4.1" ]; }) sources."normalize-path-2.1.1" @@ -42211,12 +43731,12 @@ in sources."public-encrypt-4.0.0" sources."pump-2.0.1" sources."pumpify-1.4.0" - sources."punycode-1.4.1" + sources."punycode-2.1.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" sources."randomfill-1.0.4" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" @@ -42234,7 +43754,7 @@ in sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."setimmediate-1.0.5" - sources."sha.js-2.4.10" + sources."sha.js-2.4.11" (sources."snapdragon-0.8.2" // { dependencies = [ (sources."define-property-0.2.5" // { @@ -42268,10 +43788,14 @@ in }) (sources."snapdragon-node-2.1.1" // { dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ sources."kind-of-3.2.2" ]; }) - sources."snapdragon-util-3.0.1" sources."source-list-map-2.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" @@ -42281,13 +43805,13 @@ in sources."extend-shallow-3.0.2" ]; }) - sources."ssri-5.2.4" + sources."ssri-5.3.0" sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-each-1.2.2" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-shift-1.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."tapable-1.0.0" sources."through2-2.0.3" sources."timers-browserify-2.0.6" @@ -42298,7 +43822,7 @@ in sources."tty-browserify-0.0.0" sources."typedarray-0.0.6" sources."uglify-es-3.3.10" - (sources."uglifyjs-webpack-plugin-1.2.3" // { + (sources."uglifyjs-webpack-plugin-1.2.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -42320,6 +43844,7 @@ in ]; }) sources."upath-1.0.4" + sources."uri-js-3.0.2" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -42355,23 +43880,276 @@ in production = true; bypassCache = false; }; + webtorrent-cli = nodeEnv.buildNodePackage { + name = "webtorrent-cli"; + packageName = "webtorrent-cli"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.11.0.tgz"; + sha512 = "04agjsk7s1fdmiy195shkjqxswpkadyg08vgj4pqxpwy6d5d4kbngz3gmg9vvnm2z9hi2sdc6ryx0r59nws7xjkifi3grzfkxzz1c06"; + }; + dependencies = [ + sources."addr-to-ip-port-1.4.3" + (sources."airplay-js-0.3.0" // { + dependencies = [ + sources."semver-5.1.1" + sources."xmlbuilder-0.4.3" + ]; + }) + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."ascli-0.3.0" + sources."async-limiter-1.0.0" + sources."balanced-match-1.0.0" + sources."bencode-2.0.0" + sources."binary-search-1.3.3" + sources."bindings-1.3.0" + sources."bitfield-2.0.0" + sources."bittorrent-dht-8.2.0" + sources."bittorrent-peerid-1.2.0" + sources."bittorrent-protocol-2.4.0" + sources."bittorrent-tracker-9.7.0" + sources."bl-1.2.2" + sources."blob-to-buffer-1.2.7" + sources."block-stream2-1.1.0" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + sources."browserify-package-json-1.0.1" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."buffer-indexof-1.1.1" + sources."bufferutil-3.0.4" + sources."bufferview-1.0.1" + sources."bytebuffer-3.5.5" + sources."castv2-0.1.9" + sources."castv2-client-1.2.0" + sources."chownr-1.0.1" + sources."chromecasts-1.9.1" + sources."chunk-store-stream-2.1.0" + sources."clivas-0.2.0" + sources."closest-to-2.0.0" + sources."code-point-at-1.1.0" + sources."colour-0.7.1" + sources."compact2string-1.4.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."create-torrent-3.30.0" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-extend-0.4.2" + sources."defined-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."dlnacasts-0.1.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."ecstatic-3.2.0" + sources."elementtree-0.1.7" + sources."end-of-stream-1.4.1" + sources."executable-4.1.1" + sources."expand-template-1.1.0" + sources."filestream-4.1.3" + sources."flatten-1.0.2" + sources."fs-chunk-store-1.7.0" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-browser-rtc-1.0.2" + sources."get-stdin-5.0.1" + sources."github-from-package-0.0.0" + sources."glob-7.1.2" + sources."has-unicode-2.0.1" + sources."he-1.1.1" + sources."immediate-chunk-store-1.0.8" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" + sources."ip-set-1.0.1" + sources."ipaddr.js-1.7.0" + sources."is-ascii-1.0.0" + sources."is-file-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."junk-2.1.0" + sources."k-bucket-4.0.0" + sources."k-rpc-4.3.1" + sources."k-rpc-socket-1.8.0" + sources."last-one-wins-1.0.4" + sources."load-ip-set-1.3.1" + sources."long-2.4.0" + sources."lru-3.1.0" + sources."magnet-uri-5.1.7" + sources."mdns-js-0.5.0" + sources."mdns-js-packet-0.2.0" + sources."mediasource-2.1.3" + sources."memory-chunk-store-1.3.0" + sources."mime-1.6.0" + sources."mimic-response-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."moment-2.22.0" + sources."mp4-box-encoding-1.1.3" + sources."mp4-stream-2.0.3" + sources."ms-2.0.0" + (sources."multicast-dns-6.2.3" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) + sources."multistream-2.1.0" + sources."nan-2.10.0" + sources."netmask-1.0.6" + sources."network-address-1.1.2" + sources."next-event-1.0.0" + sources."node-abi-2.3.0" + sources."node-ssdp-2.9.1" + sources."nodebmc-0.0.7" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."open-0.0.5" + sources."optjs-3.2.2" + sources."os-homedir-1.0.2" + sources."package-json-versionify-1.0.4" + sources."parse-torrent-5.8.3" + sources."parse-torrent-file-4.1.0" + sources."path-is-absolute-1.0.1" + sources."piece-length-1.0.0" + sources."pify-2.3.0" + sources."plist-with-patches-0.5.1" + sources."prebuild-install-2.5.1" + sources."prettier-bytes-1.0.4" + sources."process-nextick-args-2.0.0" + sources."protobufjs-3.8.2" + sources."pump-3.0.0" + sources."qap-3.3.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" + sources."random-iterate-1.0.1" + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."range-slice-stream-1.2.0" + sources."rc-1.2.6" + sources."readable-stream-2.3.6" + sources."record-cache-1.0.1" + (sources."render-media-2.12.0" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."rimraf-2.6.2" + sources."run-parallel-1.1.8" + sources."run-parallel-limit-1.0.4" + sources."run-series-1.1.6" + sources."rusha-0.8.13" + sources."safe-buffer-5.1.1" + sources."sax-1.1.4" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.7.0" + sources."simple-peer-9.0.0" + sources."simple-sha1-2.1.0" + (sources."simple-websocket-7.0.2" // { + dependencies = [ + sources."ws-4.1.0" + ]; + }) + sources."speedometer-1.0.0" + sources."split-1.0.1" + sources."stream-to-blob-1.0.0" + sources."stream-to-blob-url-2.1.0" + sources."stream-with-known-length-to-buffer-1.0.1" + sources."string-width-1.0.2" + sources."string2compact-1.2.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + (sources."tar-fs-1.16.0" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."tar-stream-1.5.5" + sources."thirty-two-1.0.2" + sources."through-2.3.8" + sources."thunky-0.1.0" + sources."to-arraybuffer-1.0.1" + (sources."torrent-discovery-8.4.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."pump-2.0.1" + ]; + }) + sources."torrent-piece-1.1.1" + sources."tunnel-agent-0.6.0" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."uint64be-1.0.1" + sources."uniq-1.0.1" + sources."unordered-array-remove-1.0.2" + sources."upnp-device-client-1.0.2" + sources."upnp-mediarenderer-client-1.2.4" + sources."url-join-2.0.5" + sources."ut_metadata-3.2.0" + sources."ut_pex-1.2.0" + sources."util-deprecate-1.0.2" + sources."videostream-2.4.2" + sources."vlc-command-1.1.1" + (sources."webtorrent-0.98.24" // { + dependencies = [ + sources."debug-3.1.0" + sources."mime-2.2.2" + sources."minimist-0.0.8" + sources."thunky-1.0.2" + ]; + }) + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.2" + sources."winreg-1.2.4" + sources."wrappy-1.0.2" + sources."ws-5.1.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.27" + sources."xtend-4.0.1" + sources."zero-fill-2.2.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "WebTorrent, the streaming torrent client. For the command line."; + homepage = https://webtorrent.io/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.4.0.tgz"; - sha1 = "4103e737196eb2a9fe83087752357d1dfe618294"; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.6.0.tgz"; + sha1 = "52c074123e6376a4fb673e565c33dd027714e9b0"; }; dependencies = [ - sources."@types/node-9.4.7" + sources."@cliqz-oss/firefox-client-0.3.1" + sources."@cliqz-oss/node-firefox-connect-1.2.1" + sources."@types/node-9.6.2" sources."JSONSelect-0.2.1" + sources."abbrev-1.1.1" sources."acorn-5.5.3" - (sources."acorn-dynamic-import-2.0.2" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -42380,7 +44158,7 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-0.35.0" // { + (sources."addons-linter-0.41.0" // { dependencies = [ sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" @@ -42389,82 +44167,112 @@ in sources."async-2.6.0" sources."camelcase-1.2.1" sources."cli-cursor-1.0.2" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) + sources."cliui-3.2.0" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."domelementtype-1.1.3" + sources."es6-promise-3.3.1" sources."figures-1.7.0" - sources."globals-11.3.0" - sources."hash-base-2.0.2" - sources."inherits-2.0.1" + sources."find-up-2.1.0" + sources."for-in-0.1.8" + sources."globals-11.4.0" + sources."got-3.3.1" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" + sources."latest-version-1.0.1" + sources."lazy-cache-0.2.7" sources."mute-stream-0.0.5" + sources."object-assign-3.0.0" sources."onetime-1.1.0" + sources."package-json-1.2.0" sources."parse-json-2.2.0" + sources."path-exists-3.0.0" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."punycode-2.1.0" + sources."punycode-1.3.2" + sources."repeating-1.1.3" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" sources."slice-ansi-0.0.4" sources."source-map-0.6.1" - sources."source-map-support-0.5.1" + sources."source-map-support-0.5.4" sources."string-width-1.0.2" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."strip-bom-2.0.0" + sources."supports-color-5.3.0" sources."table-3.8.3" + sources."timed-out-2.0.0" + sources."traverse-0.6.6" sources."underscore-1.6.0" + sources."update-notifier-0.5.0" + sources."which-module-2.0.0" + sources."window-size-0.2.0" sources."wordwrap-0.0.2" - (sources."yargs-10.0.3" // { + (sources."yargs-11.0.0" // { dependencies = [ sources."camelcase-4.1.0" + sources."cliui-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" ]; }) - sources."yargs-parser-8.1.0" + sources."yargs-parser-9.0.2" ]; }) sources."adm-zip-0.4.7" - sources."ajv-5.5.2" - sources."ajv-keywords-3.1.0" + sources."ajv-6.3.0" + sources."ajv-keywords-2.1.1" sources."ajv-merge-patch-3.0.0" sources."align-text-0.1.4" sources."anchor-markdown-header-0.5.7" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" + sources."ansicolors-0.3.2" sources."any-promise-1.3.0" - sources."anymatch-1.3.2" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + ]; + }) sources."archiver-2.1.1" sources."archiver-utils-1.3.0" + sources."archy-1.0.0" sources."argparse-1.0.10" - sources."arr-diff-2.0.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-filter-0.0.1" sources."array-from-2.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."arrify-1.0.1" + sources."asap-2.0.6" sources."asn1-0.2.3" - sources."asn1.js-4.10.1" - sources."assert-1.4.1" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" + sources."atob-2.1.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.0" sources."babel-generator-6.26.1" @@ -42488,43 +44296,40 @@ in sources."babylon-6.18.0" sources."bail-1.0.2" sources."balanced-match-1.0.0" - sources."base64-js-1.2.3" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."base64-js-0.0.2" sources."base64url-2.0.0" sources."bcrypt-pbkdf-1.0.1" - sources."big.js-3.2.0" sources."binary-extensions-1.11.0" - sources."bl-1.2.1" + sources."bl-1.2.2" sources."bluebird-2.9.34" - sources."bn.js-4.11.8" sources."boolbase-1.0.0" sources."boom-4.3.1" + sources."bops-0.1.1" sources."boundary-1.0.1" - sources."boxen-1.3.0" + sources."boxen-0.3.1" sources."brace-expansion-1.1.11" - (sources."braces-1.8.5" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."brorand-1.1.0" - sources."browserify-aes-1.1.1" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" - sources."browserify-zlib-0.2.0" - sources."buffer-4.9.1" + sources."braces-2.3.2" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-xor-1.0.3" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" - sources."builtin-status-codes-3.0.0" (sources."bunyan-1.8.12" // { dependencies = [ sources."glob-6.0.4" sources."rimraf-2.4.5" ]; }) + sources."cache-base-1.0.1" sources."caller-path-0.1.0" sources."callsites-0.2.0" sources."camelcase-4.1.0" @@ -42532,7 +44337,7 @@ in sources."caseless-0.12.0" sources."ccount-1.0.2" sources."center-align-0.1.3" - sources."chalk-2.3.0" + sources."chalk-2.3.2" sources."character-entities-1.2.1" sources."character-entities-html4-1.1.1" sources."character-entities-legacy-1.1.1" @@ -42543,39 +44348,55 @@ in sources."domelementtype-1.3.0" ]; }) - sources."chokidar-1.7.0" - sources."cipher-base-1.0.4" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."kind-of-3.2.2" + ]; + }) sources."circular-json-0.3.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" + sources."clite-0.3.0" sources."cliui-2.1.0" - sources."clone-1.0.3" + sources."clone-1.0.4" + sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.3" + sources."collection-visit-1.0.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.6" - sources."commander-2.15.0" + sources."commander-2.15.1" sources."common-tags-1.7.2" + sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" - sources."configstore-3.1.1" - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" + sources."concat-stream-1.6.2" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."convert-source-map-1.5.1" - sources."core-js-2.5.3" + sources."copy-descriptor-0.1.1" + sources."core-js-2.5.5" sources."core-util-is-1.0.2" sources."crc-3.5.0" sources."crc32-stream-2.0.0" - sources."create-ecdh-4.0.0" sources."create-error-class-3.0.2" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" sources."cross-spawn-5.1.0" sources."crx-parser-0.1.2" (sources."cryptiles-3.1.2" // { @@ -42583,67 +44404,67 @@ in sources."boom-5.2.0" ]; }) - sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.0" sources."d-1.0.0" sources."dashdash-1.14.1" - sources."date-now-0.1.4" sources."debounce-1.1.0" sources."debug-2.6.9" sources."decamelize-2.0.0" + sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" sources."deep-extend-0.4.2" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" - sources."deepmerge-1.5.2" + sources."deepmerge-2.1.0" sources."defaults-1.0.3" + sources."define-property-2.0.2" sources."del-2.2.2" sources."delayed-stream-1.0.0" - sources."des.js-1.0.0" sources."detect-indent-4.0.0" - sources."diffie-hellman-5.0.2" - (sources."dispensary-0.12.0" // { + (sources."dispensary-0.16.0" // { dependencies = [ - sources."semver-5.4.1" - sources."source-map-support-0.5.0" + sources."ajv-5.5.2" ]; }) - sources."doctoc-1.3.0" + sources."doctoc-1.3.1" sources."doctrine-2.1.0" sources."dom-serializer-0.1.0" - sources."domain-browser-1.2.0" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" - sources."dot-prop-4.2.0" + sources."dot-prop-3.0.0" sources."dtrace-provider-0.8.6" + sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" + sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.9" - sources."elliptic-6.4.0" + sources."email-validator-1.1.1" sources."emoji-regex-6.1.3" - sources."emojis-list-2.1.0" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" - sources."enhanced-resolve-3.4.1" sources."entities-1.1.1" - sources."errno-0.1.7" sources."error-ex-1.3.1" - sources."es5-ext-0.10.40" + sources."es5-ext-0.10.42" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" - sources."es6-promise-4.2.4" - sources."es6-promisify-5.0.0" + sources."es6-promise-2.3.0" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.2.4" + ]; + }) sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" sources."escope-3.6.0" - (sources."eslint-4.15.0" // { + (sources."eslint-4.19.0" // { dependencies = [ + sources."ajv-5.5.2" sources."esprima-4.0.0" ]; }) @@ -42672,22 +44493,29 @@ in sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.4" sources."esprima-3.1.3" - sources."esquery-1.0.0" + sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."events-1.1.1" - sources."evp_bytestokey-1.0.3" sources."execa-0.7.0" sources."exit-hook-1.1.1" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."extend-3.0.1" - sources."external-editor-2.1.0" - sources."extglob-0.3.2" - sources."extract-text-webpack-plugin-3.0.2" + sources."extend-shallow-3.0.2" + sources."external-editor-2.2.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-parse-1.0.3" @@ -42698,10 +44526,9 @@ in sources."fd-slicer-1.0.1" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.3" - sources."find-up-2.1.0" - sources."firefox-client-0.3.0" + sources."fill-range-4.0.0" + sources."filled-array-1.1.0" + sources."find-up-1.1.2" (sources."firefox-profile-1.1.0" // { dependencies = [ sources."async-2.5.0" @@ -42710,11 +44537,12 @@ in sources."first-chunk-stream-2.0.0" sources."flat-cache-1.3.0" sources."flatstr-1.0.5" - sources."fluent-0.4.1" + sources."fluent-syntax-0.6.6" sources."for-in-1.0.2" - sources."for-own-0.1.5" + sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."fragment-cache-0.2.1" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" @@ -42732,6 +44560,7 @@ in sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" (sources."git-rev-sync-1.9.1" // { @@ -42740,71 +44569,75 @@ in ]; }) sources."glob-7.1.2" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."global-dirs-0.1.1" sources."globals-9.18.0" sources."globby-5.0.0" - sources."got-6.7.1" + sources."got-5.7.1" sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" + sources."graphlib-2.1.5" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-1.0.1" sources."has-ansi-2.0.0" sources."has-color-0.1.7" - sources."has-flag-2.0.0" - sources."hash-base-3.0.4" - sources."hash.js-1.1.3" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."hasbin-1.2.3" sources."hawk-6.0.2" - sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.6.0" sources."htmlparser2-3.9.2" sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" - sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" + sources."iconv-lite-0.4.21" sources."ignore-3.3.7" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indexof-0.0.1" + sources."infinity-agent-2.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inquirer-3.3.0" sources."interpret-1.1.0" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."invert-kv-1.0.0" sources."is-absolute-0.1.7" + sources."is-accessor-descriptor-1.0.0" sources."is-alphabetical-1.0.1" sources."is-alphanumerical-1.0.1" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" + sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.1" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" + sources."is-extglob-2.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-2.0.1" + sources."is-glob-4.0.0" sources."is-hexadecimal-1.0.1" sources."is-installed-globally-0.1.0" + sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.17.2" sources."is-npm-1.0.0" - sources."is-number-2.1.0" + sources."is-number-4.0.0" sources."is-obj-1.0.1" + sources."is-odd-2.0.0" sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-redirect-1.0.0" @@ -42814,10 +44647,11 @@ in sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isemail-1.2.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jed-1.1.1" sources."jetpack-id-1.0.0" @@ -42827,9 +44661,8 @@ in sources."js-yaml-3.11.0" sources."jsbn-0.1.1" sources."jsesc-1.3.0" - sources."json-loader-0.5.7" sources."json-merge-patch-0.2.3" - sources."json-parse-better-errors-1.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" @@ -42845,66 +44678,71 @@ in sources."jwa-1.1.5" sources."jws-3.1.4" sources."kind-of-3.2.2" - sources."latest-version-3.1.0" + sources."latest-version-2.0.0" sources."lazy-cache-1.0.4" sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."load-json-file-2.0.0" - sources."loader-runner-2.3.0" - sources."loader-utils-1.1.0" + sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash-4.17.5" - sources."lodash.endswith-4.2.1" - sources."lodash.isfunction-3.0.9" - sources."lodash.isstring-4.0.1" + sources."lodash.assign-4.2.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.defaults-4.2.0" + sources."lodash.defaultsdeep-4.6.0" + sources."lodash.mergewith-4.6.1" sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" - sources."lodash.startswith-4.2.1" sources."longest-1.0.1" sources."longest-streak-1.0.0" sources."loose-envify-1.3.1" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."markdown-table-0.4.0" sources."markdown-to-ast-3.4.0" - sources."md5.js-1.3.4" sources."mem-1.1.0" - sources."memory-fs-0.4.1" - sources."micromatch-2.3.11" - sources."miller-rabin-4.0.1" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."mimic-fn-1.2.0" - sources."minimalistic-assert-1.0.0" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" + sources."mixin-object-2.0.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."moment-2.21.0" + sources."moment-2.22.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.9.2" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" + sources."nconf-0.7.2" sources."ncp-2.0.0" - sources."next-tick-1.0.0" - (sources."node-firefox-connect-1.2.0" // { + (sources."needle-2.2.0" // { dependencies = [ - sources."es6-promise-2.3.0" - sources."traverse-0.4.6" + sources."debug-2.6.9" ]; }) - sources."node-forge-0.7.4" - sources."node-libs-browser-2.1.0" + sources."neo-async-2.5.0" + sources."nested-error-stacks-1.0.2" + sources."next-tick-1.0.0" + sources."node-forge-0.7.5" sources."node-notifier-5.2.1" + sources."node-status-codes-1.0.0" sources."nomnom-1.8.1" sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" @@ -42913,41 +44751,44 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" - sources."object.omit-2.0.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" sources."optionator-0.8.2" - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" + sources."os-name-1.0.3" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."osx-release-1.1.0" sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."package-json-4.0.1" + sources."package-json-2.4.0" sources."pako-1.0.6" - sources."parse-asn1-5.1.0" sources."parse-entities-1.1.1" - sources."parse-glob-3.0.4" sources."parse-json-4.0.0" sources."parse5-3.0.3" - sources."path-browserify-0.0.0" - sources."path-exists-3.0.0" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.5" - sources."path-type-2.0.0" - sources."pbkdf2-3.0.14" + sources."path-type-1.1.0" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-4.10.3" + sources."pino-4.14.0" + sources."pino-std-serializers-1.2.0" sources."pluralize-7.0.0" (sources."po2json-0.4.5" // { dependencies = [ @@ -42956,48 +44797,38 @@ in sources."strip-ansi-0.1.1" ]; }) - sources."postcss-6.0.14" + sources."posix-character-classes-0.1.1" + sources."postcss-6.0.19" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."preserve-0.2.0" sources."private-0.1.8" - (sources."probe-image-size-3.2.0" // { + (sources."probe-image-size-4.0.0" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."process-0.11.10" sources."process-nextick-args-2.0.0" sources."progress-2.0.0" - sources."prr-1.0.1" + sources."promise-7.3.1" + sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.0" - sources."pump-2.0.1" + sources."pump-3.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."quick-format-unescaped-1.1.2" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - ]; - }) - sources."randombytes-2.0.6" - sources."randomfill-1.0.4" - sources."rc-1.2.5" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."readable-stream-2.3.5" + sources."rc-1.2.6" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."readline2-1.0.1" sources."rechoir-0.6.2" + sources."recursive-readdir-2.2.2" sources."regenerator-runtime-0.11.1" - sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."regexpp-1.1.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { @@ -43020,31 +44851,39 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" - sources."resolve-1.5.0" + sources."resolve-1.7.0" sources."resolve-from-1.0.1" + sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" + sources."ret-0.1.15" sources."right-align-0.1.3" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" sources."run-async-2.3.0" + sources."rx-4.1.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" sources."safe-json-stringify-1.1.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-0.3.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" - sources."setimmediate-1.0.5" - sources."sha.js-2.4.10" + sources."set-value-2.0.0" + sources."sha.js-2.4.11" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + ]; + }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" sources."shelljs-0.8.1" sources."shellwords-0.1.1" - (sources."sign-addon-0.2.2" // { + (sources."sign-addon-0.3.0" // { dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" @@ -43072,26 +44911,114 @@ in sources."signal-exit-3.0.2" sources."slash-1.0.0" sources."slice-ansi-1.0.0" + sources."slide-1.1.6" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - sources."source-list-map-2.0.0" + (sources."snyk-1.71.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."async-1.5.2" + sources."camelcase-3.0.0" + sources."chalk-1.1.3" + sources."inquirer-1.0.3" + sources."mute-stream-0.0.6" + sources."os-locale-1.4.0" + sources."run-async-2.3.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."yargs-3.15.0" + ]; + }) + (sources."snyk-config-1.0.1" // { + dependencies = [ + sources."async-0.9.2" + sources."debug-2.6.9" + ]; + }) + sources."snyk-go-plugin-1.4.6" + sources."snyk-gradle-plugin-1.2.0" + (sources."snyk-module-1.8.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-mvn-plugin-1.1.1" + (sources."snyk-nuget-plugin-1.3.9" // { + dependencies = [ + sources."es6-promise-4.2.4" + ]; + }) + sources."snyk-php-plugin-1.3.2" + (sources."snyk-policy-1.10.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-python-plugin-1.5.7" + (sources."snyk-resolve-1.0.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."snyk-resolve-deps-1.7.0" // { + dependencies = [ + sources."configstore-2.1.0" + sources."debug-2.6.9" + sources."update-notifier-0.6.3" + sources."uuid-2.0.3" + sources."yargs-4.8.1" + ]; + }) + (sources."snyk-sbt-plugin-1.2.5" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-tree-1.0.0" + (sources."snyk-try-require-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" (sources."source-map-support-0.5.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) + sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."stream-browserify-2.0.1" - sources."stream-http-2.8.0" + sources."sshpk-1.14.1" + sources."static-extend-0.1.2" sources."stream-parser-0.3.1" + sources."stream-shift-1.0.0" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { dependencies = [ @@ -43099,8 +45026,9 @@ in sources."once-1.3.3" ]; }) + sources."string-length-1.0.1" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringify-entities-1.3.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" @@ -43111,114 +45039,143 @@ in sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-2.0.0" - (sources."table-4.0.3" // { + sources."table-4.0.2" + sources."tar-stream-1.5.5" + (sources."tempfile-1.1.1" // { dependencies = [ - sources."ajv-6.2.1" + sources."uuid-2.0.3" ]; }) - sources."tapable-0.2.8" - sources."tar-stream-1.5.5" sources."term-size-1.2.0" sources."text-table-0.2.0" + sources."then-fs-2.0.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."through-2.3.8" sources."through2-2.0.3" - sources."timed-out-4.0.1" - sources."timers-browserify-2.0.6" + sources."timed-out-3.1.3" sources."tmp-0.0.33" - sources."to-arraybuffer-1.0.1" sources."to-fast-properties-1.0.3" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."to-utf8-0.0.1" + sources."toml-2.3.3" sources."topo-1.1.0" sources."tosource-1.0.0" sources."tough-cookie-2.3.4" sources."tr46-1.0.1" - sources."traverse-0.6.6" + sources."traverse-0.4.6" sources."trim-0.0.1" sources."trim-right-1.0.1" sources."trim-trailing-lines-1.1.0" sources."trough-1.0.1" - sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uglify-js-2.8.29" - sources."uglify-to-browserify-1.0.2" - (sources."uglifyjs-webpack-plugin-0.4.6" // { - dependencies = [ - sources."yargs-3.10.0" - ]; - }) + sources."undefsafe-0.0.3" sources."underscore-1.8.3" sources."unherit-1.1.0" sources."unified-4.2.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) sources."unique-string-1.0.0" sources."unist-util-is-2.1.1" sources."unist-util-remove-position-1.1.1" sources."unist-util-visit-1.3.0" sources."universalify-0.1.1" - sources."unzip-response-2.0.1" - sources."upath-1.0.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."unzip-response-1.0.2" + sources."upath-1.0.4" (sources."update-notifier-2.3.0" // { dependencies = [ + sources."boxen-1.3.0" + sources."configstore-3.1.2" + sources."dot-prop-4.2.0" + sources."got-6.7.1" + sources."latest-version-3.1.0" + sources."package-json-4.0.1" sources."pify-3.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."widest-line-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" ]; }) sources."update-section-0.3.3" - (sources."url-0.11.0" // { + sources."urix-0.1.0" + sources."url-0.11.0" + sources."url-parse-lax-1.0.0" + (sources."use-3.1.0" // { dependencies = [ - sources."punycode-1.3.2" + sources."kind-of-6.0.2" ]; }) - sources."url-parse-lax-1.0.0" sources."user-home-2.0.0" - sources."util-0.10.3" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" sources."vfile-location-2.0.2" - sources."vm-browserify-0.0.4" - (sources."watchpack-1.4.0" // { + (sources."watchpack-1.5.0" // { dependencies = [ - sources."async-2.6.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-6.0.2" ]; }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."webpack-3.10.0" // { + (sources."whatwg-url-6.3.0" // { dependencies = [ - sources."ajv-keywords-2.1.1" - sources."ansi-regex-2.1.1" - sources."camelcase-4.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."source-map-0.5.7" - sources."string-width-2.1.1" - sources."strip-ansi-3.0.1" - (sources."yargs-8.0.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."punycode-2.1.0" ]; }) - sources."webpack-sources-1.1.0" - sources."whatwg-url-6.3.0" sources."when-3.7.7" sources."which-1.3.0" - sources."which-module-2.0.0" - sources."widest-line-2.0.0" - sources."window-size-0.1.0" + sources."which-module-1.0.0" + sources."widest-line-1.0.0" + sources."win-release-1.1.1" + sources."window-size-0.1.4" sources."winreg-0.0.12" sources."wordwrap-1.0.0" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-0.2.1" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -43231,23 +45188,15 @@ in sources."camelcase-3.0.0" sources."cliui-3.2.0" sources."decamelize-1.2.0" - sources."find-up-1.1.2" sources."is-fullwidth-code-point-1.0.0" - sources."load-json-file-1.1.0" sources."os-locale-1.4.0" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."path-type-1.1.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" sources."string-width-1.0.2" - sources."strip-bom-2.0.0" - sources."which-module-1.0.0" sources."yargs-parser-4.2.1" ]; }) - sources."yargs-parser-7.0.0" + sources."yargs-parser-2.4.1" sources."yauzl-2.9.1" + sources."zip-1.2.0" (sources."zip-dir-1.0.2" // { dependencies = [ sources."async-1.5.2" @@ -43312,7 +45261,7 @@ in sources."ajv-5.5.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."are-we-there-yet-1.1.4" @@ -43325,7 +45274,7 @@ in sources."async-2.6.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bin-version-1.0.4" @@ -43337,21 +45286,27 @@ in sources."boom-4.3.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" - sources."cacheable-request-2.1.4" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."lowercase-keys-1.0.0" + ]; + }) sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."chalk-1.1.3" sources."chardet-0.4.2" + sources."ci-info-1.1.3" sources."clean-stack-1.3.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" sources."cli-width-2.2.0" - sources."clone-1.0.3" - sources."clone-regexp-1.0.0" + sources."clone-1.0.4" + sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" sources."clone-stats-0.0.1" sources."co-4.6.0" @@ -43360,8 +45315,8 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" - sources."configstore-3.1.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -43394,7 +45349,7 @@ in sources."execall-1.0.0" sources."exit-hook-1.1.1" sources."extend-3.0.1" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -43437,8 +45392,8 @@ in sources."hosted-git-info-2.6.0" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" - sources."humanize-string-1.0.1" - sources."iconv-lite-0.4.19" + sources."humanize-string-1.0.2" + sources."iconv-lite-0.4.21" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -43482,6 +45437,7 @@ in sources."into-stream-3.1.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" sources."is-docker-1.1.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" @@ -43498,7 +45454,7 @@ in sources."is-root-1.0.0" sources."is-scoped-1.0.0" sources."is-stream-1.1.0" - sources."is-supported-regexp-flag-1.0.0" + sources."is-supported-regexp-flag-1.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -43523,7 +45479,7 @@ in sources."lodash.padstart-4.6.1" sources."log-symbols-1.0.2" sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-obj-1.0.1" @@ -43576,7 +45532,7 @@ in sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."p-any-1.1.0" - sources."p-cancelable-0.4.0" + sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" sources."p-limit-1.2.0" @@ -43613,8 +45569,8 @@ in sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."query-string-5.1.0" - sources."rc-1.2.5" + sources."query-string-5.1.1" + sources."rc-1.2.6" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -43627,7 +45583,7 @@ in sources."strip-bom-3.0.0" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readline2-1.0.1" sources."redent-1.0.0" sources."registry-auth-token-3.3.2" @@ -43643,6 +45599,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."scoped-regex-1.0.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" @@ -43665,11 +45622,11 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."strict-uri-encode-1.1.0" sources."string-length-1.0.1" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -43700,7 +45657,7 @@ in sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-4.0.1" - sources."titleize-1.0.0" + sources."titleize-1.0.1" sources."tmp-0.0.33" sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" @@ -43711,7 +45668,7 @@ in sources."unique-string-1.0.0" sources."untildify-3.0.2" sources."unzip-response-2.0.1" - (sources."update-notifier-2.3.0" // { + (sources."update-notifier-2.4.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."camelcase-4.1.0" @@ -43729,7 +45686,7 @@ in sources."verror-1.10.0" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" - sources."walk-2.3.9" + sources."walk-2.3.13" sources."which-1.3.0" sources."widest-line-2.0.0" sources."win-release-1.1.1" @@ -43754,7 +45711,7 @@ in sources."onetime-1.1.0" ]; }) - (sources."yeoman-environment-2.0.5" // { + (sources."yeoman-environment-2.0.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.3.2" @@ -43764,7 +45721,7 @@ in sources."supports-color-5.3.0" ]; }) - (sources."yosay-2.0.1" // { + (sources."yosay-2.0.2" // { dependencies = [ sources."ansi-styles-3.2.1" sources."is-fullwidth-code-point-1.0.0" diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 8abdc0e608cd..2d987cbfb1bd 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -1,6 +1,7 @@ [ "bower" , "coffee-script" +, "create-cycle-app" , "dat" , "grunt-cli" , "mocha" @@ -11,5 +12,7 @@ , "pnpm" , "semver" , "sloc" +, "vue-cli" +, "swagger" , "npm" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 3f6765bb0088..4b2e714c42db 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -4,6 +4,78 @@ let sources = { + "@cycle/dom-18.3.0" = { + name = "_at_cycle_slash_dom"; + packageName = "@cycle/dom"; + version = "18.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/dom/-/dom-18.3.0.tgz"; + sha1 = "37b9f55c6b0f629d1b689ece57637768fbeed2b0"; + }; + }; + "@cycle/http-14.9.0" = { + name = "_at_cycle_slash_http"; + packageName = "@cycle/http"; + version = "14.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/http/-/http-14.9.0.tgz"; + sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0"; + }; + }; + "@cycle/isolate-3.2.0" = { + name = "_at_cycle_slash_isolate"; + packageName = "@cycle/isolate"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.2.0.tgz"; + sha512 = "1g3jcq2dmxpqn3nyvclbf9hnp18h4c41vsqywp2yf2mda92bzdjwidq8f231yxb6rs6r39zpvn741kjify4h5zl4d8ix1xigilbcyj7"; + }; + }; + "@cycle/run-3.4.0" = { + name = "_at_cycle_slash_run"; + packageName = "@cycle/run"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz"; + sha512 = "2ir1dz9dh2ajf6yaks8nznfm89m0jh09hgadzwfml7xw3d49hks008sz3fq5rp9ax2d7r87y6hcq5hv9xz2qrkx1c1qc2r7xlz74ik1"; + }; + }; + "@cycle/time-0.10.1" = { + name = "_at_cycle_slash_time"; + packageName = "@cycle/time"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/time/-/time-0.10.1.tgz"; + sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; + }; + }; + "@types/node-9.6.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "9.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; + sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; + }; + }; + "@types/superagent-3.5.6" = { + name = "_at_types_slash_superagent"; + packageName = "@types/superagent"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/superagent/-/superagent-3.5.6.tgz"; + sha512 = "31mxn8niw3v1nam9lh29lrq867gjkbv2q6fs0w07miff4mz73066cn5n24f1vmnqpvyv6hbh83b6xll66911a8hj54apmn12s8ras68"; + }; + }; + "URIjs-1.16.1" = { + name = "URIjs"; + packageName = "URIjs"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/URIjs/-/URIjs-1.16.1.tgz"; + sha1 = "edebc678b8b74b26b05d2b481e12383f5ae04b8b"; + }; + }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -13,6 +85,15 @@ let sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; + "absolute-0.0.1" = { + name = "absolute"; + packageName = "absolute"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; + sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; + }; + }; "abstract-random-access-1.1.2" = { name = "abstract-random-access"; packageName = "abstract-random-access"; @@ -31,13 +112,67 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ansi-diff-stream-1.2.0" = { + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "ansi-align-2.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + }; + "ansi-diff-stream-1.2.1" = { name = "ansi-diff-stream"; packageName = "ansi-diff-stream"; - version = "1.2.0"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; + }; + }; + "ansi-escapes-1.4.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; - sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + }; + "ansi-escapes-3.1.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; + }; + }; + "ansi-red-0.1.1" = { + name = "ansi-red"; + packageName = "ansi-red"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz"; + sha1 = "8c638f9d1080800a353c9c28c8a81ca4705d946c"; }; }; "ansi-regex-2.1.1" = { @@ -58,6 +193,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; "ansi-styles-3.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -67,6 +211,15 @@ let sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; }; }; + "ansi-wrap-0.1.0" = { + name = "ansi-wrap"; + packageName = "ansi-wrap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; + }; + }; "anymatch-1.3.2" = { name = "anymatch"; packageName = "anymatch"; @@ -76,6 +229,15 @@ let sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; }; }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; + }; + }; "ap-0.1.0" = { name = "ap"; packageName = "ap"; @@ -85,6 +247,15 @@ let sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; }; }; + "append-field-0.1.0" = { + name = "append-field"; + packageName = "append-field"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz"; + sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; + }; + }; "append-tree-2.4.1" = { name = "append-tree"; packageName = "append-tree"; @@ -112,6 +283,15 @@ let sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; }; }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + }; + }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -121,6 +301,15 @@ let sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; }; }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; "arr-flatten-1.1.0" = { name = "arr-flatten"; packageName = "arr-flatten"; @@ -130,6 +319,24 @@ let sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-differ-1.0.0" = { + name = "array-differ"; + packageName = "array-differ"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; + sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; + }; + }; "array-lru-1.1.1" = { name = "array-lru"; packageName = "array-lru"; @@ -139,6 +346,24 @@ let sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; }; }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; "array-unique-0.2.1" = { name = "array-unique"; packageName = "array-unique"; @@ -148,6 +373,24 @@ let sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; }; }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; "asn1-0.2.3" = { name = "asn1"; packageName = "asn1"; @@ -166,6 +409,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -184,6 +436,15 @@ let sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; }; }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; "async-2.1.5" = { name = "async"; packageName = "async"; @@ -193,6 +454,24 @@ let sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; + "async-2.6.0" = { + name = "async"; + packageName = "async"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; + sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + }; + }; + "async-each-1.0.1" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; + sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -202,6 +481,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "atob-2.1.0" = { + name = "atob"; + packageName = "atob"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; + sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; + }; + }; "atomic-batcher-1.0.2" = { name = "atomic-batcher"; packageName = "atomic-batcher"; @@ -220,13 +508,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.6.0" = { + "aws4-1.7.0" = { name = "aws4"; packageName = "aws4"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz"; }; }; "balanced-match-1.0.0" = { @@ -238,6 +526,24 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + }; + }; + "base64-js-0.0.8" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; + sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; + }; + }; "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -265,6 +571,15 @@ let sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; }; }; + "binary-extensions-1.11.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz"; + sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; + }; + }; "bitfield-rle-2.1.0" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -283,6 +598,15 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; + "bl-1.2.2" = { + name = "bl"; + packageName = "bl"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; + }; + }; "blake2b-2.1.2" = { name = "blake2b"; packageName = "blake2b"; @@ -310,6 +634,15 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; + "bluebird-3.5.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; + }; + }; "body-0.1.0" = { name = "body"; packageName = "body"; @@ -319,6 +652,15 @@ let sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; }; }; + "body-parser-1.12.4" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; + }; + }; "boom-4.3.1" = { name = "boom"; packageName = "boom"; @@ -337,6 +679,15 @@ let sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; }; }; + "boxen-1.3.0" = { + name = "boxen"; + packageName = "boxen"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -355,6 +706,15 @@ let sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; }; }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; + }; + }; "browser-stdout-1.3.1" = { name = "browser-stdout"; packageName = "browser-stdout"; @@ -364,6 +724,51 @@ let sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; }; }; + "buffer-3.6.0" = { + name = "buffer"; + packageName = "buffer"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; + }; + }; + "buffer-alloc-1.1.0" = { + name = "buffer-alloc"; + packageName = "buffer-alloc"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; + sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; + }; + }; + "buffer-alloc-unsafe-0.1.1" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; + sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; + }; + }; + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + }; "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; @@ -373,6 +778,24 @@ let sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; + "buffer-fill-0.1.1" = { + name = "buffer-fill"; + packageName = "buffer-fill"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; + sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; + }; + }; + "buffer-from-1.0.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; + sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; + }; + }; "buffer-indexof-1.1.1" = { name = "buffer-indexof"; packageName = "buffer-indexof"; @@ -382,13 +805,49 @@ let sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; - "bulk-write-stream-1.1.3" = { + "builtins-1.0.3" = { + name = "builtins"; + packageName = "builtins"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + }; + "bulk-write-stream-1.1.4" = { name = "bulk-write-stream"; packageName = "bulk-write-stream"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; - sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; + }; + }; + "busboy-0.2.14" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; + }; + }; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + }; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; }; }; "bytes-3.0.0" = { @@ -400,6 +859,15 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + }; + }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -409,6 +877,33 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -418,6 +913,33 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; + "caw-2.0.1" = { + name = "caw"; + packageName = "caw"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; "chalk-2.3.2" = { name = "chalk"; packageName = "chalk"; @@ -427,6 +949,33 @@ let sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; }; }; + "chardet-0.4.2" = { + name = "chardet"; + packageName = "chardet"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + }; + }; + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + }; + "chokidar-2.0.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz"; + sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd"; + }; + }; "chownr-1.0.1" = { name = "chownr"; packageName = "chownr"; @@ -436,6 +985,69 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; + "ci-info-1.1.3" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz"; + sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8"; + }; + }; + "circular-append-file-1.0.1" = { + name = "circular-append-file"; + packageName = "circular-append-file"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; + }; + }; + "cli-boxes-1.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + }; + "cli-cursor-1.0.2" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-spinners-1.3.1" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz"; + sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm"; + }; + }; "cli-table-0.3.1" = { name = "cli-table"; packageName = "cli-table"; @@ -454,6 +1066,24 @@ let sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; }; }; + "cli-width-1.1.1" = { + name = "cli-width"; + packageName = "cli-width"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"; + sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; "cliclopts-1.1.1" = { name = "cliclopts"; packageName = "cliclopts"; @@ -463,6 +1093,42 @@ let sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; }; }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-2.0.0" = { + name = "clone"; + packageName = "clone"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz"; + sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e"; + }; + }; + "co-3.1.0" = { + name = "co"; + packageName = "co"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-3.1.0.tgz"; + sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; + }; + }; "co-4.6.0" = { name = "co"; packageName = "co"; @@ -472,6 +1138,33 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; + "co-from-stream-0.0.0" = { + name = "co-from-stream"; + packageName = "co-from-stream"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-from-stream/-/co-from-stream-0.0.0.tgz"; + sha1 = "1a5cd8ced77263946094fa39f2499a63297bcaf9"; + }; + }; + "co-fs-extra-1.2.1" = { + name = "co-fs-extra"; + packageName = "co-fs-extra"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-fs-extra/-/co-fs-extra-1.2.1.tgz"; + sha1 = "3b6ad77cf2614530f677b1cf62664f5ba756b722"; + }; + }; + "co-read-0.0.1" = { + name = "co-read"; + packageName = "co-read"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-read/-/co-read-0.0.1.tgz"; + sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; + }; + }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -490,6 +1183,24 @@ let sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8"; }; }; + "coffee-script-1.12.7" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; "color-convert-1.9.1" = { name = "color-convert"; packageName = "color-convert"; @@ -526,6 +1237,15 @@ let sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; }; }; + "combine-errors-3.0.3" = { + name = "combine-errors"; + packageName = "combine-errors"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-errors/-/combine-errors-3.0.3.tgz"; + sha1 = "f4df6740083e5703a3181110c2b10551f003da86"; + }; + }; "combined-stream-1.0.6" = { name = "combined-stream"; packageName = "combined-stream"; @@ -535,6 +1255,15 @@ let sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; "commander-2.11.0" = { name = "commander"; packageName = "commander"; @@ -544,6 +1273,33 @@ let sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; + "commander-2.15.1" = { + name = "commander"; + packageName = "commander"; + version = "2.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; + }; + }; + "commander-2.3.0" = { + name = "commander"; + packageName = "commander"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; + sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; + }; + }; + "commander-2.8.1" = { + name = "commander"; + packageName = "commander"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + }; "commander-2.9.0" = { name = "commander"; packageName = "commander"; @@ -553,6 +1309,15 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -562,13 +1327,40 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "concat-stream-1.6.1" = { + "concat-stream-1.6.2" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz"; - sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + }; + }; + "config-chain-1.1.11" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + }; + }; + "configstore-3.1.2" = { + name = "configstore"; + packageName = "configstore"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; + }; + }; + "connect-3.6.6" = { + name = "connect"; + packageName = "connect"; + version = "3.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; }; }; "connections-1.4.2" = { @@ -589,6 +1381,24 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; + "consolidate-0.14.5" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz"; + sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + }; + }; "content-types-0.1.0" = { name = "content-types"; packageName = "content-types"; @@ -598,6 +1408,33 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; + "cookiejar-2.0.6" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz"; + sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe"; + }; + }; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -616,6 +1453,33 @@ let sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + }; "cryptiles-3.1.2" = { name = "cryptiles"; packageName = "cryptiles"; @@ -625,6 +1489,33 @@ let sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; + "crypto-random-string-1.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + }; + "cssauron-1.4.0" = { + name = "cssauron"; + packageName = "cssauron"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz"; + sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8"; + }; + }; + "custom-error-instance-2.1.1" = { + name = "custom-error-instance"; + packageName = "custom-error-instance"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz"; + sha1 = "3cf6391487a6629a6247eb0ca0ce00081b7e361a"; + }; + }; "cycle-1.0.3" = { name = "cycle"; packageName = "cycle"; @@ -634,6 +1525,33 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; }; + "cycle-onionify-4.0.0" = { + name = "cycle-onionify"; + packageName = "cycle-onionify"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle-onionify/-/cycle-onionify-4.0.0.tgz"; + sha1 = "9aeddd88dedf6fda9fbb98b1e79ab38810b7ddda"; + }; + }; + "d-1.0.0" = { + name = "d"; + packageName = "d"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; + sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; + }; + }; + "dag-map-1.0.2" = { + name = "dag-map"; + packageName = "dag-map"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dag-map/-/dag-map-1.0.2.tgz"; + sha1 = "e8379f041000ed561fc515475c1ed2c85eece8d7"; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -679,22 +1597,22 @@ let sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; }; }; - "dat-ignore-2.0.0" = { + "dat-ignore-2.1.1" = { name = "dat-ignore"; packageName = "dat-ignore"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; - sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; }; }; - "dat-json-1.0.1" = { + "dat-json-1.0.2" = { name = "dat-json"; packageName = "dat-json"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; - sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; }; }; "dat-link-resolve-2.1.0" = { @@ -769,6 +1687,15 @@ let sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; }; }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -787,6 +1714,69 @@ let sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "decompress-4.2.0" = { + name = "decompress"; + packageName = "decompress"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz"; + sha1 = "7aedd85427e5a92dacfe55674a7c505e96d01f9d"; + }; + }; + "decompress-tar-4.1.1" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; + }; + }; + "decompress-tarbz2-4.1.1" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; + }; + }; + "decompress-targz-4.1.1" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; + }; + }; + "decompress-unzip-4.0.1" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; + }; + }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -805,6 +1795,33 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -823,6 +1840,33 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; + "depd-1.0.1" = { + name = "depd"; + packageName = "depd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -832,6 +1876,24 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; @@ -850,13 +1912,13 @@ let sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; }; }; - "discovery-channel-5.4.7" = { + "discovery-channel-5.5.1" = { name = "discovery-channel"; packageName = "discovery-channel"; - version = "5.4.7"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; - sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; }; }; "discovery-swarm-4.4.2" = { @@ -877,6 +1939,15 @@ let sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; + "dns-discovery-6.1.0" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; + }; + }; "dns-packet-1.3.1" = { name = "dns-packet"; packageName = "dns-packet"; @@ -886,6 +1957,15 @@ let sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; + "dns-packet-4.2.0" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; + }; + }; "dns-socket-1.6.3" = { name = "dns-socket"; packageName = "dns-socket"; @@ -895,6 +1975,15 @@ let sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; + "dns-socket-3.0.0" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; + }; + }; "dns-txt-2.0.2" = { name = "dns-txt"; packageName = "dns-txt"; @@ -913,6 +2002,51 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; + "dot-prop-4.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; + }; + }; + "download-5.0.3" = { + name = "download"; + packageName = "download"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; + sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; + }; + }; + "download-git-repo-1.0.2" = { + name = "download-git-repo"; + packageName = "download-git-repo"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; "duplexify-3.5.4" = { name = "duplexify"; packageName = "duplexify"; @@ -931,6 +2065,42 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; + "ee-first-1.1.0" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "enable-1.3.2" = { + name = "enable"; + packageName = "enable"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enable/-/enable-1.3.2.tgz"; + sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; "end-of-stream-1.4.1" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -940,6 +2110,69 @@ let sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; + "es5-ext-0.10.42" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.42"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz"; + sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700"; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "es6-map-0.1.5" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + }; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.2" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; + sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -949,6 +2182,60 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "esprima-4.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + }; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; + "exit-hook-1.1.1" = { + name = "exit-hook"; + packageName = "exit-hook"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + }; "expand-brackets-0.1.5" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -958,6 +2245,15 @@ let sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; }; }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; "expand-range-1.8.2" = { name = "expand-range"; packageName = "expand-range"; @@ -967,6 +2263,15 @@ let sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; "extend-3.0.1" = { name = "extend"; packageName = "extend"; @@ -976,6 +2281,33 @@ let sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; }; }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "external-editor-2.2.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; + }; + }; "extglob-0.3.2" = { name = "extglob"; packageName = "extglob"; @@ -985,6 +2317,15 @@ let sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; }; }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; + }; + }; "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -1030,6 +2371,60 @@ let sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; }; }; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + }; + }; + "figures-1.7.0" = { + name = "figures"; + packageName = "figures"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "file-type-3.9.0" = { + name = "file-type"; + packageName = "file-type"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + }; + "file-type-5.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; + sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; + }; + }; + "file-type-6.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; + }; + }; "filename-regex-2.0.1" = { name = "filename-regex"; packageName = "filename-regex"; @@ -1039,6 +2434,24 @@ let sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; + "filename-reserved-regex-2.0.0" = { + name = "filename-reserved-regex"; + packageName = "filename-reserved-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229"; + }; + }; + "filenamify-2.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz"; + sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; + }; + }; "fill-range-2.2.3" = { name = "fill-range"; packageName = "fill-range"; @@ -1048,6 +2461,24 @@ let sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; }; }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "finalhandler-1.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + }; + }; "findup-sync-0.3.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -1102,6 +2533,15 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; + "form-data-1.0.0-rc3" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.0-rc3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"; + sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577"; + }; + }; "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; @@ -1111,6 +2551,51 @@ let sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; + "formidable-1.0.17" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + }; + "formidable-1.2.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from-0.1.7" = { + name = "from"; + packageName = "from"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + }; + }; "from2-2.3.0" = { name = "from2"; packageName = "from2"; @@ -1120,6 +2605,24 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "fs-extra-0.24.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz"; + sha1 = "d4e4342a96675cb7846633a6099249332b539952"; + }; + }; + "fs-extra-0.26.7" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.26.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; + }; + }; "fs-minipass-1.2.5" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -1138,6 +2641,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "fsevents-1.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; + sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + }; + }; "fstream-1.0.11" = { name = "fstream"; packageName = "fstream"; @@ -1156,6 +2668,42 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; + "get-proxy-2.1.0" = { + name = "get-proxy"; + packageName = "get-proxy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1165,6 +2713,24 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; + "git-clone-0.1.0" = { + name = "git-clone"; + packageName = "git-clone"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; + sha1 = "0d76163778093aef7f1c30238f2a9ef3f07a2eb9"; + }; + }; + "glob-3.2.11" = { + name = "glob"; + packageName = "glob"; + version = "3.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + }; "glob-5.0.15" = { name = "glob"; packageName = "glob"; @@ -1201,6 +2767,15 @@ let sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; }; }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; "global-4.3.2" = { name = "global"; packageName = "global"; @@ -1210,6 +2785,24 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; + "global-dirs-0.1.1" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + }; + }; + "got-6.7.1" = { + name = "got"; + packageName = "got"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + }; "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -1228,6 +2821,24 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; + "graphlib-2.1.5" = { + name = "graphlib"; + packageName = "graphlib"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; + }; + }; + "gray-matter-2.1.1" = { + name = "gray-matter"; + packageName = "gray-matter"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; + sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; + }; + }; "growl-1.10.3" = { name = "growl"; packageName = "growl"; @@ -1237,6 +2848,15 @@ let sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; }; }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; "grunt-known-options-1.1.0" = { name = "grunt-known-options"; packageName = "grunt-known-options"; @@ -1246,6 +2866,15 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; + "handlebars-4.0.11" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; + sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + }; + }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -1264,6 +2893,15 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; "has-flag-2.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -1282,6 +2920,33 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-generators-1.0.1" = { + name = "has-generators"; + packageName = "has-generators"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; + sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; + }; + }; + "has-symbol-support-x-1.4.2" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; + }; + }; + "has-to-string-tag-x-1.4.1" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -1291,6 +2956,42 @@ let sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; }; }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; "hawk-6.0.2" = { name = "hawk"; packageName = "hawk"; @@ -1318,6 +3019,15 @@ let sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; "http-methods-0.1.0" = { name = "http-methods"; packageName = "http-methods"; @@ -1336,22 +3046,22 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.12.3" = { + "hypercore-6.13.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.3"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.3.tgz"; - sha512 = "0gxq17xmp2926g01dram5fdny52r40lvvanf83d35vvrhsck95zx2ymrhn6hv81hp8wvlwlqs84zbz35xp6d0nf3396pa0kra44ma4k"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; + sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; }; }; - "hypercore-protocol-6.6.0" = { + "hypercore-protocol-6.6.4" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.6.0"; + version = "6.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.0.tgz"; - sha512 = "3kwmsg8vfza3i9nbx84v43sh4gi5bjpmj7mn15xyvxg30k0074yvgpng16g8310r88dsk055awlj9zf5zpsk1r0zy61890k9y7bpppg"; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; "hyperdrive-9.12.3" = { @@ -1390,6 +3100,42 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; + "iconv-lite-0.4.21" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.21"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; + sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; + }; + }; + "iconv-lite-0.4.8" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; + }; + }; + "ieee754-1.1.11" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz"; + sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n"; + }; + }; + "ignore-by-default-1.0.1" = { + name = "ignore-by-default"; + packageName = "ignore-by-default"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; + sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; + }; + }; "ignore-walk-3.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; @@ -1399,6 +3145,24 @@ let sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; }; }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1426,6 +3190,24 @@ let sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; + "inquirer-0.10.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; + sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; + }; + }; + "inquirer-3.3.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; + sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -1435,6 +3217,42 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; + "is-3.2.1" = { + name = "is"; + packageName = "is"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-3.2.1.tgz"; + sha1 = "d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1444,6 +3262,51 @@ let sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; + "is-ci-1.1.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + }; + }; "is-dotfile-1.0.3" = { name = "is-dotfile"; packageName = "is-dotfile"; @@ -1471,6 +3334,15 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; + }; + }; "is-extglob-1.0.0" = { name = "is-extglob"; packageName = "is-extglob"; @@ -1480,6 +3352,15 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; "is-fullwidth-code-point-1.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1516,6 +3397,60 @@ let sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; }; }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz"; + sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + }; + }; + "is-installed-globally-0.1.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + }; + "is-invalid-path-0.1.0" = { + name = "is-invalid-path"; + packageName = "is-invalid-path"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz"; + sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; + }; + }; + "is-natural-number-4.0.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "ab9d76e1db4ced51e35de0c72ebecf09f734cde8"; + }; + }; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -1534,6 +3469,60 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; + "is-number-4.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "is-object-1.0.1" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + }; + }; + "is-odd-2.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz"; + sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; + }; + }; + "is-path-inside-1.0.1" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; + }; + }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -1552,6 +3541,42 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; "is-string-1.0.4" = { name = "is-string"; packageName = "is-string"; @@ -1570,6 +3595,42 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "is-valid-path-0.1.1" = { + name = "is-valid-path"; + packageName = "is-valid-path"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz"; + sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df"; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1597,6 +3658,15 @@ let sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -1606,6 +3676,15 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; + }; + }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -1615,6 +3694,24 @@ let sha1 = "d03f666ca4e6130138565997cacea54164203156"; }; }; + "jade-0.26.3" = { + name = "jade"; + packageName = "jade"; + version = "0.26.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; + }; + }; + "js-yaml-3.11.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -1624,6 +3721,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "json-refs-2.1.7" = { + name = "json-refs"; + packageName = "json-refs"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz"; + sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -1633,6 +3739,15 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; + "json-schema-deref-sync-0.3.4" = { + name = "json-schema-deref-sync"; + packageName = "json-schema-deref-sync"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.3.4.tgz"; + sha512 = "1q3093cgk00pbsrzpb8h1j8cxl21gmnw5xb7wd5i3f47yawm6qmbg5ls94d1h1nhay2vh5fcz0wgfzy2ra2ylw77hrr0306apxj6az1"; + }; + }; "json-schema-traverse-0.3.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -1651,6 +3766,15 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; + "jsonfile-2.4.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -1714,6 +3838,33 @@ let sha1 = "20813df3d712928b207378691a45066fae72dd57"; }; }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; + }; + }; + "klaw-1.3.1" = { + name = "klaw"; + packageName = "klaw"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; + sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + }; + }; "last-one-wins-1.0.4" = { name = "last-one-wins"; packageName = "last-one-wins"; @@ -1723,6 +3874,24 @@ let sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; }; }; + "latest-version-3.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; "length-prefixed-message-3.0.3" = { name = "length-prefixed-message"; packageName = "length-prefixed-message"; @@ -1732,6 +3901,15 @@ let sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; }; }; + "lodash-3.10.1" = { + name = "lodash"; + packageName = "lodash"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -1741,6 +3919,231 @@ let sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; + "lodash-compat-3.10.2" = { + name = "lodash-compat"; + packageName = "lodash-compat"; + version = "3.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash-compat/-/lodash-compat-3.10.2.tgz"; + sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; + }; + }; + "lodash._arraypool-2.4.1" = { + name = "lodash._arraypool"; + packageName = "lodash._arraypool"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz"; + sha1 = "e88eecb92e2bb84c9065612fd958a0719cd47f94"; + }; + }; + "lodash._basebind-2.4.1" = { + name = "lodash._basebind"; + packageName = "lodash._basebind"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz"; + sha1 = "e940b9ebdd27c327e0a8dab1b55916c5341e9575"; + }; + }; + "lodash._baseclone-2.4.1" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz"; + sha1 = "30f823e57e17e3735d383bd62b60b387543b4186"; + }; + }; + "lodash._basecreate-2.4.1" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz"; + sha1 = "f8e6f5b578a9e34e541179b56b8eeebf4a287e08"; + }; + }; + "lodash._basecreatecallback-2.4.1" = { + name = "lodash._basecreatecallback"; + packageName = "lodash._basecreatecallback"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz"; + sha1 = "7d0b267649cb29e7a139d0103b7c11fae84e4851"; + }; + }; + "lodash._basecreatewrapper-2.4.1" = { + name = "lodash._basecreatewrapper"; + packageName = "lodash._basecreatewrapper"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz"; + sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f"; + }; + }; + "lodash._baseiteratee-4.7.0" = { + name = "lodash._baseiteratee"; + packageName = "lodash._baseiteratee"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz"; + sha1 = "34a9b5543572727c3db2e78edae3c0e9e66bd102"; + }; + }; + "lodash._basetostring-4.12.0" = { + name = "lodash._basetostring"; + packageName = "lodash._basetostring"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"; + sha1 = "9327c9dc5158866b7fa4b9d42f4638e5766dd9df"; + }; + }; + "lodash._baseuniq-4.6.0" = { + name = "lodash._baseuniq"; + packageName = "lodash._baseuniq"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; + sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; + }; + }; + "lodash._createset-4.0.3" = { + name = "lodash._createset"; + packageName = "lodash._createset"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"; + sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; + }; + }; + "lodash._createwrapper-2.4.1" = { + name = "lodash._createwrapper"; + packageName = "lodash._createwrapper"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz"; + sha1 = "51d6957973da4ed556e37290d8c1a18c53de1607"; + }; + }; + "lodash._getarray-2.4.1" = { + name = "lodash._getarray"; + packageName = "lodash._getarray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz"; + sha1 = "faf1f7f810fa985a251c2187404481094839e5ee"; + }; + }; + "lodash._isnative-2.4.1" = { + name = "lodash._isnative"; + packageName = "lodash._isnative"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"; + sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c"; + }; + }; + "lodash._maxpoolsize-2.4.1" = { + name = "lodash._maxpoolsize"; + packageName = "lodash._maxpoolsize"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz"; + sha1 = "9d482f463b8e66afbe59c2c14edb117060172334"; + }; + }; + "lodash._objecttypes-2.4.1" = { + name = "lodash._objecttypes"; + packageName = "lodash._objecttypes"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"; + sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"; + }; + }; + "lodash._releasearray-2.4.1" = { + name = "lodash._releasearray"; + packageName = "lodash._releasearray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz"; + sha1 = "a6139630d76d1536b07ddc80962889b082f6a641"; + }; + }; + "lodash._root-3.0.1" = { + name = "lodash._root"; + packageName = "lodash._root"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + }; + }; + "lodash._setbinddata-2.4.1" = { + name = "lodash._setbinddata"; + packageName = "lodash._setbinddata"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz"; + sha1 = "f7c200cd1b92ef236b399eecf73c648d17aa94d2"; + }; + }; + "lodash._shimkeys-2.4.1" = { + name = "lodash._shimkeys"; + packageName = "lodash._shimkeys"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"; + sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203"; + }; + }; + "lodash._slice-2.4.1" = { + name = "lodash._slice"; + packageName = "lodash._slice"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"; + sha1 = "745cf41a53597b18f688898544405efa2b06d90f"; + }; + }; + "lodash._stringtopath-4.8.0" = { + name = "lodash._stringtopath"; + packageName = "lodash._stringtopath"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz"; + sha1 = "941bcf0e64266e5fc1d66fed0a6959544c576824"; + }; + }; + "lodash.assign-2.4.1" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz"; + sha1 = "84c39596dd71181a97b0652913a7c9675e49b1aa"; + }; + }; + "lodash.bind-2.4.1" = { + name = "lodash.bind"; + packageName = "lodash.bind"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz"; + sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267"; + }; + }; + "lodash.clonedeep-2.4.1" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-2.4.1.tgz"; + sha1 = "f29203b40b12fee0a45d3631648259bebabc7868"; + }; + }; "lodash.flattendeep-4.4.0" = { name = "lodash.flattendeep"; packageName = "lodash.flattendeep"; @@ -1750,6 +4153,105 @@ let sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; }; }; + "lodash.foreach-2.4.1" = { + name = "lodash.foreach"; + packageName = "lodash.foreach"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz"; + sha1 = "fe3fc3a34c86c94cab6f9522560282741e016309"; + }; + }; + "lodash.forown-2.4.1" = { + name = "lodash.forown"; + packageName = "lodash.forown"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz"; + sha1 = "78b41eafe1405fa966459ea4193fd502d084524b"; + }; + }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; + "lodash.identity-2.4.1" = { + name = "lodash.identity"; + packageName = "lodash.identity"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"; + sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1"; + }; + }; + "lodash.isarray-2.4.1" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz"; + sha1 = "b52a326c1f62f6d7da73a31d5401df6ef44f0fa1"; + }; + }; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; + "lodash.isfunction-2.4.1" = { + name = "lodash.isfunction"; + packageName = "lodash.isfunction"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"; + sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; + }; + }; + "lodash.isobject-2.4.1" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"; + sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"; + }; + }; + "lodash.keys-2.4.1" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz"; + sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727"; + }; + }; + "lodash.noop-2.4.1" = { + name = "lodash.noop"; + packageName = "lodash.noop"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"; + sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a"; + }; + }; + "lodash.support-2.4.1" = { + name = "lodash.support"; + packageName = "lodash.support"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz"; + sha1 = "320e0b67031673c28d7a2bb5d9e0331a45240515"; + }; + }; "lodash.throttle-4.1.1" = { name = "lodash.throttle"; packageName = "lodash.throttle"; @@ -1759,6 +4261,42 @@ let sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; }; }; + "lodash.uniqby-4.5.0" = { + name = "lodash.uniqby"; + packageName = "lodash.uniqby"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz"; + sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; + }; + }; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + }; + }; "lru-2.0.1" = { name = "lru"; packageName = "lru"; @@ -1777,6 +4315,87 @@ let sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; }; }; + "lru-cache-2.7.3" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; + sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + }; + }; + "lru-cache-4.1.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; + }; + }; + "make-dir-1.2.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz"; + sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8"; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "md5-2.2.1" = { + name = "md5"; + packageName = "md5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "memory-cache-0.1.6" = { + name = "memory-cache"; + packageName = "memory-cache"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-cache/-/memory-cache-0.1.6.tgz"; + sha1 = "2ed9933ed7a8c718249be7366f7ca8749acf8a24"; + }; + }; "memory-pager-1.1.0" = { name = "memory-pager"; packageName = "memory-pager"; @@ -1795,6 +4414,24 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; + "metalsmith-2.3.0" = { + name = "metalsmith"; + packageName = "metalsmith"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; + sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; "micromatch-2.3.11" = { name = "micromatch"; packageName = "micromatch"; @@ -1804,6 +4441,33 @@ let sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; + }; + }; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + }; + "mime-1.4.1" = { + name = "mime"; + packageName = "mime"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + }; + }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -1831,6 +4495,15 @@ let sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; + }; + }; "min-document-2.19.0" = { name = "min-document"; packageName = "min-document"; @@ -1840,6 +4513,15 @@ let sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; }; + "minimatch-0.3.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -1867,13 +4549,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.2.1" = { + "minipass-2.2.4" = { name = "minipass"; packageName = "minipass"; - version = "2.2.1"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; - sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; + sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; }; }; "minizlib-1.1.0" = { @@ -1894,6 +4576,24 @@ let sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; }; }; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; + }; + }; + "mkdirp-0.3.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + }; "mkdirp-0.5.1" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1903,6 +4603,33 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; + "mocha-2.5.3" = { + name = "mocha"; + packageName = "mocha"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; + sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; + }; + }; + "mpath-0.2.1" = { + name = "mpath"; + packageName = "mpath"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz"; + sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e"; + }; + }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "ms-2.0.0" = { name = "ms"; packageName = "ms"; @@ -1912,6 +4639,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "multer-1.3.0" = { + name = "multer"; + packageName = "multer"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz"; + sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2"; + }; + }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -1930,6 +4666,15 @@ let sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; + "multicast-dns-7.0.0" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; + }; + }; "multicb-1.2.2" = { name = "multicb"; packageName = "multicb"; @@ -1939,6 +4684,33 @@ let sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; }; }; + "multimatch-2.1.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"; + sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; + }; + }; + "multistream-2.1.0" = { + name = "multistream"; + packageName = "multistream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; + sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; + }; + }; + "mute-stream-0.0.5" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + }; + }; "mute-stream-0.0.7" = { name = "mute-stream"; packageName = "mute-stream"; @@ -1957,13 +4729,13 @@ let sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; }; }; - "nan-2.9.2" = { + "nan-2.10.0" = { name = "nan"; packageName = "nan"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; - sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; }; }; "nanoassert-1.1.0" = { @@ -1984,6 +4756,15 @@ let sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; }; }; + "nanomatch-1.2.9" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz"; + sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z"; + }; + }; "nanotiming-1.0.1" = { name = "nanotiming"; packageName = "nanotiming"; @@ -1993,6 +4774,15 @@ let sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; }; }; + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; "ncp-1.0.1" = { name = "ncp"; packageName = "ncp"; @@ -2011,6 +4801,15 @@ let sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; + "needle-2.2.0" = { + name = "needle"; + packageName = "needle"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; + sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; + }; + }; "nets-3.2.0" = { name = "nets"; packageName = "nets"; @@ -2029,6 +4828,15 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; "node-gyp-build-3.3.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -2038,6 +4846,24 @@ let sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; }; + "nodemon-1.17.3" = { + name = "nodemon"; + packageName = "nodemon"; + version = "1.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; + sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; + }; + }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + }; "nopt-3.0.6" = { name = "nopt"; packageName = "nopt"; @@ -2074,6 +4900,15 @@ let sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; }; }; + "npm-conf-1.1.3" = { + name = "npm-conf"; + packageName = "npm-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; + }; + }; "npm-packlist-1.1.10" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -2083,6 +4918,15 @@ let sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; }; }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -2110,6 +4954,15 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; + "object-assign-3.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; + }; + }; "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; @@ -2119,6 +4972,24 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; "object.omit-2.0.1" = { name = "object.omit"; packageName = "object.omit"; @@ -2128,6 +4999,33 @@ let sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; }; }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "on-finished-2.2.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -2137,6 +5035,33 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "onetime-1.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "1.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; "optparse-1.0.5" = { name = "optparse"; packageName = "optparse"; @@ -2146,6 +5071,15 @@ let sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; + "ora-1.4.0" = { + name = "ora"; + packageName = "ora"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; + }; + }; "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; @@ -2173,6 +5107,24 @@ let sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "package-json-4.0.1" = { + name = "package-json"; + packageName = "package-json"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + }; + }; "parse-glob-3.0.4" = { name = "parse-glob"; packageName = "parse-glob"; @@ -2191,6 +5143,33 @@ let sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; }; }; + "parseurl-1.3.2" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; + sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -2200,6 +5179,60 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-loader-1.0.4" = { + name = "path-loader"; + packageName = "path-loader"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; + sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; + }; + }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + }; "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; @@ -2209,6 +5242,42 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; "pkginfo-0.3.1" = { name = "pkginfo"; packageName = "pkginfo"; @@ -2227,6 +5296,24 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; "preserve-0.2.0" = { name = "preserve"; packageName = "preserve"; @@ -2299,6 +5386,15 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; "protocol-buffers-encodings-1.1.0" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; @@ -2308,6 +5404,33 @@ let sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; + "ps-tree-1.1.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; + sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "pstree.remy-1.1.0" = { + name = "pstree.remy"; + packageName = "pstree.remy"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; + sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; + }; + }; "pump-1.0.3" = { name = "pump"; packageName = "pump"; @@ -2326,6 +5449,15 @@ let sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -2335,6 +5467,42 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.0" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; + sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; + }; + }; + "qs-2.3.3" = { + name = "qs"; + packageName = "qs"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + }; + }; + "qs-2.4.2" = { + name = "qs"; + packageName = "qs"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; + }; + }; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + }; + }; "qs-6.5.1" = { name = "qs"; packageName = "qs"; @@ -2344,6 +5512,15 @@ let sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; + "raf-3.3.2" = { + name = "raf"; + packageName = "raf"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raf/-/raf-3.3.2.tgz"; + sha1 = "0c13be0b5b49b46f76d6669248d527cf2b02fe27"; + }; + }; "random-access-file-2.0.1" = { name = "random-access-file"; packageName = "random-access-file"; @@ -2398,13 +5575,22 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "rc-1.2.5" = { + "raw-body-2.0.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.0.2.tgz"; + sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca"; + }; + }; + "rc-1.2.6" = { name = "rc"; packageName = "rc"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; - sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; + sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; }; }; "read-1.0.7" = { @@ -2416,13 +5602,40 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "readable-stream-2.3.5" = { + "read-metadata-1.0.0" = { + name = "read-metadata"; + packageName = "read-metadata"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz"; + sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6"; + }; + }; + "readable-stream-1.0.27-1" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.27-1"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; - sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; }; }; "readdirp-2.1.0" = { @@ -2434,13 +5647,40 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "recursive-watch-1.1.3" = { + "readline2-1.0.1" = { + name = "readline2"; + packageName = "readline2"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + }; + }; + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + }; + }; + "recursive-watch-1.1.4" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; - sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; + }; + }; + "reduce-component-1.0.1" = { + name = "reduce-component"; + packageName = "reduce-component"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; }; "regex-cache-0.4.4" = { @@ -2452,6 +5692,33 @@ let sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; + }; + }; + "registry-auth-token-3.3.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -2479,15 +5746,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; - }; - }; "request-2.85.0" = { name = "request"; packageName = "request"; @@ -2506,6 +5764,42 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "restore-cursor-1.0.1" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + }; + }; "revalidator-0.1.8" = { name = "revalidator"; packageName = "revalidator"; @@ -2515,6 +5809,15 @@ let sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; }; }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; "rimraf-2.6.2" = { name = "rimraf"; packageName = "rimraf"; @@ -2524,6 +5827,24 @@ let sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; + "run-async-0.1.0" = { + name = "run-async"; + packageName = "run-async"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; + sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; "rusha-0.8.13" = { name = "rusha"; packageName = "rusha"; @@ -2533,6 +5854,33 @@ let sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; + "rx-lite-3.1.2" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; + sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + }; + }; + "rx-lite-4.0.8" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; + sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + }; + }; + "rx-lite-aggregates-4.0.8" = { + name = "rx-lite-aggregates"; + packageName = "rx-lite-aggregates"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; + sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + }; + }; "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -2542,6 +5890,51 @@ let sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + }; + }; + "sanitize-filename-1.6.1" = { + name = "sanitize-filename"; + packageName = "sanitize-filename"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz"; + sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a"; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + }; + }; + "seek-bzip-1.0.5" = { + name = "seek-bzip"; + packageName = "seek-bzip"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz"; + sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc"; + }; + }; "semver-5.3.0" = { name = "semver"; packageName = "semver"; @@ -2560,6 +5953,33 @@ let sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + }; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + }; + }; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -2578,6 +5998,69 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "sigmund-1.0.1" = { + name = "sigmund"; + packageName = "sigmund"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -2614,6 +6097,15 @@ let sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; }; }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; "slasp-0.0.4" = { name = "slasp"; packageName = "slasp"; @@ -2632,6 +6124,51 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; + "snabbdom-0.7.0" = { + name = "snabbdom"; + packageName = "snabbdom"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snabbdom/-/snabbdom-0.7.0.tgz"; + sha512 = "3bh1m1ymhqqcm0mlxy5ja4xhcrryczvjda6jf8k6km9fx655x1wn7gx85i9rqds6wr1nwzccrdq72d5wn1274lxkzwy1n39gya3la1c"; + }; + }; + "snabbdom-selector-1.2.1" = { + name = "snabbdom-selector"; + packageName = "snabbdom-selector"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snabbdom-selector/-/snabbdom-selector-1.2.1.tgz"; + sha512 = "3d51vgryfsxmpva2m93ca6z130m6vh4aiii2r9w7wkibrqy6z5zjyr2p26lmghn8msdfi1yvg9hfjq573q45vazzy2my9hivqb3ck43"; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; + }; + }; "sntp-2.1.0" = { name = "sntp"; packageName = "sntp"; @@ -2641,22 +6178,22 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "sodium-javascript-0.5.4" = { + "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; - sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.4" = { + "sodium-native-2.1.5" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; - sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; + sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; }; }; "sodium-universal-2.0.0" = { @@ -2677,6 +6214,15 @@ let sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; }; }; + "sorted-immutable-list-1.1.0" = { + name = "sorted-immutable-list"; + packageName = "sorted-immutable-list"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-immutable-list/-/sorted-immutable-list-1.1.0.tgz"; + sha1 = "41a62c024bd755c4c57306e20eec92620dae5d97"; + }; + }; "sorted-indexof-1.0.0" = { name = "sorted-indexof"; packageName = "sorted-indexof"; @@ -2686,6 +6232,51 @@ let sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; }; }; + "source-map-0.4.4" = { + name = "source-map"; + packageName = "source-map"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; + sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-resolve-0.5.1" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; + sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spark-md5-1.0.1" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-1.0.1.tgz"; + sha1 = "c4b9a8d41cf7b0845423a821824f8dffa0f51b7c"; + }; + }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -2704,13 +6295,40 @@ let sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; }; }; - "sshpk-1.13.1" = { + "split-0.3.3" = { + name = "split"; + packageName = "split"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.14.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.13.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; "stack-trace-0.0.10" = { @@ -2722,6 +6340,24 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; + "stat-mode-0.2.2" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; + sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; "status-logger-3.1.1" = { name = "status-logger"; packageName = "status-logger"; @@ -2731,6 +6367,24 @@ let sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; }; }; + "statuses-1.3.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + }; + "statuses-1.4.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; + sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + }; + }; "stream-collector-1.0.1" = { name = "stream-collector"; packageName = "stream-collector"; @@ -2740,6 +6394,15 @@ let sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; }; }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; "stream-each-1.2.2" = { name = "stream-each"; packageName = "stream-each"; @@ -2767,6 +6430,24 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; + "string-3.3.3" = { + name = "string"; + packageName = "string"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string/-/string-3.3.3.tgz"; + sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -2785,13 +6466,22 @@ let sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; - "string_decoder-1.0.3" = { + "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.3"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; "stringstream-0.0.5" = { @@ -2821,6 +6511,24 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; + "strip-dirs-2.1.0" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -2830,6 +6538,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "strip-outer-1.0.1" = { + name = "strip-outer"; + packageName = "strip-outer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; + }; + }; "subcommand-2.1.0" = { name = "subcommand"; packageName = "subcommand"; @@ -2839,6 +6556,42 @@ let sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; }; }; + "superagent-1.8.5" = { + name = "superagent"; + packageName = "superagent"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz"; + sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55"; + }; + }; + "superagent-3.8.2" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; + sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; + }; + }; + "supports-color-1.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz"; + sha1 = "ff1ed1e61169d06b3cf2d588e188b18d8847e17e"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; "supports-color-4.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -2857,6 +6610,60 @@ let sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; }; }; + "swagger-converter-0.1.7" = { + name = "swagger-converter"; + packageName = "swagger-converter"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.1.7.tgz"; + sha1 = "a097519c6f1ee4dd67e308d9b53ddc9c2b257f97"; + }; + }; + "swagger-converter-0.2.0" = { + name = "swagger-converter"; + packageName = "swagger-converter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.2.0.tgz"; + sha1 = "354023cfc5ed3d4ef6895c310189067bbe66d616"; + }; + }; + "swagger-editor-2.10.5" = { + name = "swagger-editor"; + packageName = "swagger-editor"; + version = "2.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-editor/-/swagger-editor-2.10.5.tgz"; + sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a"; + }; + }; + "swagger-test-templates-1.4.3" = { + name = "swagger-test-templates"; + packageName = "swagger-test-templates"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz"; + sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0"; + }; + }; + "swagger-tools-0.9.16" = { + name = "swagger-tools"; + packageName = "swagger-tools"; + version = "0.9.16"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-tools/-/swagger-tools-0.9.16.tgz"; + sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; + }; + }; + "symbol-observable-1.2.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha512 = "1fxqjwdn747lxzkxrwhbw8arc9czdig47izx5hnzk22z8k7rnw00q8vcpy8v7a3xyamavwgg4mvjkpn2ihjiyjxjnhx2ihiryf39pbv"; + }; + }; "tar-2.2.1" = { name = "tar"; packageName = "tar"; @@ -2866,13 +6673,31 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-4.4.0" = { + "tar-4.4.1" = { name = "tar"; packageName = "tar"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz"; - sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; + sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + }; + }; + "tar-stream-1.5.5" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; + sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + }; + }; + "term-size-1.2.0" = { + name = "term-size"; + packageName = "term-size"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; "throttle-1.0.3" = { @@ -2884,6 +6709,15 @@ let sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; }; }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; "through2-2.0.3" = { name = "through2"; packageName = "through2"; @@ -2893,6 +6727,24 @@ let sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; }; }; + "thunkify-2.1.2" = { + name = "thunkify"; + packageName = "thunkify"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz"; + sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; + }; + }; + "thunkify-wrap-1.0.4" = { + name = "thunkify-wrap"; + packageName = "thunkify-wrap"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify-wrap/-/thunkify-wrap-1.0.4.tgz"; + sha1 = "b52be548ddfefda20e00b58c6096762b43dd6880"; + }; + }; "thunky-0.1.0" = { name = "thunky"; packageName = "thunky"; @@ -2911,6 +6763,33 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; + "tildify-1.2.0" = { + name = "tildify"; + packageName = "tildify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; + sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; + }; + }; + "timed-out-4.0.1" = { + name = "timed-out"; + packageName = "timed-out"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + }; + }; "to-buffer-1.1.0" = { name = "to-buffer"; packageName = "to-buffer"; @@ -2920,6 +6799,42 @@ let sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; }; }; + "to-iso-string-0.0.2" = { + name = "to-iso-string"; + packageName = "to-iso-string"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz"; + sha1 = "4dc19e664dfccbe25bd8db508b00c6da158255d1"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; "toiletdb-1.4.1" = { name = "toiletdb"; packageName = "toiletdb"; @@ -2929,6 +6844,24 @@ let sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; }; }; + "toml-2.3.3" = { + name = "toml"; + packageName = "toml"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz"; + sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; + }; + }; + "touch-3.1.0" = { + name = "touch"; + packageName = "touch"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; + sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + }; + }; "tough-cookie-2.3.4" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -2947,6 +6880,15 @@ let sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; }; }; + "traverse-0.6.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }; + }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -2956,6 +6898,24 @@ let sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; }; }; + "trim-repeated-1.0.0" = { + name = "trim-repeated"; + packageName = "trim-repeated"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; + }; + }; + "truncate-utf8-bytes-1.0.2" = { + name = "truncate-utf8-bytes"; + packageName = "truncate-utf8-bytes"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + }; + }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -2983,6 +6943,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "type-is-1.6.16" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.16"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; + }; + }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -2992,13 +6961,76 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "uint64be-2.0.1" = { + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "uid-0.0.2" = { + name = "uid"; + packageName = "uid"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; + sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; + }; + }; + "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; - version = "2.0.1"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; + }; + }; + "unbzip2-stream-1.2.5" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; - sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; + }; + }; + "undefsafe-2.0.2" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; + sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "unique-string-1.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; "unixify-1.0.0" = { @@ -3037,6 +7069,24 @@ let sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; }; }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; "untildify-3.0.2" = { name = "untildify"; packageName = "untildify"; @@ -3046,6 +7096,105 @@ let sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; }; }; + "unyield-0.0.1" = { + name = "unyield"; + packageName = "unyield"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unyield/-/unyield-0.0.1.tgz"; + sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "upath-1.0.4" = { + name = "upath"; + packageName = "upath"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; + sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + }; + }; + "update-notifier-2.4.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; + sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + }; + }; + "uri-js-3.0.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; + sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "use-3.1.0" = { + name = "use"; + packageName = "use"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; + sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9"; + }; + }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; + "utf8-byte-length-1.0.4" = { + name = "utf8-byte-length"; + packageName = "utf8-byte-length"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -3064,13 +7213,22 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; - "utp-native-1.6.2" = { + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "utp-native-1.7.0" = { name = "utp-native"; packageName = "utp-native"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; - sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; + sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; }; }; "uuid-3.2.1" = { @@ -3082,6 +7240,42 @@ let sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; + "valid-url-1.0.9" = { + name = "valid-url"; + packageName = "valid-url"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz"; + sha1 = "1c14479b40f1397a75782f115e4086447433a200"; + }; + }; + "validate-npm-package-name-3.0.0" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + }; + }; + "validator-9.4.1" = { + name = "validator"; + packageName = "validator"; + version = "9.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; + sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1"; + }; + }; + "variable-diff-1.1.0" = { + name = "variable-diff"; + packageName = "variable-diff"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/variable-diff/-/variable-diff-1.1.0.tgz"; + sha1 = "d2bd5c66db76c13879d96e6a306edc989df978da"; + }; + }; "varint-3.0.1" = { name = "varint"; packageName = "varint"; @@ -3118,6 +7312,15 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "ware-1.3.0" = { + name = "ware"; + packageName = "ware"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"; + sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; + }; + }; "which-1.3.0" = { name = "which"; packageName = "which"; @@ -3136,6 +7339,33 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; + "widest-line-2.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; + sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; + }; + }; + "win-fork-1.1.1" = { + name = "win-fork"; + packageName = "win-fork"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; + sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; "winston-2.1.1" = { name = "winston"; packageName = "winston"; @@ -3145,6 +7375,24 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; "wrap-ansi-3.0.1" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -3154,6 +7402,15 @@ let sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; }; }; + "wrap-fn-0.1.5" = { + name = "wrap-fn"; + packageName = "wrap-fn"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz"; + sha1 = "f21b6e41016ff4a7e31720dbc63a09016bdf9845"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -3163,6 +7420,24 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; + "write-file-atomic-2.3.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; + sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; + }; + }; + "xdg-basedir-3.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + }; "xhr-2.4.1" = { name = "xhr"; packageName = "xhr"; @@ -3181,6 +7456,15 @@ let sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; }; }; + "xstream-11.2.0" = { + name = "xstream"; + packageName = "xstream"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xstream/-/xstream-11.2.0.tgz"; + sha512 = "2jnrf16561zx9hsvlb8d48ca9qwdh9wxcbkwhkjvp5r88b8pcfjlx2g58k9w5kjs0kw660rw6hj2zhvdsznyf0ic9mj682xz6hf7kfh"; + }; + }; "xtend-4.0.1" = { name = "xtend"; packageName = "xtend"; @@ -3190,6 +7474,15 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; "yallist-3.0.2" = { name = "yallist"; packageName = "yallist"; @@ -3199,16 +7492,52 @@ let sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; }; }; + "yaml-js-0.0.8" = { + name = "yaml-js"; + packageName = "yaml-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.0.8.tgz"; + sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "yauzl-2.9.1" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; + }; + }; + "z-schema-3.19.1" = { + name = "z-schema"; + packageName = "z-schema"; + version = "3.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz"; + sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc"; + }; + }; }; in { bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; }; buildInputs = globalBuildInputs; meta = { @@ -3236,6 +7565,142 @@ in production = true; bypassCache = true; }; + create-cycle-app = nodeEnv.buildNodePackage { + name = "create-cycle-app"; + packageName = "create-cycle-app"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-4.0.0.tgz"; + sha512 = "28v46s87z1qgi46mn0kdhw77dnra3pkhr7nlf4d6dxl46l9aba1hm1wqz2dxhr0g3pwqav8pg5c1qdxkr18ybvlkmhbkyyz0pp13y51"; + }; + dependencies = [ + sources."@cycle/dom-18.3.0" + sources."@cycle/http-14.9.0" + sources."@cycle/isolate-3.2.0" + sources."@cycle/run-3.4.0" + (sources."@cycle/time-0.10.1" // { + dependencies = [ + sources."chalk-1.1.3" + ]; + }) + sources."@types/node-9.6.2" + sources."@types/superagent-3.5.6" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."asynckit-0.4.0" + (sources."chalk-2.3.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."supports-color-5.3.0" + ]; + }) + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combine-errors-3.0.3" + sources."combined-stream-1.0.6" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-5.1.0" + sources."cssauron-1.4.0" + sources."custom-error-instance-2.1.1" + sources."cycle-onionify-4.0.0" + sources."d-1.0.0" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" + sources."es5-ext-0.10.42" + sources."es6-iterator-2.0.3" + sources."es6-map-0.1.5" + sources."es6-set-0.1.5" + sources."es6-symbol-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."event-emitter-0.3.5" + sources."extend-3.0.1" + sources."external-editor-2.2.0" + sources."figures-2.0.0" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."iconv-lite-0.4.21" + sources."inherits-2.0.3" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."is-fullwidth-code-point-2.0.0" + sources."is-promise-2.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."lodash-4.17.5" + sources."lodash._baseiteratee-4.7.0" + sources."lodash._basetostring-4.12.0" + sources."lodash._baseuniq-4.6.0" + sources."lodash._createset-4.0.3" + sources."lodash._root-3.0.1" + sources."lodash._stringtopath-4.8.0" + sources."lodash.uniqby-4.5.0" + sources."lru-cache-4.1.2" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."next-tick-1.0.0" + sources."object-assign-4.1.1" + sources."onetime-2.0.1" + sources."os-tmpdir-1.0.2" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."qs-6.5.1" + sources."raf-3.3.2" + sources."readable-stream-2.3.6" + sources."restore-cursor-2.0.0" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."setimmediate-1.0.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."snabbdom-0.7.0" + sources."snabbdom-selector-1.2.1" + sources."sorted-immutable-list-1.1.0" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."superagent-3.8.2" + sources."supports-color-2.0.0" + sources."symbol-observable-1.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."util-deprecate-1.0.2" + sources."variable-diff-1.1.0" + sources."which-1.3.0" + sources."xstream-11.2.0" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Create Cycle.js with no build configuration."; + homepage = "https://github.com/cyclejs-community/create-cycle-app#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + }; dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; @@ -3247,7 +7712,7 @@ in dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - sources."ansi-diff-stream-1.2.0" + sources."ansi-diff-stream-1.2.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" @@ -3263,7 +7728,7 @@ in sources."asynckit-0.4.0" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bencode-1.0.0" @@ -3283,13 +7748,18 @@ in sources."kind-of-4.0.0" ]; }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" - sources."bulk-write-stream-1.1.3" + sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" sources."chalk-2.3.2" + sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -3299,7 +7769,7 @@ in sources."colors-1.2.1" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" @@ -3315,13 +7785,16 @@ in (sources."dat-doctor-1.3.1" // { dependencies = [ sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."lru-2.0.1" + sources."multicast-dns-6.2.3" sources."pump-1.0.3" ]; }) sources."dat-encoding-5.0.1" - sources."dat-ignore-2.0.0" - (sources."dat-json-1.0.1" // { + sources."dat-ignore-2.1.1" + (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" sources."debug-2.6.9" @@ -3339,6 +7812,7 @@ in }) (sources."dat-node-3.5.8" // { dependencies = [ + sources."buffer-alloc-unsafe-0.1.1" sources."minimist-0.0.8" sources."process-nextick-args-1.0.7" sources."pump-1.0.3" @@ -3355,15 +7829,24 @@ in sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" sources."directory-index-html-2.1.0" - sources."discovery-channel-5.4.7" + (sources."discovery-channel-5.5.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) (sources."discovery-swarm-4.4.2" // { dependencies = [ + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) sources."thunky-0.1.0" ]; }) sources."dns-discovery-5.6.1" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" + sources."dns-packet-4.2.0" + sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" sources."duplexify-3.5.4" @@ -3401,12 +7884,12 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.3" // { + (sources."hypercore-6.13.0" // { dependencies = [ sources."varint-5.0.0" ]; }) - sources."hypercore-protocol-6.6.0" + sources."hypercore-protocol-6.6.4" (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" @@ -3468,11 +7951,12 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.3" + sources."multicast-dns-7.0.0" sources."multicb-1.2.2" + sources."multistream-2.1.0" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -3525,8 +8009,8 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.5" - sources."recursive-watch-1.1.3" + sources."readable-stream-2.3.6" + sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -3541,14 +8025,14 @@ in sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" - sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.4" + sources."sodium-javascript-0.5.5" + sources."sodium-native-2.1.5" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stack-trace-0.0.10" sources."status-logger-3.1.1" sources."stream-collector-1.0.1" @@ -3556,7 +8040,7 @@ in sources."stream-parser-0.3.1" sources."stream-shift-1.0.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-4.0.0" (sources."subcommand-2.1.0" // { @@ -3581,14 +8065,14 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uint64be-2.0.1" + sources."uint64be-2.0.2" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.6.2" + sources."utp-native-1.7.0" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -3650,10 +8134,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz"; - sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; + sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -3728,7 +8212,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" @@ -3799,7 +8283,7 @@ in sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -3807,9 +8291,9 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" @@ -3852,124 +8336,77 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.8.0.tgz"; - sha512 = "3z3mz92ya4hx3mg902sb6kwlkfz8dkc12hxcnp4sygbiahbiknzh585jrf9zf3bqd9xgsh9109dz5mqwjh268zl0nmn2n30fl7cqa49"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; + sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" - sources."caseless-0.12.0" sources."chownr-1.0.1" - sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."dashdash-1.14.1" + sources."debug-2.6.9" sources."deep-extend-0.4.2" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" - sources."fast-json-stable-stringify-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."getpass-0.1.7" sources."glob-7.1.2" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" - sources."http-signature-1.2.0" + sources."iconv-lite-0.4.21" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-fullwidth-code-point-1.0.0" - sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.2.1" + sources."minipass-2.2.4" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."needle-2.2.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" sources."npm-packlist-1.1.10" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" - sources."qs-6.5.1" - (sources."rc-1.2.5" // { + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.5" - sources."request-2.83.0" + sources."readable-stream-2.3.6" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" - sources."sshpk-1.13.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" - sources."stringstream-0.0.5" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.0" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."tar-4.4.1" sources."util-deprecate-1.0.2" - sources."uuid-3.2.1" - sources."verror-1.10.0" sources."wide-align-1.1.2" sources."wrappy-1.0.2" sources."yallist-3.0.2" @@ -3986,10 +8423,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.35.8"; + version = "1.38.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.8.tgz"; - sha1 = "de87c7b33f00189654aea49b4eb56317dcdbe7cd"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.3.tgz"; + sha1 = "84b7ce1eee5d893c51995752e8afc2ee726539e3"; }; buildInputs = globalBuildInputs; meta = { @@ -4041,11 +8478,11 @@ in sources."lodash-4.17.5" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -4057,13 +8494,892 @@ in production = true; bypassCache = true; }; + vue-cli = nodeEnv.buildNodePackage { + name = "vue-cli"; + packageName = "vue-cli"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; + sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + }; + dependencies = [ + sources."absolute-0.0.1" + sources."ajv-5.5.2" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.1.0" + sources."ansi-red-0.1.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + sources."argparse-1.0.10" + sources."array-differ-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.2" + sources."bluebird-3.5.1" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-3.6.0" + sources."buffer-crc32-0.2.13" + sources."builtins-1.0.3" + sources."camelcase-1.2.1" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."center-align-0.1.3" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."co-3.1.0" + sources."co-from-stream-0.0.0" + sources."co-fs-extra-1.2.1" + sources."co-read-0.0.1" + sources."coffee-script-1.12.7" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."config-chain-1.1.11" + sources."consolidate-0.14.5" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + (sources."decompress-4.2.0" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" + sources."delayed-stream-1.0.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."enable-1.3.2" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."extend-3.0.1" + sources."extend-shallow-2.0.1" + sources."external-editor-2.2.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."figures-2.0.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."git-clone-0.1.0" + sources."glob-7.1.2" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."gray-matter-2.1.1" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-generators-1.0.1" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.21" + sources."ieee754-1.1.11" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-natural-number-4.0.1" + sources."is-object-1.0.1" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."klaw-1.3.1" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."log-symbols-2.2.0" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + (sources."make-dir-1.2.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."metalsmith-2.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."multimatch-2.1.0" + sources."mute-stream-0.0.7" + sources."npm-conf-1.1.3" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optimist-0.6.1" + sources."ora-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."read-metadata-1.0.0" + sources."readable-stream-2.3.6" + sources."recursive-readdir-2.2.2" + sources."repeat-string-1.6.1" + (sources."request-2.85.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."seek-bzip-1.0.5" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."stat-mode-0.2.2" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + sources."strip-dirs-2.1.0" + sources."strip-outer-1.0.1" + sources."supports-color-5.3.0" + sources."tar-stream-1.5.5" + sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."thunkify-wrap-1.0.4" + sources."tildify-1.2.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."toml-2.3.3" + sources."tough-cookie-2.3.4" + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-0.0.2" + sources."unbzip2-stream-1.2.5" + sources."unyield-0.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."ware-1.3.0" + sources."win-fork-1.1.1" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yaml-js-0.0.8" + sources."yargs-3.10.0" + sources."yauzl-2.9.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple CLI for scaffolding Vue.js projects."; + homepage = "https://github.com/vuejs/vue-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + swagger = nodeEnv.buildNodePackage { + name = "swagger"; + packageName = "swagger"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger/-/swagger-0.7.5.tgz"; + sha1 = "3be6ee3d392c3b006fc7a9b5b2d60c7e834860fd"; + }; + dependencies = [ + sources."URIjs-1.16.1" + sources."abbrev-1.1.1" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) + sources."append-field-0.1.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-1.5.2" + sources."async-each-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."binary-extensions-1.11.0" + (sources."body-parser-1.12.4" // { + dependencies = [ + sources."debug-2.2.0" + sources."qs-2.4.2" + ]; + }) + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + sources."buffer-from-1.0.0" + sources."busboy-0.2.14" + sources."bytes-1.0.0" + sources."cache-base-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."charenc-0.0.2" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."ci-info-1.1.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."cliui-2.1.0" + sources."clone-2.0.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" + sources."connect-3.6.6" + sources."content-type-1.0.4" + sources."cookiejar-2.1.1" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypt-0.0.2" + sources."crypto-random-string-1.0.0" + sources."dag-map-1.0.2" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.4.2" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dicer-0.2.5" + sources."diff-1.4.0" + sources."dot-prop-4.2.0" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."etag-1.8.1" + sources."event-stream-3.3.4" + sources."execa-0.7.0" + sources."exit-hook-1.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-3.0.1" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."figures-1.7.0" + sources."fill-range-4.0.0" + sources."finalhandler-1.1.0" + sources."for-in-1.0.2" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from-0.1.7" + sources."fs-extra-0.24.0" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.2" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graphlib-2.1.5" + sources."growl-1.9.2" + sources."handlebars-4.0.11" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.8" + sources."ignore-by-default-1.0.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-0.10.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-ci-1.1.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.0" + sources."is-installed-globally-0.1.0" + sources."is-invalid-path-0.1.0" + sources."is-npm-1.0.0" + sources."is-number-4.0.0" + sources."is-obj-1.0.1" + sources."is-odd-2.0.0" + sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-valid-path-0.1.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + (sources."jade-0.26.3" // { + dependencies = [ + sources."commander-0.6.1" + sources."mkdirp-0.3.0" + ]; + }) + sources."js-yaml-3.11.0" + (sources."json-refs-2.1.7" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."qs-6.5.1" + sources."superagent-3.8.2" + ]; + }) + (sources."json-schema-deref-sync-0.3.4" // { + dependencies = [ + sources."lodash-4.17.5" + ]; + }) + sources."jsonfile-2.4.0" + sources."kind-of-6.0.2" + sources."latest-version-3.1.0" + sources."lazy-cache-1.0.4" + sources."lodash-3.10.1" + sources."lodash-compat-3.10.2" + sources."lodash._arraypool-2.4.1" + sources."lodash._basebind-2.4.1" + sources."lodash._baseclone-2.4.1" + sources."lodash._basecreate-2.4.1" + sources."lodash._basecreatecallback-2.4.1" + sources."lodash._basecreatewrapper-2.4.1" + sources."lodash._createwrapper-2.4.1" + sources."lodash._getarray-2.4.1" + sources."lodash._isnative-2.4.1" + sources."lodash._maxpoolsize-2.4.1" + sources."lodash._objecttypes-2.4.1" + sources."lodash._releasearray-2.4.1" + sources."lodash._setbinddata-2.4.1" + sources."lodash._shimkeys-2.4.1" + sources."lodash._slice-2.4.1" + sources."lodash.assign-2.4.1" + sources."lodash.bind-2.4.1" + sources."lodash.clonedeep-2.4.1" + sources."lodash.foreach-2.4.1" + sources."lodash.forown-2.4.1" + sources."lodash.get-4.4.2" + sources."lodash.identity-2.4.1" + sources."lodash.isarray-2.4.1" + sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-2.4.1" + sources."lodash.isobject-2.4.1" + sources."lodash.keys-2.4.1" + sources."lodash.noop-2.4.1" + sources."lodash.support-2.4.1" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-2.7.3" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-stream-0.1.0" + sources."map-visit-1.0.0" + sources."md5-2.2.1" + sources."media-typer-0.3.0" + sources."memory-cache-0.1.6" + sources."methods-1.1.2" + sources."micromatch-3.1.10" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" + (sources."mocha-2.5.3" // { + dependencies = [ + sources."commander-2.3.0" + sources."debug-2.2.0" + sources."escape-string-regexp-1.0.2" + sources."glob-3.2.11" + sources."minimatch-0.3.0" + sources."ms-0.7.1" + sources."supports-color-1.2.0" + ]; + }) + sources."mpath-0.2.1" + sources."ms-2.0.0" + (sources."multer-1.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + sources."isarray-1.0.0" + sources."on-finished-2.3.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."mute-stream-0.0.5" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."native-promise-only-0.8.1" + (sources."nodemon-1.17.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."debug-3.1.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-3.2.2" + sources."lru-cache-4.1.2" + sources."minimist-1.2.0" + sources."strip-ansi-4.0.0" + sources."supports-color-5.3.0" + ]; + }) + sources."nopt-1.0.10" + sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."optimist-0.6.1" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" + sources."parseurl-1.3.2" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-loader-1.0.4" + sources."path-to-regexp-1.7.0" + sources."pause-stream-0.0.11" + sources."pify-3.0.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."ps-tree-1.1.0" + sources."pseudomap-1.0.2" + sources."pstree.remy-1.1.0" + sources."punycode-2.1.0" + sources."qs-4.0.0" + sources."range-parser-1.2.0" + (sources."raw-body-2.0.2" // { + dependencies = [ + sources."bytes-2.1.0" + ]; + }) + sources."rc-1.2.6" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."readline2-1.0.1" + sources."reduce-component-1.0.1" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."restore-cursor-1.0.1" + sources."ret-0.1.15" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" + sources."sanitize-filename-1.6.1" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."send-0.16.2" + (sources."serve-static-1.13.2" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."sigmund-1.0.1" + sources."signal-exit-3.0.2" + sources."slash-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + sources."spark-md5-1.0.1" + sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."sprintf-js-1.0.3" + sources."static-extend-0.1.2" + sources."statuses-1.3.1" + sources."stream-combiner-0.0.4" + sources."streamsearch-0.1.2" + sources."string-3.3.3" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + (sources."superagent-1.8.5" // { + dependencies = [ + sources."qs-2.3.3" + sources."readable-stream-1.0.27-1" + ]; + }) + sources."supports-color-2.0.0" + sources."swagger-converter-0.2.0" + sources."swagger-editor-2.10.5" + (sources."swagger-test-templates-1.4.3" // { + dependencies = [ + sources."camelcase-1.2.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."source-map-0.4.4" + sources."wordwrap-0.0.2" + ]; + }) + (sources."swagger-tools-0.9.16" // { + dependencies = [ + sources."cookiejar-2.0.6" + sources."depd-1.0.1" + sources."ee-first-1.1.0" + sources."extend-3.0.0" + sources."form-data-1.0.0-rc3" + sources."formidable-1.0.17" + sources."isarray-0.0.1" + sources."lodash-4.17.5" + sources."mime-1.3.4" + sources."ms-0.7.1" + sources."object-assign-3.0.0" + sources."on-finished-2.2.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + sources."swagger-converter-0.1.7" + ]; + }) + sources."term-size-1.2.0" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."to-iso-string-0.0.2" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."touch-3.1.0" + sources."traverse-0.6.6" + sources."truncate-utf8-bytes-1.0.2" + sources."type-is-1.6.16" + sources."typedarray-0.0.6" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-string-1.0.0" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."unzip-response-2.0.1" + sources."upath-1.0.4" + sources."update-notifier-2.4.0" + sources."uri-js-3.0.2" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."utf8-byte-length-1.0.4" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."valid-url-1.0.9" + sources."validator-9.4.1" + sources."which-1.3.0" + sources."widest-line-2.0.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."yargs-3.10.0" + sources."z-schema-3.19.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The Swagger command-line. Provides Swagger utilities and project lifecycle support."; + homepage = "https://github.com/swagger-api/swagger-node#readme"; + license = "Apache 2.0"; + }; + production = true; + bypassCache = true; + }; npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.7.1"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz"; - sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g"; + url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; + sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 80e34ecd06ac..000ff8285c53 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,8 +4,8 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.1"; - sha256 = "1bjhgwmshlaz9xncrrkknys7prigf8vlg1kqvfx9l8kn92mlf10b"; + version = "0.8.2"; + sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf"; buildInputs = [ jbuilder ]; buildPhase = "jbuilder build -p alcotest"; inherit (jbuilder) installPhase; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 7e9ba518251c..b13eda071f62 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -2,10 +2,10 @@ buildOcaml rec { name = "bitstring"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = http://github.com/xguerin/bitstring/archive/v2.1.0.tar.gz; - sha256 = "0miw4banfpmx4kxrckpqr57b1fcmsqdmspyjx6gqjd4kghm4l7xj"; + url = http://github.com/xguerin/bitstring/archive/v2.1.1.tar.gz; + sha256 = "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8"; }; patches = [ ./camlp4-git.patch ./srcdir.patch ]; diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index 950012158142..8192fced97be 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "comparelib"; - version = "109.60.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz"; - sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e"; + sha256 = "02l343drgi4200flfx73nzdk61zajwidsqjk9n80b2d37lvhazlf"; }; propagatedBuildInputs = [ type_conv ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index ef930007aff4..214721fa0906 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -6,7 +6,7 @@ let mkpath = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "1.3"; + version = "1.4"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "1gjs9d6759zpgp68djv296zwmvhdc6dqfb27aip7dhj6ic2bwgil"; + sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit qcheck ]; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 976ff697c98f..0f5380f9a41f 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-cstruct-${version}"; - version = "3.0.2"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "03caxcyzfjmbnnwa15zy9s1ckkl4sc834d1qkgi4jcs3zqchvd8z"; + sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; }; unpackCmd = "tar -xjf $curSrc"; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 575ca45624f3..6058c87e7bd5 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-expat-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-expat"; rev = "v${version}"; - sha256 = "0rb47v08ra2hhh73p3d8sl4sizqwiwc37gnkl22b23sbwbjrpbz0"; + sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; }; prePatch = '' diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 6c2cb894b542..e1c56bf7ebe5 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml-extlib-1.7.2"; + name = "ocaml-extlib-1.7.4"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.2.tar.gz; - sha256 = "0r7mhfgh6n5chj9r12s2x1fxrzvh6nm8h80ykl1mr75j86za41bm"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.4.tar.gz; + sha256 = "18jb4rvkk6p3mqnkamwb41x8q49shgn43h020bs4cp4vac7nrhnr"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index 716e31b2bfe2..c9a40b61437a 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,14 +1,14 @@ {stdenv, buildOcaml, fetchurl}: buildOcaml rec { - version = "109.35.02"; + version = "112.35.00"; name = "herelib"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz"; - sha256 = "7f8394169cb63f6d41e91c9affa1b8ec240d5f6e9dfeda3fbb611df521d4b05a"; + sha256 = "03rrlpjmnd8d1rzzmd112355m7a5bwn3vf90xkbc6gkxlad9cxbs"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 53ba904f628e..37bcff375ea9 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,57 +1,36 @@ -{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, react, ssl, libev, pkgconfig, ncurses, glib -, ppx_tools, result, cppo -, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" +{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder +, ocaml, findlib, camlp4, cppo +, ocaml-migrate-parsetree, ppx_tools_versioned, result }: -if !stdenv.lib.versionAtLeast ocaml.version "4" -then throw "lwt is not available for OCaml ${ocaml.version}" -else - -let sha256 = { - "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; - "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; - "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; -}."${version}"; in - -let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in - -buildOcaml rec { - name = "lwt"; - inherit version; +stdenv.mkDerivation rec { + version = "3.3.0"; + name = "ocaml${ocaml.version}-lwt-${version}"; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - inherit sha256; + sha256 = "0n87hcyl4svy0risj439wyfq6bl77qxq3nraqgdr1qbz5lskbq2j"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] - ++ stdenv.lib.optional ppxSupport ppx_tools; - - propagatedBuildInputs = [ result ] - ++ optionals [ react ssl ] - ++ [ libev ]; + preConfigure = '' + ocaml src/util/configure.ml -use-libev true -use-camlp4 true + ''; - configureScript = "ocaml setup.ml -configure"; - prefixKey = "--prefix "; - configureFlags = - optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ] - ++ [ "--enable-camlp4" ] - ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ]; - - createFindlibDestdir = true; - - hasSharedObjects = true; - - meta = with stdenv.lib; { - homepage = http://ocsigen.org/lwt; - description = "Lightweight thread library for Objective Caml"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ - z77z vbgl gal_bolle - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ocaml findlib jbuilder camlp4 cppo + ocaml-migrate-parsetree ppx_tools_versioned ]; + propagatedBuildInputs = [ libev result ]; + + installPhase = '' + ocaml src/util/install_filter.ml + ${jbuilder.installPhase} + ''; + + meta = { + homepage = "https://ocsigen.org/lwt/"; + description = "A cooperative threads library for OCaml"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix new file mode 100644 index 000000000000..53ba904f628e --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt/legacy.nix @@ -0,0 +1,57 @@ +{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 +, react, ssl, libev, pkgconfig, ncurses, glib +, ppx_tools, result, cppo +, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4" +then throw "lwt is not available for OCaml ${ocaml.version}" +else + +let sha256 = { + "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; + "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; + "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; +}."${version}"; in + +let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in + +buildOcaml rec { + name = "lwt"; + inherit version; + + src = fetchzip { + url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] + ++ stdenv.lib.optional ppxSupport ppx_tools; + + propagatedBuildInputs = [ result ] + ++ optionals [ react ssl ] + ++ [ libev ]; + + configureScript = "ocaml setup.ml -configure"; + prefixKey = "--prefix "; + configureFlags = + optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ] + ++ [ "--enable-camlp4" ] + ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ]; + + createFindlibDestdir = true; + + hasSharedObjects = true; + + meta = with stdenv.lib; { + homepage = http://ocsigen.org/lwt; + description = "Lightweight thread library for Objective Caml"; + license = licenses.lgpl21; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ + z77z vbgl gal_bolle + ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix new file mode 100644 index 000000000000..3cf08d06f1eb --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -0,0 +1,19 @@ +{ stdenv, jbuilder, ocaml, findlib, lwt, ppx_tools_versioned }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}"; + + inherit (lwt) src; + + buildInputs = [ jbuilder ocaml findlib ppx_tools_versioned ]; + + propagatedBuildInputs = [ lwt ]; + + buildPhase = "jbuilder build -p lwt_ppx"; + installPhase = "${jbuilder.installPhase} lwt_ppx.install"; + + meta = { + description = "Ppx syntax extension for Lwt"; + inherit (lwt.meta) license platforms homepage maintainers; + }; +} diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 573de26096cd..492bb9c67cdf 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip -, gnutls, nettle }: +, gnutls, nettle, fetchpatch +}: let version = "4.1.5"; in @@ -11,6 +12,12 @@ stdenv.mkDerivation { sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm"; }; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocamlnet/ocamlnet.4.1.5/files/netgzip.patch"; + sha256 = "1say7zzgk24qcy9m91gcfgvz4fv7nksx4j5qnbxyq8wqw0g88ba0"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index bf0e98ec1952..6410eb296283 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, pprint }: +{ stdenv, fetchFromGitHub, ocaml, findlib, astring, pprint }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-ocamlres"; rev = "v${version}"; - sha256 = "0pm1g38f6pmch1x4pcc09ky587x5g7p7n9dfbbif8zkjqr603ixg"; + sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; }; - buildInputs = [ ocaml findlib pprint ]; + buildInputs = [ ocaml findlib astring pprint ]; createFindlibDestdir = true; installFlags = [ "BINDIR=$(out)/bin" ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 653445617958..569f5081355c 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,15 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 +, num +}: -let version = "0.7.1"; in +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" + then { + version = "0.8.1"; + sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9"; + buildInputs = [ num ]; + } else { + version = "0.7.1"; + sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms"; + }; +in + +let inherit (param) version; in stdenv.mkDerivation { name = "ocsigen-deriving-${version}"; src = fetchzip { url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; - sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms"; - }; + inherit (param) sha256; + }; - buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ] + ++ (param.buildInputs or []); createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/optcomp/META b/pkgs/development/ocaml-modules/optcomp/META new file mode 100644 index 000000000000..8a942288f752 --- /dev/null +++ b/pkgs/development/ocaml-modules/optcomp/META @@ -0,0 +1,12 @@ +# OASIS_START +# DO NOT EDIT (digest: ec844fa3189acb2a866b89a69d111ba4) +version = "1.6" +description = "Optional compilation with cpp-like directives" +requires = "camlp4" +archive(syntax, preprocessor) = "optcomp.cma" +archive(syntax, toploop) = "optcomp.cma" +archive(syntax, preprocessor, native) = "optcomp.cmxa" +archive(syntax, preprocessor, native, plugin) = "optcomp.cmxs" +exists_if = "optcomp.cma" +# OASIS_STOP + diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 8953373954a5..5b5661377471 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; @@ -6,11 +6,33 @@ stdenv.mkDerivation { url = https://github.com/diml/optcomp/archive/1.6.tar.gz; sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh"; }; + + patches = + let inherit (stdenv.lib) optional versionAtLeast; in + optional (versionAtLeast ocaml.version "4.02") (fetchpatch { + url = "https://github.com/diml/optcomp/commit/b7f809360c9794b383a4bc0492f6df381276b429.patch"; + sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y"; + }) + ; createFindlibDestdir = true; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + configurePhase = '' + cp ${./META} META + ''; + + buildPhase = '' + ocamlbuild src/optcomp.cmxs src/optcomp.cma src/optcomp_o.native src/optcomp_r.native + ''; + + installPhase = '' + mkdir -p $out/bin + cp _build/src/optcomp_o.native $out/bin/optcomp-o + cp _build/src/optcomp_r.native $out/bin/optcomp-r + ocamlfind install optcomp META _build/src/optcomp.{a,cma,cmxa,cmxs} _build/src/pa_optcomp.{cmi,cmx,mli} + ''; meta = { homepage = https://github.com/diml/optcomp; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix index d8ce0dbc7eac..2b821cd6dd6f 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "pa_bench"; - version = "112.06.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz"; - sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870"; + sha256 = "1cd6291gdnk6h8ziclg6x3if8z5xy67nfz9gx8sx4k2cwv0j29k5"; }; buildInputs = [ pa_ounit ]; diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix index 5970aba1e502..fa4ecfcc28b2 100644 --- a/pkgs/development/ocaml-modules/pa_ounit/default.nix +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -2,11 +2,11 @@ buildOcaml rec { name = "pa_ounit"; - version = "112.24.00"; + version = "113.00.00"; src = fetchurl { url = "https://github.com/janestreet/pa_ounit/archive/${version}.tar.gz"; - sha256 = "fa04e72fe1db41e6dc64f9707cf5705cb9b957aa93265120c875c808eb9b9b96"; + sha256 = "0vi0p2hxcrdsl0319c9s8mh9hmk2i4ir6c6vrj8axkc37zkgc437"; }; propagatedBuildInputs = [ ounit ]; diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index fa9a9f8f86a6..1ab1c5fa7bc5 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "pipebang"; - version = "110.01.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz"; - sha256 = "a8858d9607c15cdf0a775196be060c8d91de724fc80a347d7a76ef1d38329096"; + sha256 = "0acm2y8wxvnapa248lkgm0vcc44hlwhrjxqkx1awjxzcmarnxhfk"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 52c28efcb49a..2dc7ef2b13e5 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ppx_derivers-${version}"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "diml"; repo = "ppx_derivers"; rev = version; - sha256 = "049yy9706lv1li6a1bibkz1qq2ixxbdyhf4f5w9pv71jc3dlpfy8"; + sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85"; }; buildInputs = [ ocaml findlib jbuilder ]; diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index b680bcdd48c8..5d27dc35396c 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,7 +2,7 @@ buildOcaml rec { name = "ppx_tools_versioned"; - version = "5.0.1"; + version = "5.1"; minimumSupportedOcamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildOcaml rec { owner = "let-def"; repo = "ppx_tools_versioned"; rev = version; - sha256 = "1rpbxbhk3k7f61h7lr4qkllkc12gjpq0rg52q7i6hcrg2dxkhwh6"; + sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 3886af37512f..b24d799cf28e 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ssl-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchzip { url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; - sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3"; + sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l"; }; buildInputs = [which ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 42771d1e35f1..129f9dd7289f 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-stdint-${version}"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "andrenth"; repo = "ocaml-stdint"; rev = version; - sha256 = "18nh23yx4ghgq7mjf4mdyq8kj1fdw5d0abw919s8n4mv21cmpwia"; + sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index f10884d72035..c50d08dd1448 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -4,11 +4,11 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; name = "type_conv"; - version = "112.01.01"; + version = "113.00.02"; src = fetchurl { url = "https://github.com/janestreet/type_conv/archive/${version}.tar.gz"; - sha256 = "dbbc33b7ab420e8442d79ba4308ea6c0c16903b310d33525be18841159aa8855"; + sha256 = "1718yl2q8zandrs4xqffkfmssfld1iz62dzcqdm925735c1x01fk"; }; meta = { diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index c2e5a1fc9298..6b27f00fb150 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, ocamlbuild, opam }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-uchar-0.0.1"; + name = "ocaml${ocaml.version}-uchar-0.0.2"; src = fetchurl { - url = https://github.com/ocaml/uchar/releases/download/v0.0.1/uchar-0.0.1.tbz; - sha256 = "0ficw1x7ymbd6m8hqw3w1aycwm1hbwd6bad3c5pspwnzh3qlikhi"; + url = https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz; + sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 5d751d3dc997..f494a8cf17cc 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -3,8 +3,8 @@ let pname = "yojson"; param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.4.0"; - sha256 = "0rzn4yihfi0psd2qmgrx5fvwpby87sqx4zws3ijf49f7wbpycccv"; + version = "1.4.1"; + sha256 = "0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9"; buildInputs = [ jbuilder ]; extra = { inherit (jbuilder) installPhase; }; } else { diff --git a/pkgs/development/perl-modules/Socket6-sv_undef.patch b/pkgs/development/perl-modules/Socket6-sv_undef.patch new file mode 100644 index 000000000000..3ed4b61b6d3e --- /dev/null +++ b/pkgs/development/perl-modules/Socket6-sv_undef.patch @@ -0,0 +1,18 @@ +diff --git a/Socket6.xs b/Socket6.xs +index 05c791c..058e9d9 100644 +--- a/Socket6.xs ++++ b/Socket6.xs +@@ -105,10 +105,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; + #define HAVE_INET_PTON 1 + #endif + +-#ifndef HAVE_PL_SV_UNDEF +-#define PL_sv_undef sv_undef +-#endif +- + static int + not_here(char *s) + { +-- +2.16.3 + diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 937dad971b87..b833ceb3cab0 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -22,7 +22,7 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=$perl/bin/perl + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$perl/bin/perl\" } diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix new file mode 100644 index 000000000000..e9dda44997fb --- /dev/null +++ b/pkgs/development/python-modules/Babel/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun }: + +buildPythonPackage rec { + pname = "Babel"; + version = "2.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "8ce4cb6fdd4393edd323227cba3a077bceb2a6ce5201c902c65e730046f41f14"; + }; + + propagatedBuildInputs = [ pytz ]; + + checkInputs = [ pytest freezegun ]; + + meta = with lib; { + homepage = http://babel.edgewall.org; + description = "A collection of tools for internationalizing Python applications"; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 751e064ad706..cffad983a450 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -13,26 +13,17 @@ buildPythonPackage rec { pname = "Cython"; - name = "${pname}-${version}"; - version = "0.27.3"; + version = "0.28.1"; src = fetchPypi { inherit pname version; - sha256 = "6a00512de1f2e3ce66ba35c5420babaef1fe2d9c43a8faab4080b0dbcc26bc64"; + sha256 = "152ee5f345012ca3bb7cc71da2d3736ee20f52cd8476e4d49e5e25c5a4102b12"; }; - # With Python 2.x on i686-linux or 32-bit ARM this test fails because the - # result is "3L" instead of "3", so let's fix it in-place. - # - # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' - sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ - tests/run/cpdef_enums.pyx - ''; - nativeBuildInputs = [ pkgconfig - # For testing + ]; + checkInputs = [ numpy ncurses ]; buildInputs = [ glibcLocales gdb ]; @@ -46,10 +37,6 @@ buildPythonPackage rec { ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""} ''; - # Disable tests temporarily - # https://github.com/cython/cython/issues/1676 - doCheck = false; - meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = http://cython.org; diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 6c4453774ced..0bacd8edb312 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "MaxMind GeoIP Legacy Database - Python API"; - homepage = http://www.maxmind.com/; + homepage = https://www.maxmind.com/; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index b52871793bee..13bddd3ffb8f 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "09bzmnzkjbrf60h39wapxc1l8mb3r9km486cly0mm78bv096884r"; + sha256 = "6841523631874a731e1f94e1b1f130686ad3772030eaa3b6946256eeb1d10dd1"; }; patches = [ ./set-compiler-language.patch ]; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 99cc4c3eab8a..bb6eddb46d1e 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "7.8.11"; + version = "7.8.14"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -46,7 +46,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10d95b3af84e61496ef729665eafa2235fd0fd4cc6c57644dd0f2c19a968dd0f"; + sha256 = "0d838817ac30ac6d4b8139a2adc8b49bed22dbb8fbc6261958d2775e10447d92"; }; meta = { diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix new file mode 100644 index 000000000000..7953829465b9 --- /dev/null +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }: + +buildPythonPackage rec { + pname = "Rtree"; + version = "0.8.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jc62jbcqqpjcwcly7l9zk25bg72mrxmjykpvfiscgln00qczfbc"; + }; + + propagatedBuildInputs = [ libspatialindex ]; + + patchPhase = '' + substituteInPlace rtree/core.py --replace \ + "find_library('spatialindex_c')" "'${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + # Tests appear to be broken due to mysterious memory unsafe issues. See #36760 + doCheck = false; + checkInputs = [ numpy ]; + + meta = with stdenv.lib; { + description = "R-Tree spatial index for Python GIS"; + homepage = https://toblerity.org/rtree/; + license = licenses.lgpl21; + maintainers = with maintainers; [ bgamari ]; + }; +} diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 5acbf12aafc3..8e3f3939b363 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.1.10"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "908eba9a96a37c10f10074aba57d685070b814906b02a1ea2cf54bb10a6b8c74"; + sha256 = "d160f7dc39f2f05ddc0bbf3a7bea4cc659fedc45fd9042e87346b24fe1cd00bb"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index bfd23ab584f9..0ba846bb0f6e 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.5.0"; + version = "0.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "120821f72ca9d59a7c7197fc14d0e27448ff8d331fae230f92d713b9b5c721f7"; + sha256 = "dd3ecb2dfb2de9393320d0ed4e6115ed07a6984a28e18adf46499b91d3c3a494"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 3ff097a78cf3..8e480d4a3dfd 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm"; + sha256 = "c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3"; }; propagatedBuildInputs = [ discid six parsedatetime diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 7b3bd6bbcc52..4865901713a3 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "0.16.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1ps182yrc5g9ph55927a7ssqx6m9kx0bivfxpaj8sa3znrdkl94d"; + sha256 = "8139c63fe989e140dceae378440680258dfb72f3301c79173945245299d795e6"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 67bf5a115938..ab5c4b625780 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -11,20 +11,21 @@ , pytest , gunicorn , pytest-mock +, async_generator }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.0.9"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b"; + sha256 = "df49fe4452a942e0031174c78917f9926d122d4603bf56bae4591639f2a3dc6a"; }; disabled = pythonOlder "3.5"; - checkInputs = [ pytest gunicorn pytest-mock ]; + checkInputs = [ pytest gunicorn pytest-mock async_generator ]; propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optional (pythonOlder "3.7") idna-ssl; diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 9d1905fe914b..373c35440620 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ajpy"; - version = "0.0.2"; + version = "0.0.4"; src = fetchPypi { inherit pname version; - sha256 = "740e7daf728ba58dabaf4af2c4305262eb207a6e41791424a146a21396ceb9ad"; + sha256 = "0a5f62b765f59ffc37e759d3f343de16cd782cc4e9e8be09c73b71dfbe383d9b"; }; # ajpy doesn't have tests diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 176805e57e5c..503ce5da4b52 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.8"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "13b8611788acf0d7b617775db5c2ae26554a6d4263c590ef628d448fd05aef56"; + sha256 = "85bd3ea7633024e4930900bc64fb58f9742dedbc6ebb6ecf25be2ea9a3c1b32e"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 67cd7eafd129..dd06d4dde7a6 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,24 +1,25 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k -, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme}: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k +, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme +, service-identity +, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null +, withManpage ? false }: + buildPythonPackage rec { - version = "0.5.1"; pname = "alot"; + version = "0.7"; + outputs = [ "out" ] ++ lib.optional withManpage "man"; disabled = isPy3k; src = fetchFromGitHub { owner = "pazz"; - repo = pname; - rev = "version"; - sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8"; + repo = "alot"; + rev = "${version}"; + sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi"; }; - postPatch = '' - substituteInPlace alot/defaults/alot.rc.spec \ - --replace "themes_dir = string(default=None)" \ - "themes_dir = string(default='$out/share/themes')" - ''; + nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ notmuch @@ -27,21 +28,32 @@ buildPythonPackage rec { twisted python_magic configobj - pygpgme - mock + service-identity file + gpgme ]; - postInstall = '' - mkdir -p $out/share - cp -r extra/themes $out/share - wrapProgram $out/bin/alot \ - --prefix LD_LIBRARY_PATH : '${stdenv.lib.makeLibraryPath [ notmuch file gpgme ]}' + # some twisted tests need the network (test_env_set... ) + doCheck = false; + postBuild = lib.optionalString withManpage "make -C docs man"; + + checkInputs = [ awk future mock gnupg procps ]; + + postInstall = lib.optionalString withManpage '' + mkdir -p $out/man + cp -r docs/build/man $out/man + '' + + '' + mkdir -p $out/share/{applications,alot} + cp -r extra/themes $out/share/alot + + sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop ''; meta = with stdenv.lib; { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; + license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ garbas ]; }; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix new file mode 100644 index 000000000000..fa5b27a4ced8 --- /dev/null +++ b/pkgs/development/python-modules/amqp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine }: + +buildPythonPackage rec { + pname = "amqp"; + version = "2.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "cba1ace9d4ff6049b190d8b7991f9c1006b443a5238021aca96dd6ad2ac9da22"; + }; + + buildInputs = [ pytest case ]; + propagatedBuildInputs = [ vine ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/py-amqp; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 04df5d2fde84..6e596172d9e7 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "2.0.1"; + version = "3.0.0"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b7215a41e5194a829dc87d1ea5039315be85a6158ba15c8157a284c29fa6808b"; + sha256 = "7cf068e7aec00edeb21879c2bbda048656c34d281e133a77425be03b352122d8"; }; } diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix new file mode 100644 index 000000000000..32314b81edca --- /dev/null +++ b/pkgs/development/python-modules/application/default.nix @@ -0,0 +1,15 @@ +{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: + +buildPythonPackage rec { + pname = "python-application"; + version = "2.0.2"; + disabled = isPy3k; + + src = fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; + }; + + buildInputs = [ zope_interface ]; +} diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index c16fb3c4c46b..fb22128b9288 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,24 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchFromGitHub , sqlite, isPyPy }: buildPythonPackage rec { pname = "apsw"; - version = "3.9.2-r1"; + version = "3.22.0-r1"; disabled = isPyPy; - src = fetchPypi { - inherit pname version; - sha256 = "dab96fd164dde9e59f7f27228291498217fa0e74048e2c08c7059d7e39589270"; + src = fetchFromGitHub { + owner = "rogerbinns"; + repo = "apsw"; + rev = version; + sha256 = "02ldvshcgr4c7c8anp4flfnw8g8ys5bflkb8b51rb618qxhhwyak"; }; buildInputs = [ sqlite ]; - # python: double free or corruption (fasttop): 0x0000000002fd4660 *** -# doCheck = false; - meta = with stdenv.lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; - homepage = http://code.google.com/p/apsw/; + homepage = https://github.com/rogerbinns/apsw; + license = licenses.zlib; }; } diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index d22a10ec1502..91b98d8b6ac0 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.6.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "f0a0e386dbca9f93ea9f3ea6f32b37a24720502b7baa9cb17c3976a680d43a06"; + sha256 = "35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 4ff4841cf5f9..d4c038a1afdc 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.0"; + version = "3.0.1"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9e0ad19b9d6d227bdf0932bbe64a8c5dd4a47d4ec078586cf24bf9f0c61d9ecf"; + sha256 = "c35f4433c14ddfcaf2407cc815385f3d85396727e9a1e660cf66a7c4f5dd1067"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix new file mode 100644 index 000000000000..4f46376b62de --- /dev/null +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "async_generator"; + version = "1.9"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "b7d5465c6174fe86dba498ececb175f93a6097ffb7cc91946405e1f05b848371"; + }; + + checkInputs = [ pytest pytest-asyncio ]; + + checkPhase = '' + pytest -W error -ra -v --pyargs async_generator + ''; + + meta = with lib; { + description = "Async generators and context managers for Python 3.5+"; + homepage = https://github.com/python-trio/async_generator; + license = with licenses; [ mit asl20 ]; + }; +} diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index 53010a2a031d..5f9318aa5c21 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; + sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; }; # Circular dependency on aiohttp diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix new file mode 100644 index 000000000000..c3ed7bed7426 --- /dev/null +++ b/pkgs/development/python-modules/asyncio/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }: + +buildPythonPackage rec { + pname = "asyncio"; + version = "3.4.3"; + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; + }; + + meta = with stdenv.lib; { + description = "Reference implementation of PEP 3156"; + homepage = http://www.python.org/dev/peps/pep-3156; + license = licenses.free; + }; +} diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix new file mode 100644 index 000000000000..8f3aae7b19dd --- /dev/null +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: + +buildPythonPackage rec { + pname = "atomiclong"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ cffi ]; + + meta = with stdenv.lib; { + description = "Long data type with atomic operations using CFFI"; + homepage = https://github.com/dreid/atomiclong; + license = licenses.mit; + maintainers = with maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix new file mode 100644 index 000000000000..b93ff7825fcd --- /dev/null +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "atomicwrites"; + version = "1.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585"; + }; + + meta = with stdenv.lib; { + description = "Atomic file writes on POSIX"; + homepage = https://pypi.python.org/pypi/atomicwrites; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix new file mode 100644 index 000000000000..c6a9151d9111 --- /dev/null +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: + +buildPythonPackage rec { + pname = "attrdict"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6"; + }; + + propagatedBuildInputs = [ coverage nose six ]; + + meta = with stdenv.lib; { + description = "A dict with attribute-style access"; + homepage = https://github.com/bcj/AttrDict; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 5a6121aaf7f4..a48ab10474ed 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "autobahn"; - version = "17.9.3"; + version = "18.3.1"; src = fetchurl { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "206a3a579a580ca3ce2532ac12ec52d447135c9ace7c4bf6065b832a7cff25ba"; + sha256 = "fc1d38227bb44a453b54cffa48de8b2e6ce48ddc5e97fb5950b0faa27576f385"; }; # Upstream claim python2 support, but tests require pytest-asyncio which @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WebSocket and WAMP in Python for Twisted and asyncio."; - homepage = "http://crossbar.io/autobahn"; + homepage = "https://crossbar.io/autobahn"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 6e58e3485ab2..90d57b6c89d7 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.3.4"; + version = "1.3.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c7be71ab0cb2f50c9c22c82f0c9acaafc6f57492c3fbfee9790c415005c2b9a5"; + sha256 = "192bvhzi4d0claqxgzymvv7k3qnj627742bc8sgxpzjj42pd9112"; }; propagatedBuildInputs = [ pycodestyle ]; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix new file mode 100644 index 000000000000..045790b9bc2d --- /dev/null +++ b/pkgs/development/python-modules/avro/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "avro"; + version = "1.8.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "8f9ee40830b70b5fb52a419711c9c4ad0336443a6fba7335060805f961b04b59"; + }; + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = https://pypi.python.org/pypi/avro/; + }; +} diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix new file mode 100644 index 000000000000..3a5b34ebb85d --- /dev/null +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "avro3k"; + version = "1.7.7-SNAPSHOT"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; + }; + + doCheck = false; # No such file or directory: './run_tests.py + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = https://pypi.python.org/pypi/avro3k/; + }; +} diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index dae88b34900e..972b8f847bf2 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -4,19 +4,20 @@ , jsonpickle , wrapt , requests +, future }: buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "0.95"; + version = "0.97"; src = fetchPypi { inherit pname version; - sha256 = "9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943"; + sha256 = "43eca57bb48b718ea58968608cfd22f4b9c62c2d904bb08aa2f8afe56eeb9de4"; }; propagatedBuildInputs = [ - jsonpickle wrapt requests + jsonpickle wrapt requests future ]; meta = { diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix new file mode 100644 index 000000000000..003f996d29a2 --- /dev/null +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "babelfish"; + version = "0.5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; + }; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/babelfish; + description = "A module to work with countries and languages"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix new file mode 100644 index 000000000000..2eb44cb36245 --- /dev/null +++ b/pkgs/development/python-modules/backcall/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "backcall"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Specifications for callback functions passed in to an API"; + homepage = https://github.com/takluyver/backcall; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix new file mode 100644 index 000000000000..3e21fae1de66 --- /dev/null +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "batinfo"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "497e29efc9353ec52e71d43bd040bdfb6d685137ddc2b9143cded4583af572f5"; + }; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/nicolargo/batinfo; + description = "A simple Python lib to retrieve battery information"; + license = licenses.lgpl3; + platforms = platforms.all; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index a1b49da34a4a..dcc1a45b1cf0 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.12"; + version = "0.5.14"; name = "${pname}-${version}"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9609a3e85f88434a47c8263f40567cd24363d0e10d236354630b670fca313c00"; + sha256 = "129bac6a1c494eedabdd04abf14aac35db176d25db44e27f755c758a18adf03c"; }; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix new file mode 100644 index 000000000000..b4db16476d12 --- /dev/null +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, docutils, six }: + +buildPythonPackage rec { + pname = "bcdoc"; + version = "0.16.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f568c182e06883becf7196f227052435cffd45604700c82362ca77d3427b6202"; + }; + + buildInputs = [ docutils six ]; + + # Tests fail due to nix file timestamp normalization. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/botocore/bcdoc; + license = licenses.asl20; + description = "ReST document generation tools for botocore"; + }; +} diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index efc61dba7a49..2991ae9be82f 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchhg, pkgs, pythonPackages }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, beautifulsoup4, bottle, chardet, dateutil +, google_api_python_client, lxml, ply, python_magic +, nose }: -pythonPackages.buildPythonApplication rec { - version = "2.0rc1"; - name = "beancount-${version}"; - namePrefix = ""; +buildPythonPackage rec { + version = "2.0.0"; + pname = "beancount"; - src = pkgs.fetchurl { - url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0wxwf02d3raglwqsxdsgf89fniakv1m19q825w76k5z004g18y42"; }; - buildInputs = with pythonPackages; [ nose ]; + checkInputs = [ nose ]; # Automatic tests cannot be run because it needs to import some local modules for tests. doCheck = false; @@ -18,7 +22,7 @@ pythonPackages.buildPythonApplication rec { nosetests ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ beautifulsoup4 bottle chardet @@ -38,7 +42,7 @@ pythonPackages.buildPythonApplication rec { generate a variety of reports from them, and provides a web interface. ''; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 60160b128a46..722117ba6e83 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,23 +1,22 @@ { stdenv, fetchPypi -, buildPythonApplication, python, pythonAtLeast -, mock, nose, pyhamcrest +, buildPythonApplication, isPy27, python, pythonOlder +, mock, nose, pathpy, pyhamcrest, pytest , glibcLocales, parse, parse-type, six +, traceback2 }: buildPythonApplication rec { pname = "behave"; version = "1.2.6"; name = "${pname}-${version}"; - disabled = pythonAtLeast "3.6"; - src = fetchPypi { inherit pname version; - sha256 = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86"; + sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"; }; - checkInputs = [ mock nose pyhamcrest ]; + checkInputs = [ mock nose pathpy pyhamcrest pytest ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ parse parse-type six ]; + propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2; postPatch = '' patchShebangs bin @@ -29,7 +28,7 @@ buildPythonApplication rec { export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - nosetests -x + pytest test tests ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix new file mode 100644 index 000000000000..8051ed0beff5 --- /dev/null +++ b/pkgs/development/python-modules/betamax/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "betamax"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hki1c2vs7adq7zr56wi6i5bhrkia4s2ywpv2c98ibnczz709w2v"; + }; + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://betamax.readthedocs.org/en/latest/; + description = "A VCR imitation for requests"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 06d7c689e659..05ee0ea9553b 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -1,10 +1,7 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pyparsing -, future -, nose -, glibcLocales +, buildPythonPackage, fetchFromGitHub +, future, pyparsing +, glibcLocales, nose }: buildPythonPackage rec { @@ -19,7 +16,7 @@ buildPythonPackage rec { sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai"; }; - propagatedBuildInputs = [ pyparsing future ]; + propagatedBuildInputs = [ future pyparsing ]; checkInputs = [ nose glibcLocales ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix new file mode 100644 index 000000000000..6b21a1492bd1 --- /dev/null +++ b/pkgs/development/python-modules/billiard/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }: + +buildPythonPackage rec { + pname = "billiard"; + version = "3.5.0.3"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1d7b22bdc47aa52841120fcd22a74ae4fc8c13e9d3935643098184f5788c3ce6"; + }; + + buildInputs = [ pytest case ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/billiard; + description = "Python multiprocessing fork with improvements and bugfixes"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index ea09a003c66e..8f99c0d75d34 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.70"; + version = "1.71"; src = fetchPypi { inherit pname version; - sha256 = "4a7c5298f03d1a45523f32bae1fffcff323ea9dce007fb1241af092f5ab2e45b"; + sha256 = "4f1770a29a5b18fcaca759bbc888083cdde2b301f073439ff640570d4a93e033"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix new file mode 100644 index 000000000000..0d1ac109179b --- /dev/null +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, requests_oauthlib, nose, sh }: + +buildPythonPackage rec { + pname = "bitbucket-api"; + version = "0.5.0"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "b541d9d7f234074a74214505aff1846eb21e5dd6d3915139e817d4675d34f4e3"; + }; + + propagatedBuildInputs = [ requests_oauthlib nose sh ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/Sheeprider/BitBucket-api; + description = "Python library to interact with BitBucket REST API"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix new file mode 100644 index 000000000000..b5d115f4d0bb --- /dev/null +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: + +buildPythonPackage rec { + pname = "bitbucket-cli"; + version = "0.5.1"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; + }; + + propagatedBuildInputs = [ requests ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Bitbucket command line interface"; + homepage = https://bitbucket.org/zhemao/bitbucket-cli; + maintainers = with maintainers; [ refnil ]; + }; +} diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix new file mode 100644 index 000000000000..bb2e60468861 --- /dev/null +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: + +buildPythonPackage rec { + pname = "bitmath"; + version = "1.3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k8d1wmxqjc8cqzaixpxf45k6dl1kqhblr0g4wyjl0qa18q8wasd"; + }; + + checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; + + meta = with stdenv.lib; { + description = "Module for representing and manipulating file sizes with different prefix"; + homepage = https://github.com/tbielawa/bitmath; + license = licenses.mit; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix new file mode 100644 index 000000000000..f48310ceebc6 --- /dev/null +++ b/pkgs/development/python-modules/black/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, attrs, click }: + +buildPythonPackage rec { + pname = "black"; + version = "18.4a0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "04dffr4wmzs4vf2xj0cxp03hv04x0kk06qyzx6jjrp1mq0z3n2rr"; + }; + + propagatedBuildInputs = [ attrs click ]; + + meta = with stdenv.lib; { + description = "The uncompromising Python code formatter"; + homepage = https://github.com/ambv/black; + license = licenses.mit; + maintainers = with maintainers; [ sveitser ]; + }; + +} diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix new file mode 100644 index 000000000000..5dd9d10961bb --- /dev/null +++ b/pkgs/development/python-modules/blinker/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "blinker"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; + }; + + meta = with stdenv.lib; { + homepage = http://pythonhosted.org/blinker/; + description = "Fast, simple object-to-object and broadcast signaling"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 66a5a542bf1e..1d2ccc2d5106 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.14"; + version = "0.12.15"; src = fetchPypi { inherit pname version; - sha256 = "42abada2e484d2d5b290d14a943e1c3cd7adabd39933b5f074f57b6cf7920a87"; + sha256 = "2891b883b30107dc610a7e963a21222f1fd096844d157c09db115179cfab6513"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 86e45e17ed55..4ff4c687e5c0 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,12 +9,12 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "38.4.1"; + version = "39.0.1"; format = "wheel"; - sha256 = "22f8bcff5ce7fd1867785701769eaba42b79331d0abf890974a9288787dc015b"; + sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8"; }; - # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + # TODO: Shouldn't be necessary anymore for pip >= 10! # https://github.com/NixOS/nixpkgs/issues/26392 # https://github.com/pypa/setuptools/issues/885 pkg_resources = fetchurl { @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "pip"; - version = "9.0.1"; + version = "9.0.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0"; + sha256 = "c3ede34530e0e0b2381e7363aded78e0c33291654937e7373032fda04e8803e5"; }; unpackPhase = '' @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} $src unzip -d $out/${python.sitePackages} ${setuptools_source} unzip -d $out/${python.sitePackages} ${wheel_source} - # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + # TODO: Shouldn't be necessary anymore for pip >= 10! cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py ''; diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix new file mode 100644 index 000000000000..50df0d5842cf --- /dev/null +++ b/pkgs/development/python-modules/bottle/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools }: + +buildPythonPackage rec { + pname = "bottle"; + version = "0.12.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355"; + }; + + propagatedBuildInputs = [ setuptools ]; + + meta = with stdenv.lib; { + homepage = http://bottlepy.org; + description = "A fast and simple micro-framework for small web-applications"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix new file mode 100644 index 000000000000..ada8397f9754 --- /dev/null +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, unittest2, nose +, twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six +, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future15 }: + +buildPythonPackage rec { + pname = "bugwarrior"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kxknjbw5kchd88i577vlzibg8j60r7zzdhbnragj9wg5s3w60xb"; + }; + + buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; + propagatedBuildInputs = [ + twiggy requests offtrac bugzilla taskw dateutil pytz keyring six + jinja2 pycurl dogpile_cache lockfile click pyxdg future15 + ]; + + # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ralphbean/bugwarrior; + description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix new file mode 100644 index 000000000000..b57fdd5625be --- /dev/null +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pep8, coverage, logilab_common, requests }: + +buildPythonPackage rec { + pname = "bugzilla"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ikx21nm7cch4lz9agv5h1hx6zvg2alkpfdrl01khqgilhsicdhi"; + }; + + patches = [ ./checkPhase-fix-cookie-compare.patch ]; + + buildInputs = [ pep8 coverage logilab_common ]; + propagatedBuildInputs = [ requests ]; + + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + homepage = https://fedorahosted.org/python-bugzilla/; + description = "Bugzilla XMLRPC access module"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 5c21757421b2..cb54f588f9d2 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.11.1"; + version = "2.11.2"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "08017dcd8f4b60b48b7d830da835a9350c07e7f383fa56d45925ab5144400281"; + sha256 = "e304f3604a4235e896e94ea79230cfb9c0bc54569f04d5c6c4b49cc9dc4fdbf6"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix new file mode 100644 index 000000000000..080fd2f2a790 --- /dev/null +++ b/pkgs/development/python-modules/buildout/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "zc.buildout"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xafi6ndlm964qj7pnmzmvhp719c8pgs7r7wkr508v3cq2jjw4m6"; + }; + + meta = with stdenv.lib; { + homepage = http://www.buildout.org; + description = "A software build and configuration system"; + license = licenses.zpl21; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix new file mode 100644 index 000000000000..51d3d9e6833e --- /dev/null +++ b/pkgs/development/python-modules/bumps/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, six}: + +buildPythonPackage rec { + pname = "bumps"; + version = "0.7.6"; + + propagatedBuildInputs = [six]; + + # Bumps does not provide its own tests.py, so the test + # always fails + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1ahzw8ls9wsz2ks668s15zskyykib52fhi07mg50hp7lw9avqb5k"; + }; + + meta = with stdenv.lib; { + homepage = http://www.reflectometry.org/danse/software.html; + description = "Data fitting with bayesian uncertainty analysis"; + maintainers = with maintainers; [ rprospero ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix new file mode 100644 index 000000000000..42918f023398 --- /dev/null +++ b/pkgs/development/python-modules/bunch/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bunch"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/buttersink/default.nix b/pkgs/development/python-modules/buttersink/default.nix new file mode 100644 index 000000000000..29f5ff5dccd2 --- /dev/null +++ b/pkgs/development/python-modules/buttersink/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, boto, crcmod, psutil }: + +buildPythonPackage rec { + pname = "buttersink"; + version = "0.6.8"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3"; + }; + + propagatedBuildInputs = [ boto crcmod psutil ]; + + meta = with stdenv.lib; { + description = "Synchronise btrfs snapshots"; + longDescription = '' + ButterSink is like rsync, but for btrfs subvolumes instead of files, + which makes it much more efficient for things like archiving backup + snapshots. It is built on top of btrfs send and receive capabilities. + Sources and destinations can be local btrfs file systems, remote btrfs + file systems over SSH, or S3 buckets. + ''; + homepage = https://github.com/AmesCornish/buttersink/wiki; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index 5daa505429ed..924ce07c8e78 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -7,15 +7,14 @@ buildPythonPackage rec { pname = "cached-property"; - version = "1.4.0"; + version = "1.4.2"; # conftest.py is missing in PyPI tarball - # https://github.com/pydanny/cached-property/pull/87 src = fetchFromGitHub { owner = "pydanny"; repo = pname; rev = version; - sha256 = "0w7709grs4yqhfbnn7lva2fgyphvh43xcfqhi95lhh8sjad3xwkw"; + sha256 = "0gjmgfilhljkx2b60cjikwh55jg2jwxhwi8hgkrzdnzk465ywhrw"; }; checkInputs = [ pytest freezegun ]; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix new file mode 100644 index 000000000000..68b1924e5a86 --- /dev/null +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, cairocffi, cssselect2, defusedxml, pillow, tinycss2 +, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: + +buildPythonPackage rec { + pname = "CairoSVG"; + version = "2.1.3"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9"; + }; + + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ]; + + meta = with stdenv.lib; { + homepage = https://cairosvg.org; + license = licenses.lgpl3; + description = "SVG converter based on Cairo"; + }; +} diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix new file mode 100644 index 000000000000..3b976fb7ad9a --- /dev/null +++ b/pkgs/development/python-modules/carrot/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, amqplib, anyjson }: + +buildPythonPackage rec { + pname = "carrot"; + version = "0.10.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s14rs2fgp1s2qa0avn8gj33lwc3k1hd4y9a2h6mhg487i7kfinb"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ amqplib anyjson ]; + + doCheck = false; # depends on the network + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/carrot; + description = "AMQP Messaging Framework for Python"; + }; +} diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix new file mode 100644 index 000000000000..0f1bba36def6 --- /dev/null +++ b/pkgs/development/python-modules/case/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, nose, unittest2, mock }: + +buildPythonPackage rec { + pname = "case"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; + }; + + propagatedBuildInputs = [ six nose unittest2 mock ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/case; + description = "unittests utilities"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 44613dd4e5bc..7f3fb46d1e10 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect, pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet -}: +}: + buildPythonPackage rec { pname = "celery"; version = "4.1.0"; @@ -11,11 +12,11 @@ buildPythonPackage rec { }; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = '' + preCheck = stdenv.lib.optionalString stdenv.isLinux '' export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ LD_PRELOAD=${libredirect}/lib/libredirect.so ''; - postCheck = '' + postCheck = stdenv.lib.optionalString stdenv.isLinux '' unset NIX_REDIRECTS LD_PRELOAD ''; diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix new file mode 100644 index 000000000000..12536584f051 --- /dev/null +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: + +buildPythonPackage rec { + pname = "Cerberus"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a5b39090fde3ec3294c9d7030b8eda935b42222160a66a922e0c8aea34cabfdf"; + }; + + checkInputs = [ pytestrunner pytest ]; + + meta = with stdenv.lib; { + homepage = http://python-cerberus.org/; + description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 31cd0236a59f..fe1f84aa1bba 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b7bcd8fc1a39b3602b4a78a0be6012721ba6c8792c4d14773496a4c6d038f886"; + sha256 = "d72c1f5ff5f4743b141900d5e50aeb8337a213e553a28012dad4a4d2335bbabb"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix new file mode 100644 index 000000000000..56c6c551ee7c --- /dev/null +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "check-manifest"; + version = "0.36"; + + src = fetchPypi { + inherit pname version; + sha256 = "2bb906a736a0f026cc5fd6c0dab5a481793b3d7a7d70106cca6e238da5f52d84"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/mgedmin/check-manifest; + description = "Check MANIFEST.in in a Python source package for completeness"; + license = licenses.mit; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 5167cc443194..18c0ab826b3a 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "CherryPy"; - version = "14.0.0"; + version = "14.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5f5ee020d6547a8d452b3560775ca2374ffe2ff8c0aec1b272e93b6af80d850e"; + sha256 = "721d09bbeedaf5b3493e9e644ae9285d776ea7f16b1d4a0a5aaec7c0d22e5074"; }; propagatedBuildInputs = [ cheroot portend routes six ]; diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix new file mode 100644 index 000000000000..b703bce2cc7a --- /dev/null +++ b/pkgs/development/python-modules/circus/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi +, iowait, psutil, pyzmq, tornado, mock }: + +buildPythonPackage rec { + pname = "circus"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b8ca91d8bd87b350fda199488ac9ddff91a546b0c6214a28a2f13393713cf062"; + }; + + doCheck = false; # weird error + + propagatedBuildInputs = [ iowait psutil pyzmq tornado mock ]; +} diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix new file mode 100644 index 000000000000..2042a2d629bb --- /dev/null +++ b/pkgs/development/python-modules/cjson/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: + +buildPythonPackage rec { + pname = "python-cjson"; + version = "1.2.1"; + disabled = isPy3k || isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "52db2745264624768bfd9b604acb38f631bde5c2ec9b23861677d747e4558626"; + }; + + meta = with stdenv.lib; { + description = "A very fast JSON encoder/decoder for Python"; + homepage = http://ag-projects.com/; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix new file mode 100644 index 000000000000..9303f90141da --- /dev/null +++ b/pkgs/development/python-modules/clf/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, docopt, requests, pygments }: + +buildPythonPackage rec { + pname = "clf"; + version = "0.5.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "abc919a1e99667f32fdde15dfb4bc527dbe22cf86a17acb78a449d7f2dfe937e"; + }; + + patchPhase = '' + sed -i 's/==/>=/' requirements.txt + ''; + + propagatedBuildInputs = [ docopt requests pygments ]; + + # Error when running tests: + # No local packages or download links found for requests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ncrocfer/clf; + description = "Command line tool to search snippets on Commandlinefu.com"; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix new file mode 100644 index 000000000000..7229488a700f --- /dev/null +++ b/pkgs/development/python-modules/click-log/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, click }: + +buildPythonPackage rec { + pname = "click-log"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; + }; + + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + homepage = https://github.com/click-contrib/click-log/; + description = "Logging integration for Click"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix new file mode 100644 index 000000000000..d5dfba61010c --- /dev/null +++ b/pkgs/development/python-modules/click/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "click"; + version = "6.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test tests + ''; + + # https://github.com/pallets/click/issues/823 + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://click.pocoo.org/; + description = "Create beautiful command line interfaces in Python"; + longDescription = '' + A Python package for creating beautiful command line interfaces in a + composable way, with as little code as necessary. + ''; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix new file mode 100644 index 000000000000..ec5f8bcba3b2 --- /dev/null +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }: + +buildPythonPackage rec { + pname = "cloudpickle"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0e63dd89ed5285171a570186751bc9b84493675e99e12789e9a5dc5490ef554"; + }; + + buildInputs = [ pytest mock ]; + + # See README for tests invocation + checkPhase = '' + PYTHONPATH=$PYTHONPATH:'.:tests' py.test + ''; + + # TypeError: cannot serialize '_io.FileIO' object + doCheck = false; + + meta = with stdenv.lib; { + description = "Extended pickling support for Python objects"; + homepage = https://github.com/cloudpipe/cloudpickle; + license = with licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix new file mode 100644 index 000000000000..5867c33642f5 --- /dev/null +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, cffi, pytest }: + +buildPythonPackage rec { + pname = "cmarkgfm"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "977d7061779c7ebc5cbe7af71adb795ced96058552fe5f6b646d95b5055959be"; + }; + + propagatedBuildInputs = [ cffi ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Minimal bindings to GitHub's fork of cmark"; + homepage = https://github.com/jonparrott/cmarkgfm; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix new file mode 100644 index 000000000000..1f8d913aa2a8 --- /dev/null +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml }: + +buildPythonPackage rec { + pname = "cmdline"; + version = "0.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7"; + }; + + # No tests, https://github.com/rca/cmdline/issues/1 + doCheck = false; + propagatedBuildInputs = [ pyyaml ]; + + meta = with stdenv.lib; { + description = "Utilities for consistent command line tools"; + homepage = https://github.com/rca/cmdline; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix new file mode 100644 index 000000000000..b660ed022577 --- /dev/null +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cogapp"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "f8cf2288fb5a2087eb4a00d8b347ddc86e9058d4ab26b8c868433eb401adfe1c"; + }; + + # there are no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A code generator for executing Python snippets in source files"; + homepage = http://nedbatchelder.com/code/cog; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + }; +} diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix new file mode 100644 index 000000000000..11d39e411ce5 --- /dev/null +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, stompclient, pythondaemon, redis, pid, pytest, six, click, coverage +, sqlalchemy }: + +buildPythonPackage rec { + pname = "CoilMQ"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d"; + }; + + propagatedBuildInputs = [ stompclient pythondaemon redis pid ]; + buildInputs = [ pytest six click coverage sqlalchemy ]; + + # The teste data is not included in the distribution + doCheck = false; + + meta = with stdenv.lib; { + description = "Simple, lightweight, and easily extensible STOMP message broker"; + homepage = http://code.google.com/p/coilmq/; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix new file mode 100644 index 000000000000..b035bb9b57c9 --- /dev/null +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "colorclass"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/Robpol86/colorclass; + license = licenses.mit; + description = "Automatic support for console colors"; + }; +} diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix new file mode 100644 index 000000000000..a162b21b083d --- /dev/null +++ b/pkgs/development/python-modules/colour/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, d2to1 }: + +buildPythonPackage rec { + pname = "colour"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "af20120fefd2afede8b001fbef2ea9da70ad7d49fafdb6489025dae8745c3aee"; + }; + + buildInputs = [ d2to1 ]; + + meta = with stdenv.lib; { + description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; + homepage = https://github.com/vaab/colour; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix new file mode 100644 index 000000000000..98631b6920b3 --- /dev/null +++ b/pkgs/development/python-modules/configobj/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "configobj"; + version = "5.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Config file reading, writing and validation"; + homepage = https://pypi.python.org/pypi/configobj; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix new file mode 100644 index 000000000000..8e770c504c3b --- /dev/null +++ b/pkgs/development/python-modules/configparser/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "configparser"; + version = "3.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k"; + }; + + # No tests available + doCheck = false; + + # Fix issue when used together with other namespace packages + # https://github.com/NixOS/nixpkgs/issues/23855 + patches = [ + ./0001-namespace-fix.patch + ]; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix new file mode 100644 index 000000000000..5722893a8537 --- /dev/null +++ b/pkgs/development/python-modules/consul/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, six, pytest }: + +buildPythonPackage rec { + pname = "python-consul"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ef0b7c8a2d8efba5f9602f45aadbe5035e22a511d245624ed732af81223a6571"; + }; + + buildInputs = [ requests six pytest ]; + + # No tests distributed. https://github.com/cablehead/python-consul/issues/133 + doCheck = false; + + meta = with stdenv.lib; { + description = "Python client for Consul (https://www.consul.io/)"; + homepage = https://github.com/cablehead/python-consul; + license = licenses.mit; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix new file mode 100644 index 000000000000..0fa72dfa687d --- /dev/null +++ b/pkgs/development/python-modules/contexter/default.nix @@ -0,0 +1,14 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "contexter"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8"; + }; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix new file mode 100644 index 000000000000..abccd1e136d8 --- /dev/null +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy +, pytest, pytestcov, pytest-mock, freezegun +, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests }: + +buildPythonPackage rec { + pname = "cookiecutter"; + version = "1.6.0"; + + # not sure why this is broken + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e"; + }; + + checkInputs = [ pytest pytestcov pytest-mock freezegun ]; + propagatedBuildInputs = [ + jinja2 future binaryornot click whichcraft poyo jinja2_time requests + ]; + + # requires network access for cloning git repos + doCheck = false; + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/audreyr/cookiecutter; + description = "A command-line utility that creates projects from project templates"; + license = licenses.bsd3; + maintainers = with maintainers; [ kragniz ]; + }; +} diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix new file mode 100644 index 000000000000..1b8e5b6061d7 --- /dev/null +++ b/pkgs/development/python-modules/cookies/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cookies"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Friendlier RFC 6265-compliant cookie parser/renderer"; + homepage = https://github.com/sashahart/cookies; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix new file mode 100644 index 000000000000..ad85218709e8 --- /dev/null +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage }: + +buildPythonPackage rec { + pname = "cov-core"; + version = "1.15.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a"; + }; + + propagatedBuildInputs = [ coverage ]; + + meta = with stdenv.lib; { + description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; + }; +} diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 4d11354df0aa..f57e0fe86095 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "coveralls"; name = "${pname}-python-${version}"; - version = "1.2.0"; + version = "1.3.0"; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3"; + sha256 = "664794748d2e5673e347ec476159a9d87f43e0d2d44950e98ed0e27b98da8346"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix new file mode 100644 index 000000000000..f85e045d525e --- /dev/null +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "crcmod"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"; + }; + + meta = with stdenv.lib; { + description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; + homepage = http://crcmod.sourceforge.net/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix new file mode 100644 index 000000000000..e81426a892d6 --- /dev/null +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage, nose, pbkdf2 }: + +buildPythonPackage rec { + pname = "cryptacular"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "18fl7phl6r9xiwz8f1jpkahkv21wimmiq72gmrqncccv7z806gr7"; + }; + + buildInputs = [ coverage nose ]; + propagatedBuildInputs = [ pbkdf2 ]; + + # TODO: tests fail: TypeError: object of type 'NoneType' has no len() + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 606b174a514d..8fe8ccc31a95 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -21,7 +21,7 @@ }: let - version = "2.1.4"; + version = "2.2.2"; in assert version == cryptography_vectors.version; buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; @@ -29,7 +29,7 @@ in assert version == cryptography_vectors.version; buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291"; + sha256 = "9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index ce272d29ca19..bcab5c434759 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.1.4"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "78c4b4f3f84853ea5d038e2f53d355229dd8119fe9cf949c3e497c85c760a5ca"; + sha256 = "28b52c84bae3a564ce51bfb0753cbe360218bd648c64efa2808c886c18505688"; }; # No tests included diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix new file mode 100644 index 000000000000..d086360b7d7c --- /dev/null +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cssselect"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204"; + }; + + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix new file mode 100644 index 000000000000..5fe0f792856e --- /dev/null +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, tinycss2, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: + +buildPythonPackage rec { + pname = "cssselect2"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab"; + }; + + propagatedBuildInputs = [ tinycss2 ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "CSS selectors for Python ElementTree"; + homepage = https://github.com/Kozea/cssselect2; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix new file mode 100644 index 000000000000..6dd680fe11f1 --- /dev/null +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, mock }: + +buildPythonPackage rec { + pname = "cssutils"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf"; + }; + + buildInputs = [ mock ]; + + # couple of failing tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python package to parse and build CSS"; + homepage = http://code.google.com/p/cssutils/; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index badf33f8c12e..7fbdaa8909d6 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "csvkit"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; + sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index bfb296470cf4..44d258a3de55 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "96ac44dface1a73673e9c0549fc897f8fa31a7648ff9963dff799ddabd67fde2"; + sha256 = "60e36add95b0bc15f0863e7b4a425c00111dab0985075a96ede689510a9c56be"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix new file mode 100644 index 000000000000..be6f688f5032 --- /dev/null +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, openblasCompat # build segfaults with regular openblas +, suitesparse +, glpk ? null +, gsl ? null +, fftw ? null +, withGlpk ? true +, withGsl ? true +, withFftw ? true +}: + +buildPythonPackage rec { + pname = "cvxopt"; + version = "1.1.9"; + + disabled = isPyPy; # hangs at [translation:info] + + src = fetchPypi { + inherit pname version; + sha256 = "0gcqq8ymjxv8qa5ss2pdhsj5bahvdxa6h2rlpp51520mjxrpw5cg"; + }; + + # similar to Gsl, glpk, fftw there is also a dsdp interface + # but dsdp is not yet packaged in nixpkgs + preConfigure = '' + export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib + export CVXOPT_BLAS_LIB=openblas + export CVXOPT_LAPACK_LIB=openblas + export CVXOPT_SUITESPARSE_LIB_DIR=${suitesparse}/lib + export CVXOPT_SUITESPARSE_INC_DIR=${suitesparse}/include + '' + lib.optionalString withGsl '' + export CVXOPT_BUILD_GSL=1 + export CVXOPT_GSL_LIB_DIR=${gsl}/lib + export CVXOPT_GSL_INC_DIR=${gsl}/include + '' + lib.optionalString withGlpk '' + export CVXOPT_BUILD_GLPK=1 + export CVXOPT_GLPK_LIB_DIR=${glpk}/lib + export CVXOPT_GLPK_INC_DIR=${glpk}/include + '' + lib.optionalString withFftw '' + export CVXOPT_BUILD_FFTW=1 + export CVXOPT_FFTW_LIB_DIR=${fftw}/lib + export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include + ''; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = { + homepage = http://cvxopt.org/; + description = "Python Software for Convex Optimization"; + longDescription = '' + CVXOPT is a free software package for convex optimization based on the + Python programming language. It can be used with the interactive + Python interpreter, on the command line by executing Python scripts, + or integrated in other software via Python extension modules. Its main + purpose is to make the development of software for convex optimization + applications straightforward by building on Python's extensive + standard library and on the strengths of Python as a high-level + programming language. + ''; + maintainers = with lib.maintainers; [ edwtjo ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index e63c4107e091..f2e10caad726 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "6.1"; + version = "6.2.1"; buildInputs = [ oracle-instantclient @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "80545fc7acbdda917dd2b1604c938141256bdfed3ad464a44586c9c2f09c3004"; + sha256 = "01970bc843b3c699a7fd98af19e0401fe69abfbd2acdf464e0bf2ae06ea372b9"; }; # Check need an Oracle database to run diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix new file mode 100644 index 000000000000..c1fedecbff34 --- /dev/null +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, sphinx +}: + +buildPythonPackage rec { + pname = "cysignals"; + version = "1.6.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "003invnixqy1h4lb358vwrxykxzp15csaddkgq3pqqmswnva5908"; + }; + + hardeningDisable = [ + "fortify" + ]; + + # currently fails, probably because of formatting changes in gdb 8.0 + doCheck = false; + + preCheck = '' + # Make sure cysignals-CSI is in PATH + export PATH="$out/bin:$PATH" + ''; + + propagatedBuildInputs = [ + cython + ]; + + enableParallelBuilding = true; + + meta = { + description = "Interrupt and signal handling for Cython"; + homepage = https://github.com/sagemath/cysignals/; + maintainers = with lib.maintainers; [ timokau ]; + license = lib.licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 9c5a2b2110ce..aefe250effec 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -9,12 +9,11 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.9.0"; - name = "${pname}-${version}"; + version = "0.9.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5ebb55855a8bb7800afa58e52408763935527e0305f35600c71b43c86013dec2"; + sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5"; }; # Extension types @@ -23,19 +22,13 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; - # File as accidentally included in release - # See https://github.com/pytoolz/cytoolz/issues/116#issuecomment-355770073 - postPatch = '' - rm cytoolz/tests/test_curried_doctests.py - ''; - # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 checkPhase = '' NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} ''; meta = { - homepage = "http://github.com/pytoolz/cytoolz/"; + homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; license = "licenses.bsd3"; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix new file mode 100644 index 000000000000..753b592a4c59 --- /dev/null +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: + +buildPythonPackage rec { + pname = "darcsver"; + version = "1.7.4"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6"; + }; + + buildInputs = [ mock ]; + + # Note: We don't actually need to provide Darcs as a build input. + # Darcsver will DTRT when Darcs isn't available. See news.gmane.org + # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a + # discussion. + + # AttributeError: 'module' object has no attribute 'test_darcsver' + doCheck = false; + + meta = with stdenv.lib; { + description = "Darcsver, generate a version number from Darcs history"; + homepage = https://pypi.python.org/pypi/darcsver; + license = "BSD-style"; + }; +} diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 70b4b55f5c6e..5527e4617e7c 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.17.1"; + version = "0.17.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0a6aec8b3489419c97486afd46e30b63caafc642205726a884b7fe488906d359"; + sha256 = "27e470b8cfdd0516189e641b1213fceec0ddc4f37ead1fbce733d3381134fccd"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix new file mode 100644 index 000000000000..35d830f81b58 --- /dev/null +++ b/pkgs/development/python-modules/datadog/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, decorator, requests, simplejson +, nose, mock }: + +buildPythonPackage rec { + pname = "datadog"; + version = "0.20.0"; + + # no tests in PyPI tarball + # https://github.com/DataDog/datadogpy/pull/259 + src = fetchFromGitHub { + owner = "DataDog"; + repo = "datadogpy"; + rev = "v${version}"; + sha256 = "1p4p14853yrsl8py4ca7za7a12qzw0xwgz64f5kzx8a6vpv3p3md"; + }; + + propagatedBuildInputs = [ decorator requests simplejson ]; + + checkInputs = [ nose mock ]; + + meta = with lib; { + description = "The Datadog Python library"; + license = licenses.bsd3; + homepage = https://github.com/DataDog/datadogpy; + }; +} diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix new file mode 100644 index 000000000000..6580b0e10070 --- /dev/null +++ b/pkgs/development/python-modules/dateutil/1_5.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }: + +buildPythonPackage rec { + pname = "python-dateutil"; + version = "1.5"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Powerful extensions to the standard datetime module"; + homepage = https://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; +} diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix new file mode 100644 index 000000000000..f9ac491dc81d --- /dev/null +++ b/pkgs/development/python-modules/datrie/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestrunner, hypothesis}: + +buildPythonPackage rec { + pname = "datrie"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; + }; + + buildInputs = [ pytest pytestrunner hypothesis ]; + + meta = with stdenv.lib; { + description = "Super-fast, efficiently stored Trie for Python"; + homepage = "https://github.com/kmike/datrie"; + license = licenses.lgpl2; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index ac8087be63ed..cdcc313ed82d 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.96.8"; + version = "0.97.2"; src = fetchPypi { inherit pname version; - sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1"; + sha256 = "b4c5165d29f6ca893797974aa9f228d2ad39aa864c166ce5bcb89c636489c8e6"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix new file mode 100644 index 000000000000..937b6df42292 --- /dev/null +++ b/pkgs/development/python-modules/debian/default.nix @@ -0,0 +1,14 @@ +{ stdenv, buildPythonPackage, fetchPypi +, chardet, six}: + +buildPythonPackage rec { + pname = "python-debian"; + version = "0.1.32"; + + src = fetchPypi { + inherit pname version; + sha256 = "143887ac647ad30819f289f5a4ca13b77e56df27b686b84c34669447f7591280"; + }; + + propagatedBuildInputs = [ chardet six ]; +} diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix new file mode 100644 index 000000000000..6426333ed26a --- /dev/null +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -0,0 +1,11 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "defusedxml"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; + }; +} diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 838cc8463872..0c06bc55c7a9 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "048zfidv08sr4hivdd3xxf1pywhqbnszj5qcn51h2f4y1588fhpf"; + sha256 = "27a7f4c6da8f057e03171a493f17340f39f288199a21beb3226a188ab3c02cea"; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix new file mode 100644 index 000000000000..3a0ecffe526a --- /dev/null +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "derpconf"; + version = "0.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "derpconf abstracts loading configuration files for your app"; + homepage = https://github.com/globocom/derpconf; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix new file mode 100644 index 000000000000..ea50eebb38cb --- /dev/null +++ b/pkgs/development/python-modules/detox/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, tox, py, eventlet }: + +buildPythonPackage rec { + pname = "detox"; + version = "0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "4719ca48c4ea5ffd908b1bc3d5d1b593b41e71dee17180d58d8a3e7e8f588d45"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ tox py eventlet ]; + + checkPhase = '' + py.test + ''; + + # eventlet timeout, and broken invokation 3.5 + doCheck = false; + + meta = with stdenv.lib; { + description = "What is detox?"; + homepage = https://bitbucket.org/hpk42/detox; + }; +} diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix new file mode 100644 index 000000000000..e81caa66e5f3 --- /dev/null +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, jsonpickle }: + +buildPythonPackage rec { + pname = "python-digitalocean"; + version = "1.13.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h4drpdsmk0b3rlvg6q6cz11k23w0swj1iddk7xdcw4m7r7c52kw"; + }; + + propagatedBuildInputs = [ requests jsonpickle ]; + + # Package doesn't distribute tests. + doCheck = false; + + meta = with stdenv.lib; { + description = "digitalocean.com API to manage Droplets and Images"; + homepage = https://pypi.python.org/pypi/python-digitalocean; + license = licenses.lgpl3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ca0322cf607c..8dead5644858 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,14 +6,13 @@ buildPythonPackage rec { pname = "Django"; - name = "${pname}-${version}"; - version = "1.11.9"; + version = "1.11.12"; disabled = pythonOlder "2.7"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0d0hh9sh2rwazi7z2lnqvz1424bq6ps6c5h6ss04klp14agi4g9m"; + url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; + sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 907d2ba6e000..89bd0407ca00 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "2.0.2"; + version = "2.0.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dc3b61d054f1bced64628c62025d480f655303aea9f408e5996c339a543b45f0"; + sha256 = "d81a1652963c81488e709729a80b510394050e312f386037f26b54912a3a10d0"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 5c00ef604177..3cbf6d2ce713 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,12 +2,12 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.8.0"; + version = "4.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5229da5b07ccb8d3e3e9ee098c0b7c03e20eba48634bc456697dd73d62c68b19"; + sha256 = "15b47faef6aefaa3f47135a2aeb67372da300e4a4cf06809c66ab392686a2155"; }; doCheck = false; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index b11847beaa92..81f406c9ef2e 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.7.7"; + version = "3.8.2"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "9f9e94e8d22b100ed3a43cee8c47a7ff7b185e778a1f2da9ec5c73fc4e081b87"; + sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix new file mode 100644 index 000000000000..9cc510bf9af3 --- /dev/null +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "docker-pycreds"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299"; + }; + + # require docker-credential-helpers binaries + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Python bindings for the docker credentials store API."; + homepage = https://github.com/shin-/dockerpy-creds; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/docker-registry-core/default.nix b/pkgs/development/python-modules/docker-registry-core/default.nix new file mode 100644 index 000000000000..ad9968af173c --- /dev/null +++ b/pkgs/development/python-modules/docker-registry-core/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, boto, redis, setuptools, simplejson }: + +buildPythonPackage rec { + pname = "docker-registry-core"; + version = "2.0.3"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0q036rr0b5734szkj883hkb2kjhgcc5pm3dz4yz8vcim3x7q0zil"; + }; + + DEPS = "loose"; + + doCheck = false; + propagatedBuildInputs = [ boto redis setuptools simplejson ]; + + patchPhase = "> requirements/main.txt"; + + meta = with stdenv.lib; { + description = "Docker registry core package"; + homepage = https://github.com/docker/docker-registry; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index bb39ccd7cf6e..c290c6bd177b 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.7.0"; + version = "3.2.1"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; + sha256 = "0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 711babe9518e..a739c341b62d 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.19.0"; + version = "1.20.1"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "f227e0e4b7d88aaf8f892b03a2068942c56ea16bcf2a0fb9fe2a3a071c5fef0b"; + sha256 = "34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66"; }; # lots of networking and other fails diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix new file mode 100644 index 000000000000..f7a64481c663 --- /dev/null +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "dockerpty"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; + homepage = https://github.com/d11wtq/dockerpty; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix new file mode 100644 index 000000000000..61c71d87c533 --- /dev/null +++ b/pkgs/development/python-modules/docopt/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "docopt"; + version = "0.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "14f4hn6d1j4b99svwbaji8n2zj58qicyz19mm0x6pmhb50jsics9"; + }; + + meta = with stdenv.lib; { + description = "Pythonic argument parser, that will make you smile"; + homepage = http://docopt.org/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix new file mode 100644 index 000000000000..f3be88987606 --- /dev/null +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "doctest-ignore-unicode"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m9aa4qnyj21lbq4sbvmv1vcz7zksss4rz37ddf2hxv4hk8b547w"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Add flag to ignore unicode literal prefixes in doctests"; + license = with licenses; [ asl20 ]; + homepage = https://github.com/gnublade/doctest-ignore-unicode; + }; +} diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 657a4db41159..bb9bc62d9405 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.4"; + version = "0.6.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a73aa3049cd88d7ec57a1c2e8946abdf4f14188d429c1023943fcc55c4568da1"; + sha256 = "631197e78b4471bb0e93d0a86264c45736bc9ae43b4205d581dcc34fbe9b5f31"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix new file mode 100644 index 000000000000..622954f61449 --- /dev/null +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dogpile.core"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; + homepage = https://bitbucket.org/zzzeek/dogpile.core; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix new file mode 100644 index 000000000000..1be9e34ec18f --- /dev/null +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytestrunner, requests, urllib3, mock, setuptools }: + +buildPythonPackage rec { + pname = "dropbox"; + version = "8.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "019f1529631d335f2b57ffd65a4545406bd3d139d0a9611cb6ca8c66c4ae7309"; + }; + + # Set DROPBOX_TOKEN environment variable to a valid token. + doCheck = false; + + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ requests urllib3 mock setuptools ]; + + meta = with stdenv.lib; { + description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = https://www.dropbox.com/developers/core/docs; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix new file mode 100644 index 000000000000..27b1a3e6122c --- /dev/null +++ b/pkgs/development/python-modules/dugong/default.nix @@ -0,0 +1,13 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "dugong"; + version = "3.5"; + + disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + + src = fetchPypi { + inherit pname version; + sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 13bcb6471869..80a42ac30fd5 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,21 +1,23 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi +, urllib3, certifi , gevent, geventhttpclient, mock, fastimport , git, glibcLocales }: buildPythonPackage rec { - version = "0.18.6"; + version = "0.19.2"; pname = "dulwich"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "38a04406bc68315794c3bab37c7d4ed137fb8a839482d8894e72b0d9b3eb41a9"; + src = fetchPypi { + inherit pname version; + sha256 = "c51e10c260543240e0806052af046e1a78b98cbe1ac1ef3880a78d2269e09da4"; }; LC_ALL = "en_US.UTF-8"; + propagatedBuildInputs = [ urllib3 certifi ]; + # Only test dependencies - buildInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; + checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix new file mode 100644 index 000000000000..dc5784aafb7e --- /dev/null +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "EasyProcess"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "07z6485bjxkmx26mp1p1ww19d10qavw0s006bidzailsvk543qll"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Easy to use python subprocess interface"; + homepage = https://github.com/ponty/EasyProcess; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 277a5cece567..334778c93aab 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "ECPy"; - version = "0.8.3"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ef3d95419d53368f52fb7d4b883b8df0dfc2dd19a76243422d24981c3e5f27bd"; + sha256 = "ef41346ae24789699f3bc3ddefbfac03ad6b73b7d3d19b998ba9ce47b67c7277"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ]; diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index bdace9220849..cf87bc66885d 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "elasticsearch-curator"; - version = "5.4.1"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1bhiqa61h6bbrfp0aygwwchr785x281hnwk8qgnjhb8g4r8ppr3s"; + sha256 = "2d2762fa55613855b0a04f22e1c6c2c5b53d60301b437205d0e2533e4185671a"; }; # The integration tests require a running elasticsearch cluster. diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 88399d316975..502da4b1b604 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "6.1.1"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8d91a3fce12123a187b673f18c23bcffa6e7b49ba057555d59eeeded0ba15dce"; + sha256 = "b106fa3e01750376a42f8a9882bd84d630fda58c7aba38b4fec797d11c0bd0a2"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 321259d99395..d7cce7b906b0 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "emoji"; name = "${pname}-${version}"; - version = "0.4.5"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "13i9mgkpll8m92b8mgm5yab4i78nwsl9h38nriavg105id94mg6q"; + sha256 = "001b92b9c8a157e1ca49187745fa450513bc8b31c87328dfd83d674b9d7dfa63"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index d812fd55a887..c4f5410bc518 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -3,12 +3,12 @@ , fetchPypi , configparser , pytest +, isPy3k }: buildPythonPackage rec { pname = "entrypoints"; version = "0.2.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest]; - propagatedBuildInputs = [ configparser ]; + propagatedBuildInputs = [] ++ lib.optional (!isPy3k) [ configparser ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix new file mode 100644 index 000000000000..7b6159d0e616 --- /dev/null +++ b/pkgs/development/python-modules/envs/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, click, jinja2, terminaltables }: + +buildPythonPackage rec { + pname = "envs"; + version = "1.2.4"; + + # move to fetchPyPi when https://github.com/capless/envs/issues/8 is fixed + src = fetchFromGitHub { + owner = "capless"; + repo = "envs"; + rev = "e1f6cbad7f20316fc44324d2c50826d57c2817a8"; + sha256 = "0p88a79amj0jxll3ssq1dzg78y7zwgc8yqyr7cf53nv2i7kmpakv"; + }; + + checkInputs = [ click jinja2 terminaltables ]; + + meta = with lib; { + description = "Easy access to environment variables from Python"; + homepage = https://github.com/capless/envs; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 250a2f559325..472a630549b2 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "0.7.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "188ahmqnh5y1f46m7pyjdmi9zfxswaggn6xga65za554d72azvap"; + sha256 = "3f10c22f15ffedb34519e4af2201f1a088a958efedfd50da0da1aa3887283dff"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix new file mode 100644 index 000000000000..a24d049fc229 --- /dev/null +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, xlib }: + +buildPythonPackage rec { + pname = "ewmh"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5"; + }; + + propagatedBuildInputs = [ xlib ]; + + # No tests included + doCheck = false; + + meta = { + homepage = https://github.com/parkouss/pyewmh; + description = "An implementation of EWMH (Extended Window Manager Hints), based on Xlib"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ bandresen ]; + }; +} diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 3b9a2c15b6e9..d1d8e8535a48 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -1,23 +1,23 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, scipy, stdenv, flake8, tox, pytest, glibcLocales +, face_recognition_models, stdenv, flake8, tox, pytest, glibcLocales }: buildPythonPackage rec { pname = "face_recognition"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { repo = pname; owner = "ageitgey"; - rev = "fe421d4acd76e8a19098e942b7bd9c3bbef6ebc4"; # no tags available in Git, pure revs are pushed to pypi - sha256 = "0wv5qxkg7xv1cr43zhhbixaqgj08xw2l7yvwl8g3fb2kdxyndw1c"; + rev = "v${version}"; + sha256 = "17jnyr80j1p74gyvh1jabvwd3zsxvip2y7cjhh2g6gsjv2dpvrjv"; }; postPatch = '' substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" ''; - propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models scipy ]; + propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; checkInputs = [ flake8 tox pytest glibcLocales ]; checkPhase = '' diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 55750f5bf3b4..7a7d24d070cb 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.11"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "126kdy6lj10rwgchzz0lzjabx0zcyskamhn0qib67k69fcksjmq8"; + sha256 = "9cc12b821f32ff45f6edfdc1ab7be3893b60b1224e952d68322a57e5b26a4a15"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 128a8d18d819..79ad50a63ffe 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.17"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "60ea6674c77e4d916071beabf2b31b9b45e2f5b3bbda48a34db65766a5b25678"; + sha256 = "68d430781a9ef15c85a0121500cf8462f1a4bc7672acb2a32bfdbcab044ae0b7"; }; propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 53307333048e..27d8f9c40c65 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask webassets flask_script nose ]; meta = with lib; { - homepage = http://github.com/miracle2k/flask-assets; + homepage = https://github.com/miracle2k/flask-assets; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index 33b44080343f..72a3fb0c6f85 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = http://github.com/smurfix/flask-script; + homepage = https://github.com/smurfix/flask-script; description = "Scripting support for Flask"; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 3a73b464a46f..17b9d018c397 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "flit"; - version = "0.13"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "8f558351bf4bb82b872d3bdbea7055cbb2e33ed2bdf809284bf927d4c78bf0ee"; + sha256 = "95b8577b2232da39ee14ae237575b7a85afeeabc1e87f4a19485fac34f85aa89"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index d7e789b02fa3..1381fc45c228 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.24.0"; + version = "3.25.0"; src = fetchPypi { inherit pname version; - sha256 = "d09126f443bc8797d1b7e76274e65f4c169c04722745953ecf536451b1d9a15f"; + sha256 = "c1b7eb0469d4e684bb8995906c327109beac870a33900090d64f85d79d646360"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix new file mode 100644 index 000000000000..6ce069b31910 --- /dev/null +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pkgconfig +, gmp +, pari +, mpfr +, fplll +, cython +, cysignals +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "fpylll"; + version = "0.3.0dev"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bjkh02fnxsrxwjzai8ij12zl2wq319z8y25sn9pvvzla5izgnp9"; + }; + + buildInputs = [ + gmp + pari + mpfr + fplll + ]; + + propagatedBuildInputs = [ + cython + cysignals + numpy + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "A Python interface for fplll"; + homepage = https://github.com/fplll/fpylll; + maintainers = with lib.maintainers; [ timokau ]; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/futures/default.nix b/pkgs/development/python-modules/futures/default.nix new file mode 100644 index 000000000000..5a774b6fa3d5 --- /dev/null +++ b/pkgs/development/python-modules/futures/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, python }: + +buildPythonPackage rec { + pname = "futures"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265"; + }; + + # This module is for backporting functionality to Python 2.x, it's builtin in py3k + disabled = isPy3k; + + checkPhase = '' + ${python.interpreter} test_futures.py + ''; + + meta = with lib; { + description = "Backport of the concurrent.futures package from Python 3.2"; + homepage = "https://github.com/agronholm/pythonfutures"; + license = licenses.bsd2; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 0c1ffacd827b..5186f7b25ea5 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6b2a813887583e63c8cedd26a91782e5f1e416a11f85394a92ae3ff908e0be03"; + sha256 = "05844c82c7c176449218fd3fc31e55e5d8b3fae460f261b11231f4c8ef2ed5e0"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index f99acb8db5df..04fae0db1b7a 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,12 +1,11 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl -, eject, pygit2, gitMinimal, git-annex }: +, utillinux, pygit2, gitMinimal, git-annex }: buildPythonPackage rec { pname = "git-annex-adapter"; version = "0.2.0"; - name = "${pname}-${version}"; - disabled = (!isPy3k); + disabled = !isPy3k; # There is only a wheel on PyPI - build from source instead src = fetchFromGitHub { @@ -28,8 +27,8 @@ buildPythonPackage rec { sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp"; }; - nativeBuildInputs = [ - eject # `rev` is needed in tests/test_process.py + checkInputs = [ + utillinux # `rev` is needed in tests/test_process.py ]; propagatedBuildInputs = [ pygit2 gitMinimal ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix new file mode 100644 index 000000000000..d4de33b5a837 --- /dev/null +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi +, httplib2, six, oauth2client, uritemplate }: + +buildPythonPackage rec { + pname = "google-api-python-client"; + version = "1.6.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec72991f95201996a4edcea44a079cae0292798086beaadb054d91921632fe1b"; + }; + + # No tests included in archive + doCheck = false; + + propagatedBuildInputs = [ httplib2 six oauth2client uritemplate ]; + + meta = with lib; { + description = "The core Python library for accessing Google APIs"; + homepage = https://github.com/google/google-api-python-client; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 2899eeb4a8af..baf590f99572 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,23 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi -, google_auth, protobuf, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: buildPythonPackage rec { pname = "google-api-core"; - version = "0.1.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0144d467083ed54d2e8ccb4212d42c3724fe0b844b7d3a0ff85aea54b7ae8347"; + sha256 = "b4f103de6bd38ab346f7d17236f6098a51ebdff733ff69956a0f1e29cb35f10b"; }; - propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ]; - checkInputs = [ setuptools mock pytest ]; + propagatedBuildInputs = [ + googleapis_common_protos protobuf + google_auth requests grpcio + ] ++ lib.optional (pythonOlder "3.2") futures; + checkInputs = [ mock pytest ]; checkPhase = '' py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 9912316941f9..75c14ff62ebc 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -13,9 +13,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; checkInputs = [ pytest mock ]; - checkPhase = '' - py.test - ''; + # needs credentials + doCheck = false; meta = with stdenv.lib; { description = "Cloud Speech API enables integration of Google speech recognition into applications."; diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix index 24000161338c..daabba6c390a 100644 --- a/pkgs/development/python-modules/google_gax/default.nix +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -1,13 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi -, google_auth, ply, protobuf, grpcio, requests, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: +, google_auth, ply, protobuf, grpcio, requests +, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: buildPythonPackage rec { pname = "google-gax"; - version = "0.15.16"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "0p1ribd2xy7a04wnjv12agkcdi6f9cpj838884hayx07p5g8v3ji"; + sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; }; propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 99fe4b73cb98..57567a203ea7 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, -gobjectIntrospection, pygobject3, gtk3, matplotlib }: +gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, +buildPythonPackage }: -stdenv.mkDerivation rec { - version = "2.16"; +buildPythonPackage rec { + format = "other"; + version = "2.26"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; - homepage = http://graph-tool.skewed.de/; + homepage = https://graph-tool.skewed.de/; license = licenses.gpl3; platforms = platforms.all; maintainers = [ stdenv.lib.maintainers.joelmo ]; @@ -16,16 +18,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; + sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz"; }; configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" + "--with-boost-libdir=${boost}/lib" + "--with-expat=${expat}" + "--with-cgal=${cgal}" "--enable-openmp" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ boost diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 393d00a8176a..b1d19e9f5091 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, python, pygobject3 +{ fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3 , gst-plugins-base, ncurses }: stdenv.mkDerivation rec { pname = "gst-python"; - version = "1.12.3"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { @@ -12,22 +12,25 @@ stdenv.mkDerivation rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "19rb06x2m7103zwfm0plxx95gb8bp01ng04h4q9k6ii9q7g2kxf3"; + sha256 = "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0"; }; - patches = [ ./different-path-with-pygobject.patch ]; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ meson ninja pkgconfig python ]; # XXX: in the Libs.private field of python3.pc buildInputs = [ ncurses ]; - configureFlags = [ - "--with-pygi-overrides-dir=$(out)/${python.sitePackages}/gi/overrides" + mesonFlags = [ + "-Dpygi-overrides-dir=${python.sitePackages}/gi/overrides" ]; + postPatch = '' + chmod +x scripts/pythondetector # patchShebangs requires executable file + patchShebangs scripts/pythondetector + ''; + propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; # Needed for python.buildEnv diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix new file mode 100644 index 000000000000..34c01091ddf2 --- /dev/null +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "HeapDict"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nhvxyjq6fp6zd7jzmk5x4fg6xhakqx9lhkp5yadzkqn0rlf7ja0"; + }; + + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "a heap with decrease-key and increase-key operations."; + homepage = http://stutzbachenterprises.com; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix new file mode 100644 index 000000000000..a72338143a14 --- /dev/null +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, requests-cache, pygments, pyquery }: + +buildPythonPackage rec { + pname = "howdoi"; + version = "1.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dx9ms0b3z3bx02paj78cyi788d8l6cpd3jqbn3j88w736i4jknz"; + }; + + propagatedBuildInputs = [ six requests-cache pygments pyquery ]; + + meta = with stdenv.lib; { + description = "Instant coding answers via the command line"; + homepage = https://pypi.python.org/pypi/howdoi; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 8002ae478cb5..9bcb61751de4 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.0"; + version = "1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "02lj6kgaf9xpr0binxwac3gpdhljglyj9fr78s165jc7qd7mifdg"; + sha256 = "e18037fa43fb4af7c00bd262ca6f5d7bcd22debd5d71e43b0fb1437f56e78035"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 635f8b33d3c6..e66700d87ee0 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = "http://github.com/kjd/idna/"; + homepage = "https://github.com/kjd/idna/"; description = "Internationalized Domain Names in Applications (IDNA)"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix new file mode 100644 index 000000000000..65afe116510c --- /dev/null +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: + +buildPythonPackage rec { + pname = "imbalanced-learn"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r5js9kw6rvmfvxxkfjlcxv5xn5h19qvg7d41byilxwq9kd515g4"; + }; + + propagatedBuildInputs = [ scikitlearn ]; + checkInputs = [ nose pytest pandas ]; + checkPhase = '' + export HOME=$PWD + # skip some tests that fail because of minimal rounding errors + py.test imblearn --ignore=imblearn/metrics/classification.py + py.test doc/*.rst + ''; + + meta = with stdenv.lib; { + description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; + homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index 24a9abb625ff..5cf3c9e9db06 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "interruptingcow"; - version = "0.7"; + version = "0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0j6d0rbh8xjfw7bf8vcjld6q45i7vr9xsw5b9q6j87nhf4qhzx53"; + sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix new file mode 100644 index 000000000000..ef2444c0d2f0 --- /dev/null +++ b/pkgs/development/python-modules/iowait/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "iowait"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "16djvxd9sxm7cr57clhqkyrq3xvdzgwj803sy5hwyb62hkmw46xb"; + }; + + meta = { + description = "Platform-independent module for I/O completion events"; + homepage = https://launchpad.net/python-iowait; + }; +} diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 808853891e95..083c1f3b08dd 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -27,12 +27,11 @@ buildPythonPackage rec { pname = "ipython"; - version = "5.5.0"; - name = "${pname}-${version}"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "66469e894d1f09d14a1f23b971a410af131daa9ad2a19922082e02e0ddfd150f"; + sha256 = "00g696r9rk1c4p3sycnv7by55cp9mm7r6zkkdqbiw9l0mk8k58wb"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 64139f5d9050..d44a708befb2 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -18,16 +18,16 @@ , pexpect , appnope , typing +, backcall }: buildPythonPackage rec { pname = "ipython"; - version = "6.2.1"; - name = "${pname}-${version}"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "51c158a6c8b899898d1c91c6b51a34110196815cc905f9be0fa5878e19355608"; + sha256 = "a6ac981381b3f5f604b37a293369963485200e3639fb0404fa76092383c10c41"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -46,6 +46,7 @@ buildPythonPackage rec { traitlets prompt_toolkit pexpect + backcall ] ++ lib.optionals stdenv.isDarwin [appnope] ++ lib.optionals (pythonOlder "3.5") [ typing ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index c504062cba61..af7ebfb1c432 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.1.2"; + version = "7.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4263ce721a1e5b53a84c4595a5e296d270ae0dc534401b536f4dda64e0b0ca02"; + sha256 = "f23aac2447f593dbdc89a86833a2d59666ed44af42b23c267de380c324599507"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix new file mode 100644 index 000000000000..a43dbf737167 --- /dev/null +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "jdatetime"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7facd437d27365e217787e1013ecdc402aa77af7248e16128f6a753920000905"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Jalali datetime binding for python"; + homepage = https://pypi.python.org/pypi/jdatetime; + license = licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix new file mode 100644 index 000000000000..df21c0f41861 --- /dev/null +++ b/pkgs/development/python-modules/jieba/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchFromGitHub, glibcLocales, python, isPy3k }: + +buildPythonPackage rec { + pname = "jieba"; + version = "0.39"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "fxsjy"; + repo = pname; + rev = "v${version}"; + sha256 = "0hbq0l1jbgcvm58qg4p37im4jl5a9igvq3wlhlk22pmbkbvqqgzs"; + }; + + checkInputs = [ glibcLocales ]; + + # UnicodeEncodeError + doCheck = isPy3k; + + # Citing https://github.com/fxsjy/jieba/issues/384: "testcases is in a mess" + # So just picking random ones that currently work + checkPhase = '' + export LC_ALL=en_US.UTF-8 + ${python.interpreter} test/test.py + ${python.interpreter} test/test_tokenize.py + ''; + + meta = with lib; { + description = "Chinese Words Segementation Utilities"; + homepage = https://github.com/fxsjy/jieba; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 8d238b4746df..ceb697adcaf8 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.21"; + version = "1.23"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153"; + sha256 = "49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9"; }; # test files are missing diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index ca9549b677bb..6209c2593a7a 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An implementation of JSON Reference for Python"; - homepage = "http://github.com/gazpachoking/jsonref"; + homepage = "https://github.com/gazpachoking/jsonref"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 1018c536ff7d..2bdb93dfdf2d 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A JSON-RPC client library for asyncio"; - homepage = http://github.com/armills/jsonrpc-async; + homepage = https://github.com/armills/jsonrpc-async; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index b8a0c07d5a5d..0914100b5aa6 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "0.5"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "0cijqb8fvv9iq5ds9y5sj0gd6lapi90mgqvpkczp28fxz440ihq4"; + sha256 = "cf349bee4ab96db2e457b6a71a45380e1a9cf3e1ceb08260ecfd9928040ebe71"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 7a6104aacf35..d9315193d19f 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Jug"; - version = "1.6.4"; + version = "1.6.6"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e739b20e7fe53ac50f5954b9e32568bdd92012dd4bd199d13e2a675ccd69d97d"; + sha256 = "897ffbbbe8061772c238b4f436512ea3696016a04473c45a716d78c0de103ec1"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index d94842ade126..5ee99d5071f8 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.2.2"; + version = "5.2.3"; src = fetchPypi { inherit pname version; - sha256 = "83d5e23132f0d8f79ccd3939f53fb9fa97f88a896a85114dc48d0e86909b06c4"; + sha256 = "27befcf0446b01e29853014d6a902dd101ad7d7f94e2252b1adca17c3466b761"; }; checkInputs = [ ipykernel ipython mock pytest ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix new file mode 100644 index 000000000000..4cf69a1114e7 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }: +buildPythonPackage rec { + pname = "jupyterlab"; + version = "0.31.12"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1hp6p9bsr863glildgs2iy1a4l99m7rxj2sy9fmkxp5zhyhqvsrz"; + }; + + propagatedBuildInputs = [ + ipython_genutils + jupyterlab_launcher + notebook + ]; + + makeWrapperArgs = [ + "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" + ]; + + # Depends on npm + doCheck = false; + + meta = with lib; { + description = "Jupyter lab environment notebook server extension."; + license = with licenses; [ bsd3 ]; + homepage = "http://jupyter.org/"; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix new file mode 100644 index 000000000000..f316fe10563d --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: +buildPythonPackage rec { + pname = "jupyterlab_launcher"; + version = "0.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7"; + }; + + propagatedBuildInputs = [ + jsonschema + notebook + ]; + + # depends on requests and a bunch of other libraries + doCheck = false; + + meta = with lib; { + description = "This package is used to launch an application built using JupyterLab"; + license = with licenses; [ bsd3 ]; + homepage = "http://jupyter.org/"; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index f88a021d53d7..eef9dc493f60 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "1.4.1"; + version = "1.4.2"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "596e9b4e302a0dc04d35be159cf23d31c4cba73a218e16fc8cd1be0ad57f8c22"; + sha256 = "6a5c516f540f4b13b78c64a85dd42dc38fe29257e2fae6393fc5daff9106389b"; }; checkInputs = [ pytest six mock ]; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 4c42a4ebafea..860a14f7a4da 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.1.4"; + version = "2.1.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7ee1fcc79072ac904a4f008d715bcb78c60250ae3cd41d99e268c60ade8d0d3a"; + sha256 = "907ad29add1fff27342a9f4fe3e60003d450d3af41a38f22f629c7736fc8399d"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 8c97b18e9b61..ce5bb315581d 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,30 +1,28 @@ { stdenv, buildPythonPackage, fetchPypi -, secretstorage -, fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm -, mock, pytest, pytestrunner }: +, setuptools_scm, entrypoints, secretstorage +, pytest, pytest-flake8 }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "keyring"; - version = "11.0.0"; + version = "12.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b4607520a7c97be96be4ddc00f4b9dac65f47a45af4b4cd13ed5a8879641d646"; + sha256 = "846c9c709ee1203bac5444abec19b5228f4601377686f33cba672aa0ba313abd"; }; - buildInputs = [ - fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm - ]; + nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ mock pytest pytestrunner ]; + checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ secretstorage ]; + propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; - doCheck = !stdenv.isDarwin; + # all tests with flake8 are broken right now + # https://github.com/tholo/pytest-flake8/issues/45 + doCheck = false; checkPhase = '' - py.test $out + py.test ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix new file mode 100644 index 000000000000..6ee732a06cb1 --- /dev/null +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "kiwisolver"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278"; + }; + + # Does not include tests + doCheck = false; + + meta = { + description = "A fast implementation of the Cassowary constraint solver"; + homepage = https://github.com/nucleic/kiwi; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix new file mode 100644 index 000000000000..d1d25f5407c2 --- /dev/null +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, marisa-trie +, pythonOlder +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "langcodes"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1axdiva2qglsjmnx2ak7i6hm0yhp6kbc4lcsgn8ckwy0nq1z3kr2"; + }; + + propagatedBuildInputs = [ marisa-trie ]; + + disabled = pythonOlder "3.3"; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish"; + homepage = http://github.com/LuminosoInsight/langcodes; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 32f25eeda42c..c039bcc043a2 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,18 +1,21 @@ -{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi -, openldap, cyrus_sasl, openssl, pytest, pyasn1 }: +{ lib, buildPythonPackage, fetchPypi +, pyasn1, pyasn1-modules, pytest +, openldap, cyrus_sasl }: buildPythonPackage rec { pname = "python-ldap"; - version = "2.5.2"; - name = "${pname}-${version}"; - disabled = isPy3k; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b8c134dfedaef0e6ff4a4b94277708dcadb758b448905a83b8946df077356ed2"; + sha256 = "86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1"; }; - checkInputs = [ pytest pyasn1 ]; + propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; + + buildInputs = [ openldap cyrus_sasl ]; + + checkInputs = [ pytest ]; checkPhase = '' # Needed by tests to setup a mockup ldap server. @@ -21,28 +24,6 @@ buildPythonPackage rec { export SLAPD="${openldap}/libexec/slapd" export SCHEMA="${openldap}/etc/schema" - # AssertionError: expected errno=107, got 57 -> nix sandbox related ? - py.test -k 'not TestLdapCExtension and \ - not Test01_SimpleLDAPObject and \ - not Test02_ReconnectLDAPObject' Tests/*.py + py.test ''; - - patches = lib.singleton (writeText "avoid-syslog.diff" '' - diff a/Lib/slapdtest.py b/Lib/slapdtest.py - --- a/Lib/slapdtest.py - +++ b/Lib/slapdtest.py - @@ -60,7 +60,8 @@ def combined_logger( - pass - # for writing to syslog - new_logger = logging.getLogger(log_name) - - if sys_log_format: - + # /dev/log does not exist in nix build environment. - + if False: - my_syslog_formatter = logging.Formatter( - fmt=' '.join((log_name, sys_log_format))) - my_syslog_handler = logging.handlers.SysLogHandler( - ''); - - NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; - propagatedBuildInputs = [openldap cyrus_sasl openssl]; } diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 9b2499cd5b23..dfd5d5dfde9f 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ledgerblue"; - version = "0.1.16"; + version = "0.1.17"; src = fetchPypi { inherit pname version; - sha256 = "eba56b887339fb5f8582771e4e398df4fa5a017183b908d4f8950588157c1504"; + sha256 = "ac403b074337b9b58cae97ea00b3d94fc8efeea1717a80c49e79dc8aad6fc58f"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5d8c886e00bd..5261a7b65642 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,20 +1,19 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { pname = "libais"; - name = "${pname}-${version}"; - version = "0.16"; + version = "0.17"; - src = fetchurl { - url = "mirror://pypi/l/libais/${name}.tar.bz2"; - sha256 = "14dsh5k32ryszwdn6p45wrqp4ska6cc9qpm6lk5c5d1p4rc7wnhq"; + src = fetchPypi { + inherit pname version; + sha256 = "0pyka09h8nb0vlzh14npq4nxmzg1046lr3klgn97dsf5k0iflapb"; }; # data files missing doCheck = false; - buildInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytestcov coverage ]; propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index c0c2b205f58b..26fe33995ed8 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { libraryPath = lib.makeLibraryPath ( [] ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] - ++ lib.optionals openclSupport [ ocl-icd clblas ] + ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); preBuild = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { postFixup = '' rm $out/lib/libgpuarray-static.a - + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 @@ -75,7 +75,7 @@ buildPythonPackage rec { description = "Library to manipulate tensors on GPU."; license = licenses.free; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 3fe0b3911c26..417baed95603 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.7.7"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "5670c8da8d0192d932ac1e34f010e0eeb098cdb2af6daad0307b5418e7a37733"; + sha256 = "2b969b507c26d9db08b85be4808d75774b6418ecf5a0f61956f7a1da44519585"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 45c33f94b28a..ad6b938c9888 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, isPy3k, pythonOlder, lib, requests, future, - enum34 }: + enum34, + mock }: buildPythonPackage rec { pname = "linode-api"; - version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions. - name = "${pname}-${version}"; + version = "4.1.8b1"; # NOTE: this is a beta, and the API may change in future versions. disabled = (pythonOlder "2.7"); @@ -22,11 +22,15 @@ buildPythonPackage rec { sed -i -e '/"enum34",/d' setup.py ''); - doCheck = false; # This library does not have any tests at this point. + doCheck = true; + checkInputs = [ mock ]; - src = fetchPypi { - inherit pname version; - sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4"; + # Sources from Pypi exclude test fixtures + src = fetchFromGitHub { + rev = "v${version}"; + owner = "linode"; + repo = "python-linode-api"; + sha256 = "0qfqn92fr876dncwbkf2vhm90hnf7lwpg80hzwyzyzwz1hcngvjg"; }; meta = { diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index ef4d9fb5d020..f53ff3cbebaa 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.3.2"; + version = "1.3.3"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "96252a286a2be25810904d969b330ef2a57c2b9c18c5b503bbfbae40feb2bb63"; + sha256 = "e514fa390d143530c7395f640c6b527f4f80b03f90995c7b38ff0b2f86e11ce7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix new file mode 100644 index 000000000000..a4d7a8ce7062 --- /dev/null +++ b/pkgs/development/python-modules/locket/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "locket"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz"; + }; + + buildInputs = [ pytest ]; + + # weird test requirements (spur.local>=0.3.7,<0.4) + doCheck = false; + + meta = with stdenv.lib; { + description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; + homepage = https://github.com/mwilliamson/locket.py; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index 4bc48810e71d..c3e27c8b36a0 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { buildInputs = [ mock unittest2 ]; meta = { - homepage = http://locust.io/; + homepage = https://locust.io/; description = "A load testing tool"; }; } diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index 952cc03e454e..8f7229a4c0f0 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "logilab-database provides some classes to make unified access to different"; - homepage = "http://www.logilab.org/project/logilab-database"; + homepage = "https://www.logilab.org/project/logilab-database"; }; } diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index bfd0c8227ee7..9fd050ac35ed 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.1.1"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + sha256 = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b"; }; buildInputs = [ libxml2 libxslt ]; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index c1a6721bb804..9ec291439cef 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.13"; + version = "0.1.14"; src = fetchPypi { inherit pname version; - sha256 = "b19e3703a3a897859f01ff6a068ee9a0eea8e8fdf75e896e00e88b3476a12f87"; + sha256 = "a14635cdeedb125f0f85e014eb5898fd634e2da358a160c124818e9c9f851add"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index e6be19198efb..a553a3bf4335 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "magic-wormhole-transit-relay"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "faac36266c72745102a1a8b93abc5b25feed1be5bca7b29968a156966c312567"; + sha256 = "b13f1bfab295150b25958014d93fcd9f744d92011d186d7381575465587b8587"; }; propagatedBuildInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index 368ab51845c0..51344a8a95a5 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "mozrunner"; - version = "6.14"; + version = "6.15"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a401ea5141cdd15d8f047f19a30ccbeabeb0aea079674b684121acddc5dcf810"; + sha256 = "985d4d4cf7597f09ed1b42165997d966fa35b0130a7a6bbcb2c71ecd5f4c453f"; }; propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix new file mode 100644 index 000000000000..ad9f6d6f2457 --- /dev/null +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestrunner +, pytest +, hypothesis +}: + +buildPythonPackage rec { + pname = "marisa-trie"; + version = "0.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n4pxnaranbh3x2fcqxwh8j1z2918vy7i4q1z4jn75m9rkm5h8ia"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "hypothesis==" "hypothesis>=" + ''; + + nativeBuildInputs = [ pytestrunner ]; + + checkInputs = [ pytest hypothesis ]; + + meta = with lib; { + description = "Static memory-efficient Trie-like structures for Python (2.x and 3.x) based on marisa-trie C++ library"; + longDescription = "There are official SWIG-based Python bindings included in C++ library distribution; this package provides alternative Cython-based pip-installable Python bindings."; + homepage = https://github.com/kmike/marisa-trie; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 3579c22e92b9..46f85b654c72 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado +, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection @@ -21,13 +21,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.2"; + version = "2.2.2"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "725a3f12739d133adfa381e1b33bd70c6f64db453bfc536e148824816e568894"; + sha256 = "4dc7ef528aad21f22be85e95725234c5178c0f938e2228ca76640e5e84d8cde8"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -39,7 +39,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype + [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver libpng pkgconfig mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix new file mode 100644 index 000000000000..110d1a57c826 --- /dev/null +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, mecab +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mecab-python3"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "007dg4f5fby2yl7cc44x6xwvcrf2w2ifmn0rmk56ss33mhs8l6qy"; + }; + + propagatedBuildInputs = [ mecab ]; + + meta = with lib; { + description = "A python wrapper for mecab: Morphological Analysis engine"; + homepage = https://github.com/LuminosoInsight/wordfreq/; + license = licenses.bsd0; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index ec6c15b25012..5a348e5288c4 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Memory Usage Analyzer"; - homepage = http://launchpad.net/meliae; + homepage = https://launchpad.net/meliae; license = licenses.gpl3; maintainers = with maintainers; [ xvapx ]; }; diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix new file mode 100644 index 000000000000..b40aead39090 --- /dev/null +++ b/pkgs/development/python-modules/misaka/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, cffi }: +buildPythonPackage rec { + pname = "misaka"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7"; + }; + + propagatedBuildInputs = [ cffi ]; + + # The tests require write access to $out + doCheck = false; + + meta = with lib; { + description = "A CFFI binding for Hoedown, a markdown parsing library"; + homepage = "http://misaka.61924.nl/"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix new file mode 100644 index 000000000000..edb3407270f2 --- /dev/null +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, mock }: + +buildPythonPackage rec { + pname = "mock-open"; + version = "1.3.1"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "nivbend"; + repo = pname; + rev = "v${version}"; + sha256 = "0ikhrhlkl5c7qbigpsv44jw89ws1z7j06gzyg5dh1ki533ifbjm2"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; + + meta = with lib; { + homepage = https://github.com/nivbend/mock-open; + description = "A better mock for file I/O"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index 6891dd2b6272..2097470d4e47 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Advanced, easy to use and extensible WikiEngine"; - homepage = "http://moinmo.in/"; + homepage = "https://moinmo.in/"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix new file mode 100644 index 000000000000..e618f039ebdf --- /dev/null +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, six +}: + + +buildPythonPackage rec { + pname = "more-itertools"; + version = "4.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 84096d8aa921..222e54c871a0 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -4,13 +4,22 @@ buildPythonPackage rec { pname = "moto"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c42b894cdf35412c95f0c6b40309cf802436e049cd172dc5db7516c7b845191b"; + sha256 = "e6b25a32b61ba97bbc2236960ad6865ab111962a927de720c907475adff4499b"; }; + postPatch = '' + # dateutil upper bound was just to keep compatibility with Python 2.6 + # see https://github.com/spulec/moto/pull/1519 and https://github.com/boto/botocore/pull/1402 + # regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16 + substituteInPlace setup.py \ + --replace "python-dateutil<2.7.0" "python-dateutil<3.0.0" \ + --replace "aws-xray-sdk<0.96," "aws-xray-sdk" + ''; + propagatedBuildInputs = [ aws-xray-sdk boto diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix index 6adba7ef2b96..98e8d5b4078c 100644 --- a/pkgs/development/python-modules/mozterm/default.nix +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -1,9 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "mozterm"; version = "0.1.0"; + # name 'unicode' is not defined + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561"; diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix new file mode 100644 index 000000000000..3f974872b959 --- /dev/null +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six +, fetchPypi, lib +}: + +buildPythonPackage rec { + pname = "mrbob"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121"; + }; + + disabled = isPy3k; + + checkInputs = [ nose glibcLocales mock ]; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests + ''; + + propagatedBuildInputs = [ argparse jinja2 six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/domenkozar/mr.bob; + description = "A tool to generate code skeletons from templates"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 0244b03c4842..cae571fe2f5c 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -2,18 +2,18 @@ , buildPythonPackage , fetchPypi , cython -, msgpack-python +, msgpack , numpy , python }: buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "1czf125nixzwskiqiw0145kfj15030sp334cb89gp5w4rz3h7img"; + sha256 = "9d6da0bbb04d7cab2bf9f08f78232c954f00ac95cf2384149e779a31ce859126"; }; buildInputs = [ @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - msgpack-python + msgpack numpy ]; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 73d0f5a2dbe3..8edd8429d0d4 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "multipledispatch"; - version = "0.4.9"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; + sha256 = "9e92d63efad2c9b68562175d9148d8cb32d04bf5557991190e643749bf4ed954"; }; # No tests in archive diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix new file mode 100644 index 000000000000..46658520cb58 --- /dev/null +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, pycodestyle +, pyflakes +, pytest +, pkgs +}: + +buildPythonPackage rec { + pname = "mutagen"; + version = "1.40.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ppfmpf60c78p4yp7in3f8y1l1fd34a38vw9swpg2fl6hz7c58mj"; + }; + + checkInputs = [ + pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz + pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis + ]; + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "Python multimedia tagging library"; + homepage = https://mutagen.readthedocs.io/; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 6a2b3de00165..78069d49246c 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,17 +4,20 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.6"; + version = "8.0.11"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1ygr7va56da12yp3gr7kzss9zgbs28q2lmdkw16rpxj108id4rkp"; + sha256 = "0w5sxy0zdkdj5cj35wwfjy9y8yn5yzk9biwwsglvhkqlkrms8fw1"; }; propagatedBuildInputs = [ protobuf ]; + # Tests are failing (TODO: unknown reason) + # TypeError: __init__() missing 1 required positional argument: 'string' + # But the library should be working as expected. doCheck = false; meta = { diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index b9b50d98ebf3..412d42bafddd 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "netdisco"; - version = "1.3.1"; + version = "1.4.0"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = pname; rev = version; - sha256 = "082ihazpcmf7qh4671kgdr5kzglyj10gp9hyy52snh0c1rz468fd"; + sha256 = "0q1cl76a0fwxm80lkk7cpd4p23r2bvf1a45nb7n61cgzrqcv43q1"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; diff --git a/pkgs/development/python-modules/neurotools/default.nix b/pkgs/development/python-modules/neurotools/default.nix new file mode 100644 index 000000000000..b117d7a79a37 --- /dev/null +++ b/pkgs/development/python-modules/neurotools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, scipy, numpy, matplotlib, tables, pyaml, urllib3, rpy2, mpi4py }: + +buildPythonPackage rec { + pname = "NeuroTools"; + version = "0.3.1"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4"; + }; + + # Tests are not automatically run + # Many tests fail (using py.test), and some need R + doCheck = false; + + propagatedBuildInputs = [ + scipy + numpy + matplotlib + tables + pyaml + urllib3 + rpy2 + mpi4py + ]; + + meta = with stdenv.lib; { + description = "Collection of tools to support analysis of neural activity"; + homepage = https://pypi.python.org/pypi/NeuroTools; + license = licenses.gpl2; + maintainers = with maintainers; [ nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 6133abac7052..ef4473e4066f 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.4.0"; + version = "0.4.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "bb692254bde35d7e1d3d1534d9b3117810b35a744724625f150fbbc64d519c02"; + sha256 = "c2ef16d357d24699abced07e89a50d465c8fbaa8537f1a9d4d5cb8a612926dbc"; }; checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 30ee2b28561a..39fc0995b43d 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -21,24 +21,33 @@ , simplejson , traits , xvfbwrapper +, pytestcov +, codecov # other dependencies , which +, bash +, glibcLocales }: assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "47f62fda3d6b9a37aa407a6b78c80e91240aa71e61191ed00da68b02839fe258"; + sha256 = "1ed65f3e97fd0f82c418ad48af2107050e86d9e39eea4d22381ad7df932bf1ec"; }; - doCheck = false; # fails with TypeError: None is not callable - checkInputs = [ which ]; - buildInputs = [ pytest mock ]; # required in installPhase + # see https://github.com/nipy/nipype/issues/2240 + patches = [ ./prov-version.patch ]; + + postPatch = '' + substituteInPlace nipype/interfaces/base/tests/test_core.py \ + --replace "/usr/bin/env bash" "${bash}/bin/bash" + ''; + propagatedBuildInputs = [ click dateutil @@ -59,6 +68,12 @@ buildPythonPackage rec { configparser ]; + checkInputs = [ pytest mock pytestcov codecov which glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype + ''; + meta = with stdenv.lib; { homepage = http://nipy.org/nipype/; description = "Neuroimaging in Python: Pipelines and Interfaces"; diff --git a/pkgs/development/python-modules/nipype/prov-version.patch b/pkgs/development/python-modules/nipype/prov-version.patch new file mode 100644 index 000000000000..133295d0560b --- /dev/null +++ b/pkgs/development/python-modules/nipype/prov-version.patch @@ -0,0 +1,21 @@ +diff --git a/nipype/info.py b/nipype/info.py +index 1daa382e2..da338d0ea 100644 +--- a/nipype/info.py ++++ b/nipype/info.py +@@ -108,7 +108,6 @@ DATEUTIL_MIN_VERSION = '2.2' + PYTEST_MIN_VERSION = '3.0' + FUTURE_MIN_VERSION = '0.16.0' + SIMPLEJSON_MIN_VERSION = '3.8.0' +-PROV_VERSION = '1.5.0' + CLICK_MIN_VERSION = '6.6.0' + PYDOT_MIN_VERSION = '1.2.3' + +@@ -140,7 +139,7 @@ REQUIRES = [ + 'traits>=%s' % TRAITS_MIN_VERSION, + 'future>=%s' % FUTURE_MIN_VERSION, + 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, +- 'prov==%s' % PROV_VERSION, ++ 'prov<2', + 'click>=%s' % CLICK_MIN_VERSION, + 'funcsigs', + 'pytest>=%s' % PYTEST_MIN_VERSION, diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix new file mode 100644 index 000000000000..d136c41aa370 --- /dev/null +++ b/pkgs/development/python-modules/noise/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "noise"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/caseman/noise; + description = "Native-code and shader implementations of Perlin noise"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 835e39cc43e1..d05284b62dd4 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "numpy-stl"; name = "${pname}-${version}"; - version = "2.3.2"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0w3f9yhw4mg88drqnn17gaqxbx941p3hg0rn8fsqrf5ry56h93k2"; + sha256 = "33e88013ed2f4f9ec45598f0e0930a0d602ab3c49aa19e92703a867f37ffe520"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 3fce29cd8cda..4022115e9a0e 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,14 +1,13 @@ -{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: +{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }: buildPythonPackage rec { pname = "numpy"; - version = "1.14.1"; - name = "${pname}-${version}"; + version = "1.14.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fa0944650d5d3fb95869eaacd8eedbd2d83610c85e271bd9d3495ffa9bc4dc9c"; + sha256 = "facc6f925c3099ac01a1f03758100772560a0b020fb9d70f210404be08006bcb"; }; disabled = isPyPy; @@ -20,6 +19,18 @@ buildPythonPackage rec { ./numpy-distutils-C++.patch ]; + postPatch = lib.optionalString hostPlatform.isMusl '' + # Use fenv.h + sed -i \ + numpy/core/src/npymath/ieee754.c.src \ + numpy/core/include/numpy/ufuncobject.h \ + -e 's/__GLIBC__/__linux__/' + # Don't use various complex trig functions + substituteInPlace numpy/core/src/private/npy_config.h \ + --replace '#if defined(__GLIBC__)' "#if 1" \ + --replace '#if !__GLIBC_PREREQ(2, 18)' "#if 1" + ''; + preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 3af324c87652..0e6fa25bd537 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname; inherit version; - sha256 = "2dc7b2c4e3914745e38e370946fa4c109817331e6d450806285c08bce5cd575a"; + sha256 = "61f4bf030937b60daa3262e421775838c945dcdd671f37b69e8e4854c7eb5ffd"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix new file mode 100644 index 000000000000..81742a99da8d --- /dev/null +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi +, six, httplib2, pyasn1-modules, rsa }: + +buildPythonPackage rec { + pname = "oauth2client"; + version = "4.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "bd3062c06f8b10c6ef7a890b22c2740e5f87d61b6e1f4b1c90d069cdfc9dadb5"; + }; + + propagatedBuildInputs = [ six httplib2 pyasn1-modules rsa ]; + doCheck = false; + + meta = with lib; { + description = "A client library for OAuth 2.0"; + homepage = https://github.com/google/oauth2client/; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index 9380654f472b..d1aaebee5c0c 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "openidc-client"; - version = "0.2.0"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1fca4bpnswyji5nivsrbak5vsfphl4njyfrb8rm2034nq6mzb8ah"; + sha256 = "59d59d6fbfd26c5b57c53e582bdf2379274602f96133a163e7ff1ef39c363353"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index fe13b575afc1..d8a419189312 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.0"; + version = "2.5.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0ff2e0c2c85cbf42e82dd223e7f2401a62dc73c18cd9e5dd7763dc6c8014ebde"; + sha256 = "63165adcc806a5c281febb344f3594541f778f05b99a3a5e802941a3c0a85f71"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index f335bfa135f9..6c72947fff69 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "16.8"; + version = "17.1"; src = fetchPypi { inherit pname version; - sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; + sha256 = "f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b"; }; propagatedBuildInputs = [ pyparsing six ]; diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index 02b8211a256d..274cf1b28343 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -27,12 +27,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.17.1"; + version = "0.22.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; + sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 8c927e4aed03..ac150af4b782 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -6,21 +6,13 @@ buildPythonPackage rec { pname = "parse_type"; - version = "0.3.4"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147"; + sha256 = "0g3b6gsdwnm8dpkh2vn34q6dzxm9gl908ggyzcv31n9xbp3vv5pm"; }; - patches = [ - (fetchpatch { - name = "python-3.5-tests-compat.patch"; - url = "https://github.com/jenisys/parse_type/pull/4.patch"; - sha256 = "1mmn2fxss6q3qhaydd4s4v8vjgvgkg41v1vcivrzdsvgsc3npg7m"; - }) - ]; - checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index eaca200e2bff..36153c102290 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,22 +3,14 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.6.6"; + version = "1.8.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "71435aaac494e08cec76de646de2aab8392c114e56fe3f81c565ecc7eb886178"; + sha256 = "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40"; }; - patches = [ - (fetchpatch { - name = "python-3.5-tests-compat.patch"; - url = "https://github.com/r1chardj0n3s/parse/pull/34.patch"; - sha256 = "16iicgkf3lwivmdnp3xkq4n87wjmr3nb77z8mwz67b7by9nnp3jg"; - }) - ]; - checkPhase = '' ${python.interpreter} test_parse.py ''; diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 53754fd3dc29..ea780f964f42 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "path.py"; - version = "11.0"; + version = "11.0.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "16134e5b287aba4a4125a6722e7837cf2a149fccc5000c500ae6c71a5525488b"; + sha256 = "e7eb9d0ca4110d9b4d7c9baa0696d8c94f837d622409cefc5ec9e7c3d02ea11f"; }; checkInputs = [ pytest pytestrunner glibcLocales packaging ]; @@ -30,6 +30,8 @@ buildPythonPackage rec { }; checkPhase = '' + # Ignore pytest configuration + rm pytest.ini py.test test_path.py ''; } diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index bf74906d9e57..4d812ec3b4f9 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.5.5"; + version = "0.5.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; + sha256 = "be664567cf96a718a68b33329862d1e6f6803ef9c48a6e2636265806cfceb29d"; }; meta = { diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix new file mode 100644 index 000000000000..c83cada08f2e --- /dev/null +++ b/pkgs/development/python-modules/pbkdf2/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pbkdf2"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yb99rl2mbsaamj571s1mf6vgniqh23v98k4632150hjkwv9fqxc"; + }; + + # ImportError: No module named test + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 75052f271510..993dab3aceeb 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "3.1.1"; + version = "4.0.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"; + sha256 = "56b7a8ba7d64bf6135a9dfefb85a80d95924b3fde5ed6343a1a1d464a040dae3"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 3a49a32a8a0e..c6c5b99d9806 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pecan"; - homepage = "http://github.com/pecan/pecan"; + homepage = "https://github.com/pecan/pecan"; }; } diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 2d3ccf83a8a5..f603c98e6d87 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "1.4.2"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "39a255776528afe11ea0d57814f9bf3729c1e0b99063af2e5c6cfd750c3e1f7f"; + sha256 = "601e52cb0425e94b1784b6613a9085e0066ae1fa1915d18771884b67e93cac5c"; }; propagatedBuildInputs = [ dateutil pytzdata tzlocal ]; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix new file mode 100644 index 000000000000..e77c281e2c49 --- /dev/null +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -0,0 +1,20 @@ +{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}: + +buildPythonPackage rec{ + pname = "periodictable"; + version = "1.5.0"; + + propagatedBuildInputs = [numpy pyparsing]; + + src = fetchPypi { + inherit pname version; + sha256 = "1cjk6aqcz41nxm4fpriz01vqdafd6g57cjk0wh1iklk5cx6c085h"; + }; + + meta = { + homepage = http://www.reflectometry.org/danse/software.html; + description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index e00aeb5d70de..47a154a529c7 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.0"; + version = "8.9.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2cb4822ba895200b06f46a788e852d6ae8200fdc97e1d7c86b0ee10c99d4ff3a"; + sha256 = "68f7402c6d2646adff4df895471f2b47fd61d0cf57c59a06aacc88dfff04a1cb"; }; meta = { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index cb6008ea9a2b..e9a0acac1cba 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "5.0.0"; + version = "5.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "12f29d6c23424f704c66b5b68c02fe0b571504459605cfe36ab8158359b0e1bb"; + sha256 = "cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"; }; doCheck = !stdenv.isDarwin && !isPyPy; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix new file mode 100644 index 000000000000..a566e31e035f --- /dev/null +++ b/pkgs/development/python-modules/pip/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, scripttest +, virtualenv +, pretend +, pytest +}: + +buildPythonPackage rec { + pname = "pip"; + version = "9.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796"; + }; + + # pip detects that we already have bootstrapped_pip "installed", so we need + # to force it a little. + installFlags = [ "--ignore-installed" ]; + + checkInputs = [ mock scripttest virtualenv pretend pytest ]; + # Pip wants pytest, but tests are not distributed + doCheck = false; + + meta = { + description = "The PyPA recommended tool for installing Python packages"; + license = lib.licenses.mit; + homepage = https://pip.pypa.io/; + priority = 10; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix new file mode 100644 index 000000000000..db323e671d40 --- /dev/null +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pkginfo"; + version = "1.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474"; + }; + + doCheck = false; # I don't know why, but with doCheck = true it fails. + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/pkginfo; + license = licenses.mit; + description = "Query metadatdata from sdists / bdists / installed packages"; + + longDescription = '' + This package provides an API for querying the distutils metadata + written in the PKG-INFO file inside a source distriubtion (an sdist) + or a binary distribution (e.g., created by running bdist_egg). It can + also query the EGG-INFO directory of an installed distribution, and the + *.egg-info stored in a “development checkout” (e.g, created by running + setup.py develop). + ''; + }; +} diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 03182c902655..336a098c3a36 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "plaster_pastedeploy"; - version = "0.4.2"; + version = "0.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2a401228c7cfbe38f728249e75af7a666f91c61d642cbb8fcb78a71df69d2754"; + sha256 = "70a3185b2a3336996a26e9987968cf35e84cf13390b7e8a0a9a91eb8f6f85ba9"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index fb5a5c93a12f..09a465b96d7c 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.4.1"; + version = "2.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f588991dce15437debd825eca935c8cfbabf438cdc0dcd2ce7a88f429d982f69"; + sha256 = "9dd816c36271cf81d82c854fba866c743cbd8cc71f1c95384195307def859a69"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index 3b2ee20c8251..2e3928b742c1 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "polib"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb"; + sha256 = "fad87d13696127ffb27ea0882d6182f1a9cf8a5e2b37a587751166c51e5a332a"; }; # error: invalid command 'test' diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix new file mode 100644 index 000000000000..0ae689034a3a --- /dev/null +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -0,0 +1,42 @@ +{ buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch +, python, substituteAll +}: + +buildPythonPackage rec { + pname = "python-poppler-qt5"; + version = "0.24.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r"; + }; + + patches = [ + (substituteAll { + src = ./poppler-include-dir.patch; + poppler_include_dir = "${poppler.dev}/include/poppler"; + }) + (fetchpatch { + url = "https://github.com/wbsoft/python-poppler-qt5/commit/faf4d1308f89560b0d849671226e3080dfc72e79.patch"; + sha256 = "18krhh6wzsnpxzlzv02nginb1vralla8ai24zqk10nc4mj6fkj86"; + }) + ]; + + setupPyBuildFlags = [ + "--pyqt-sip-dir ${pyqt5}/share/sip/PyQt5" + "--qt-include-dir ${qtbase.dev}/include" + ]; + + buildInputs = [ qtbase.dev poppler ]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ sip pyqt5.dev ]; + + # no tests, just bindings for `poppler_qt5` + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/wbsoft/python-poppler-qt5; + license = licenses.gpl2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch b/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch new file mode 100644 index 000000000000..7106c1d6352c --- /dev/null +++ b/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index 59a75b0..0a73268 100644 +--- a/setup.py ++++ b/setup.py +@@ -169,6 +169,7 @@ class build_ext(build_ext_base): + 'Please specify via --pyqt-sip-flags=') + + self.include_dirs += (self.qt_include_dir, ++ '@poppler_include_dir@', + os.path.join(self.qt_include_dir, 'QtCore'), + os.path.join(self.qt_include_dir, 'QtGui'), + os.path.join(self.qt_include_dir, 'QtXml')) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index c0be1009b069..8f43cbfb4a8c 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -5,15 +5,20 @@ buildPythonPackage rec { pname = "praw"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "0nwfadczxa1fyq65zc3sfv8g2r4w3xrx3bdi5fv9xpn97wh2ifgw"; + sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; }; + postPatch = '' + # drop upper bound of prawcore requirement + sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py + ''; + propagatedBuildInputs = [ requests decorator diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index eb3fb784dc97..b59327cd0590 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -6,15 +6,19 @@ buildPythonPackage rec { pname = "prawcore"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "prawcore"; rev = "v${version}"; - sha256 = "1z5fz6v4bv6xw84l4q3rpw3j63bb2dldl0fd6ckz8wqlpb2l45br"; + sha256 = "0v16n6bzf483i00bn0qykrg3wvw9dbnfdl512pw8n635ld1g7cb8"; }; + postPatch = '' + sed -i "s/'testfixtures >4.13.2, <6'/'testfixtures >4.13.2'/g" setup.py + ''; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix new file mode 100644 index 000000000000..3572d938a0dc --- /dev/null +++ b/pkgs/development/python-modules/pretend/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pretend"; + version = "1.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/alex/pretend; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index 18dfa693f5b5..59ef547dba36 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -1,12 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "progressbar"; - version = "2.2"; + version = "2.3"; + + # https://github.com/niltonvolpato/python-progressbar/issues/54 + disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3"; + sha256 = "b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254"; }; # invalid command 'test' diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix new file mode 100644 index 000000000000..f98259617545 --- /dev/null +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "progressbar231"; + version = "2.3.1"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0j0ifxk87xz3wkyacxaiqygghn27wwz6y5pj9k8j2yq7n33fbdam"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar231; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix new file mode 100644 index 000000000000..f3b94436d452 --- /dev/null +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "progressbar33"; + version = "2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zvf6zs5hzrc03p9nfs4p16vhilqikycvv1yk0pxn8s07fdhvzji"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar33; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index cd945f7bfc61..efe4e9df6724 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "py"; - version = "1.5.2"; + version = "1.5.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ca18943e28235417756316bfada6cd96b23ce60dd532642690dcfdaba988a76d"; + sha256 = "29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix new file mode 100644 index 000000000000..b5ac0f7b7b1b --- /dev/null +++ b/pkgs/development/python-modules/py3status/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, pytz +, tzlocal + +, file +, acpi +, coreutils +, alsaUtils +, i3 +, procps +, lm_sensors +, libnotify +, xorg +}: + +buildPythonPackage rec { + pname = "py3status"; + version = "3.8"; + src = fetchPypi { + inherit pname version; + sha256 = "1izjpf9q768m3j95y328vbdh7rycglqlslyd777b12c13i6zs6cb"; + }; + doCheck = false; + propagatedBuildInputs = [ pytz requests tzlocal ]; + buildInputs = [ file ]; + prePatch = '' + sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py + sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py + sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py + sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py + sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py + sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py + sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py + sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py + sed -i -e "s|'setxkbmap|'${xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py + sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py + ''; + + meta = with stdenv.lib; { + description = "Extensible i3status wrapper"; + license = licenses.bsd3; + homepage = https://github.com/ultrabug/py3status; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix new file mode 100644 index 000000000000..1c2cb4a7643d --- /dev/null +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -0,0 +1,65 @@ +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: + +let + _arrow-cpp = arrow-cpp.override { inherit python;}; + _parquet-cpp = parquet-cpp.override { arrow-cpp = _arrow-cpp; }; +in + +buildPythonPackage rec { + pname = "pyarrow"; + version = "0.9.0"; + + src = fetchurl { + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + }; + + sourceRoot = "apache-arrow-${version}/python"; + + nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; + propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ pandas pytest pytestrunner ]; + + PYARROW_BUILD_TYPE = "release"; + PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib"; + + preBuild = '' + substituteInPlace CMakeLists.txt --replace "\''${ARROW_ABI_VERSION}" '"0.0.0"' + substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"' + + # fix the hardcoded value + substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${_parquet-cpp.version}")' + ''; + + preCheck = '' + rm pyarrow/tests/test_hdfs.py + + # fails: "ArrowNotImplementedError: Unsupported numpy type 22" + substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled" + + # runs out of memory on @grahamcofborg linux box + substituteInPlace pyarrow/tests/test_feather.py --replace "test_large_dataframe" "_disabled" + + # probably broken on python2 + substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled" + + # fails "error: [Errno 2] No such file or directory: 'test'" because + # nix_run_setup invocation somehow manages to import deserialize_buffer.py + # when it is not intended to be imported at all + rm pyarrow/tests/deserialize_buffer.py + substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" + ''; + + ARROW_HOME = _arrow-cpp; + PARQUET_HOME = _parquet-cpp; + + setupPyBuildFlags = ["--with-parquet" ]; + + meta = with lib; { + description = "A cross-language development platform for in-memory data"; + homepage = https://arrow.apache.org/; + license = lib.licenses.asl20; + platforms = platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index c81d60ced4df..0547a5d3ba04 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,19 +1,19 @@ -{ buildPythonPackage, stdenv, fetchPypi, parameterized, six, nose }: +{ buildPythonPackage, stdenv, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1hggg69s5r8jyqdwyzri5sn3f19p7ayl0fjhjma0qzgfp7bk6zjc"; + sha256 = "c974bff394e16817596fab686a0c7deb4995a468b035b02a788b6dbfd1e6bdeb"; }; propagatedBuildInputs = [ six ]; - checkInputs = [ parameterized nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests + py.test ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix new file mode 100644 index 000000000000..09cb4c2cdf98 --- /dev/null +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pygccxml }: +buildPythonPackage rec { + pname = "PyBindGen"; + version = "0.18.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sl4jn8rildv6f62cab66w791cixhaaxl7gwg9labs099rl74yl6"; + }; + + buildInputs = [ setuptools_scm ]; + + checkInputs = [ pygccxml ]; + + meta = with stdenv.lib; { + homepage = https://github.com/gjcarneiro/pybindgen; + description = "Python Bindings Generator"; + license = licenses.lgpl2; + maintainers = with maintainers; [ teto ]; + }; +} + + diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index c2f4e7db43fc..7d70fd30a254 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyblake2"; - version = "1.1.0"; + version = "1.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3a850036bf42053c74bfc52c063323ca78e40ba1f326b01777da5750a143631a"; + sha256 = "8ec8e9087d13c99b354ab6d8b4cadb1758633db5946ff95a6bc7ac538b6d7b3d"; }; # requires setting up sphinx doctest diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 0b41b6ef0b10..e90fc4b26366 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.0.0"; + version = "2.1.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "1cp1ssfb8zk4sz74nsnf72b7dd5fzkwc4qdgc7rq8nfr4v611w6c"; + sha256 = "a18fee9bf32f62fcb539783c3888e811015c1f6377bcdb383b13d6537691f336"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix new file mode 100644 index 000000000000..23633ce248db --- /dev/null +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, pyparsing, decorator, six }: + +buildPythonPackage rec { + pname = "PyContracts"; + version = "1.8.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ pyparsing decorator six ]; + + meta = with stdenv.lib; { + description = "Allows to declare constraints on function parameters and return values"; + homepage = https://pypi.python.org/pypi/PyContracts; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix new file mode 100644 index 000000000000..4a0dbe878f66 --- /dev/null +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, python }: + +buildPythonPackage rec { + pname = "pycparser"; + version = "2.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with stdenv.lib; { + description = "C parser in Python"; + homepage = https://github.com/eliben/pycparser; + license = licenses.bsd3; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index a086658cd7b7..85024baa26e4 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.9"; + version = "3.5.1"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "00cc7767c7bbe91f15a65a1b2ebe7a08002b8ae8221c1dcecc5c5c9ab6f79753"; + sha256 = "b7957736f5e868416b06ff033f8525e64630c99a8880b531836605190b0cac96"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 8cc22c986e25..c5af0c91317e 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; name = "${pname}-${version}"; - version = "3.4.9"; + version = "3.5.1"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d078b67be76ccafa8b7cc391e87151b80b0ef9bfbeee8a95d286e522cc7537f7"; + sha256 = "bb60d38111ebc383a5a1c909545562926c66c846d03fc65ba7b8a3487cb23078"; }; } diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix new file mode 100644 index 000000000000..33e8d9c3fa9d --- /dev/null +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "pyechonest"; + version = "9.0.0"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1da4b3b8b457232a7eb35b59a48390b3c208759b01d596acaa71e6a172b40495"; + }; + + meta = with stdenv.lib; { + description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; + homepage = https://github.com/echonest/pyechonest; + }; +} diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 25c286414a3c..cfb575c7675e 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,21 +1,37 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, unittest2 }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.3"; + version = "3.4.1"; pname = "pyfakefs"; - name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "19hj5wyi8wy8n8hdj5dwlryl3frrn783y4dsfdxn5mg0lpg9iqg3"; + # no tests in PyPI tarball + # https://github.com/jmcgeheeiv/pyfakefs/pull/361 + src = fetchFromGitHub { + owner = "jmcgeheeiv"; + repo = pname; + rev = "v${version}"; + sha256 = "0i8kq7sl8bczr927hllgfhsmirjqjh89c9184kcqmprc13ac4kxy"; }; - propagatedBuildInputs = [ pytest unittest2 ]; + postPatch = '' + # test doesn't work in sandbox + substituteInPlace tests/fake_filesystem_test.py \ + --replace "test_expand_root" "notest_expand_root" + substituteInPlace tests/fake_os_test.py \ + --replace "test_append_mode" "notest_append_mode" + ''; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.UTF-8 ${python.interpreter} -m tests.all_tests + py.test tests/pytest_plugin_test.py + ''; meta = with stdenv.lib; { description = "Fake file system that mocks the Python file system modules"; license = licenses.asl20; - homepage = "http://pyfakefs.org/"; + homepage = http://pyfakefs.org/; maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix new file mode 100644 index 000000000000..5271677dc1ea --- /dev/null +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -0,0 +1,26 @@ +{ stdenv, castxml, fetchFromGitHub, buildPythonPackage, +llvmPackages, clang }: +buildPythonPackage rec { + pname = "pygccxml"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "gccxml"; + repo = "pygccxml"; + rev = "v${version}"; + sha256 = "02ip03s0vmp7czzflbvf7qnybibfrd0rzqbc5zfmq3zmpnck3hvm"; + }; + + buildInputs = [ castxml llvmPackages.libcxxStdenv]; + + # running the suite is hard, needs to generate xml_generator.cfg + # but the format doesn't accept -isystem directives + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/gccxml/pygccxml; + description = "Python package for easy C++ declarations navigation"; + license = licenses.boost; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index bed258c1673b..e6ab3512797d 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Python interface to Graphviz graph drawing package"; homepage = https://github.com/pygraphviz/pygraphviz; license = licenses.bsd3; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 90616c09269a..18e477dbd814 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.40"; + version = "0.1.41"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "0rflfak505cgc69594yc9chz5mblqvc2d7bbbfcddzhlhs5qcsq2"; + sha256 = "01j6y2ypi7a8ffnkqd8j8vnpszza2cxqpiqbnk1dwbg9w9pwwq53"; }; # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index c38b71c7f47c..5e053891164e 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.8.2"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "4fe3b99da7e789545327b75548cee6b511e4faa98afe268130fea1af4b5ec022"; + sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 874e0d47fc9e..ea557938d20f 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyobjc"; - version = "4.1"; + version = "4.2.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "287db11f912ac7d05c4907dbf6e74abaa475e36368f7c92e05aca2886a94562c"; + sha256 = "b156abab60da3f3c4bc65a919eabb2c98539a94163a277efba5828358396d23e"; }; meta = { diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index e253e64a41ca..c30d80a00155 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,11 +1,12 @@ { lib, fetchFromGitHub, buildPythonPackage, pillow, six -, tesseract, cuneiform +, tesseract, cuneiform, isPy3k }: buildPythonPackage rec { pname = "pyocr"; version = "0.4.7"; name = pname + "-" + version; + disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 0fab9979aaca..d8d61c56c357 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.22"; + version = "4.0.23"; name = "${pname}-${version}"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "e2d742b42c8b92b10018c51d673fe72d925ab90d4dbaaccd4f209e10e228ba73"; + sha256 = "bb33d032c1f25781db64e2e4fecf77047fab2ddde42a6cd9496e3c66fb8e9f66"; }; buildInputs = [ libiodbc ]; diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix new file mode 100644 index 000000000000..282f9b65cb69 --- /dev/null +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "1.6.0"; + pname = "pyperclip"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce829433a9af640e08ee89b20f7c62132714bcc5d77df114044d0fccb8c3b3b8"; + }; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/asweigart/pyperclip"; + license = licenses.bsdOriginal; + description = "Cross-platform clipboard module"; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 7a59690e5b04..6e2d923f80c4 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.21"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "7afad28ee0a0f3e7c34adaa9f953d00560ed9910203e93f107833b6e8d151171"; + sha256 = "bb02fe5a02fb4e8baad4d7ccf7ba5e748044ee0a1ad7d2fa4927f68f396863c4"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix new file mode 100644 index 000000000000..fb020ba471fc --- /dev/null +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: + +buildPythonPackage rec { + pname = "pytest-catchlog"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; + extension = "zip"; + }; + + buildInputs = [ pytest unzip ]; + checkPhase = "make test"; + + # Requires pytest < 3.1 + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-catchlog/; + description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; + }; +} diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix new file mode 100644 index 000000000000..915884b5dd4a --- /dev/null +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytest_xdist, virtualenv, process-tests, coverage }: + +buildPythonPackage rec { + pname = "pytest-cov"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d"; + }; + + buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; + propagatedBuildInputs = [ coverage ]; + + # xdist related tests fail with the following error + # OSError: [Errno 13] Permission denied: 'py/_code' + doCheck = false; + checkPhase = '' + # allow to find the module helper during the test run + export PYTHONPATH=$PYTHONPATH:$PWD/tests + py.test tests + ''; + + meta = with stdenv.lib; { + description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + homepage = https://github.com/pytest-dev/pytest-cov; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix new file mode 100644 index 000000000000..df700526d1b4 --- /dev/null +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, setuptools-git, pytest, six }: + +buildPythonPackage rec { + pname = "pytest-fixture-config"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08"; + }; + + nativeBuildInputs = [ setuptools-git ]; + + buildInputs = [ pytest ]; + + checkInputs = [ six ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; + homepage = https://github.com/manahl/pytest-plugins; + license = licenses.mit; + maintainers = with maintainers; [ ryansydnor ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index d79f32a67662..b170f480e96e 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,9 +1,8 @@ {lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-flake8"; - version = "0.9.1"; + version = "1.0.0"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -13,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0032l4x2i5qn7ikaaw0kjs9f4ccpas21j564spyxwmx50wnhf5p7"; + sha256 = "01driw4sc6nfi3m3ii7d074pxi3h1h4mbiyad9crg5i1l5jxx5ir"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix new file mode 100644 index 000000000000..83fcdaf1b776 --- /dev/null +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytestpep8, pytest, pyflakes, pytestcache }: + +buildPythonPackage rec { + pname = "pytest-flakes"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "3e880927fd2a77d31715eaab3876196e76d779726c9c24fe32ee5bab23281f82"; + }; + + buildInputs = [ pytestpep8 pytest ]; + propagatedBuildInputs = [ pyflakes pytestcache ]; + + checkPhase = '' + py.test test_flakes.py + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-flakes; + description = "pytest plugin to check source code with pyflakes"; + }; +} diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix new file mode 100644 index 000000000000..c1866f174ea2 --- /dev/null +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytestcache, pytest, isort }: + +buildPythonPackage rec { + pname = "pytest-isort"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe"; + }; + + propagatedBuildInputs = [ pytestcache pytest isort ]; + + # no tests in PyPI tarball, no tags on GitHub + # https://github.com/moccu/pytest-isort/pull/8 + doCheck = false; + + meta = with lib; { + description = "Pytest plugin to perform isort checks (import ordering)"; + homepage = https://github.com/moccu/pytest-isort/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index defbbdbc0c25..88b6a662d471 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0jgr1h1f0m9dl3alxiiw55as28pj2lpihz12gird9z1i3vvdyydq"; + sha256 = "2dd545496af6a0559432b11de79f1fd4fa4a541ae2e01892d5ba6041f85f0994"; }; propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/pytest-pep8/default.nix b/pkgs/development/python-modules/pytest-pep8/default.nix new file mode 100644 index 000000000000..1fcb99574b2a --- /dev/null +++ b/pkgs/development/python-modules/pytest-pep8/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcache, pep8 }: + +buildPythonPackage rec { + pname = "pytest-pep8"; + version = "1.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pytestcache pep8 ]; + + checkPhase = '' + py.test + ''; + + # Fails + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-pep8; + description = "pytest plugin to check PEP8 requirements"; + }; +} diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix new file mode 100644 index 000000000000..bc7d14132003 --- /dev/null +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, py, pytest }: + +buildPythonPackage rec { + pname = "pytest-raisesregexp"; + version = "2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "b54372494fc1f11388b1b9348aeb36b69609699eb8f46e0e010afc733d78236a"; + }; + + buildInputs = [ py pytest ]; + + # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3 + prePatch = '' + sed -i '3i\import io' setup.py + substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," + ''; + + meta = with stdenv.lib; { + description = "Simple pytest plugin to look for regex in Exceptions"; + homepage = https://github.com/Walkman/pytest_raisesregexp; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix new file mode 100644 index 000000000000..c50795a66698 --- /dev/null +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, setuptools-git, pytest-shutil, pytest-fixture-config, psutil +, requests, future }: + +buildPythonPackage rec { + pname = "pytest-server-fixtures"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "21eef04612ed42f73534c45ddbaef8458c800809354a5f5a96a8fde88b2a97e7"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests future ]; + + # RuntimeError: Unable to find a free server number to start Xvfb + doCheck = false; + + meta = with stdenv.lib; { + description = "Extensible server fixures for py.test"; + homepage = "https://github.com/manahl/pytest-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix new file mode 100644 index 000000000000..4fa11dbd7d13 --- /dev/null +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, contextlib2, termcolor }: + +buildPythonPackage rec { + pname = "pytest-shutil"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1"; + }; + + buildInputs = [ cmdline pytest ]; + propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "A goodie-bag of unix shell and environment tools for py.test"; + homepage = https://github.com/manahl/pytest-plugins; + maintainers = with maintainers; [ ryansydnor ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix new file mode 100644 index 000000000000..b639b61ad4d3 --- /dev/null +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "pytest-subtesthack"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; + }; + + buildInputs = [ pytest ]; + + # no upstream test + doCheck = false; + + meta = with stdenv.lib; { + description = "Terrible plugin to set up and tear down fixtures within the test function itself"; + homepage = https://github.com/untitaker/pytest-subtesthack; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix new file mode 100644 index 000000000000..413d090bbcc9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: + +buildPythonPackage rec { + pname = "pytest-virtualenv"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f"; + }; + + buildInputs = [ pytest pytestcov mock cmdline ]; + propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ]; + checkPhase = '' py.test tests/unit ''; + + meta = with stdenv.lib; { + description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; + homepage = https://github.com/manahl/pytest-plugins; + license = licenses.mit; + maintainers = with maintainers; [ ryansydnor ]; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7288ad0332b5..457826f26cbc 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,8 +1,8 @@ { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py -, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools }: buildPythonPackage rec { - version = "3.4.1"; + version = "3.5.0"; pname = "pytest"; preCheck = '' @@ -12,12 +12,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9ddcb879c8cc859d2540204b5399011f842e5e8823674bf429f70ada281b3cc6"; + sha256 = "fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1"; }; checkInputs = [ hypothesis ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy ] + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools ] ++ (stdenv.lib.optional (!isPy3k) funcsigs) ++ (stdenv.lib.optional isPy26 argparse); diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix new file mode 100644 index 000000000000..2875bf88340f --- /dev/null +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, execnet }: + +buildPythonPackage rec { + pname = "pytest-cache"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ execnet ]; + + checkPhase = '' + py.test + ''; + + # Too many failing tests. Are they maintained? + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-cache/; + description = "pytest plugin with mechanisms for caching across test runs"; + }; +} diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 4f15adcd90e5..71b1260a5407 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "4.0"; + version = "4.2"; src = fetchPypi { inherit pname version; - sha256 = "183f3745561b1e00ea51cd97634ba5c540848ab4aa8016a81faba7fb7f33ec76"; + sha256 = "d23f117be39919f00dd91bffeb4f15e031ec797501b717a245e377aee0f577be"; }; buildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix new file mode 100644 index 000000000000..11ade481df5e --- /dev/null +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -0,0 +1,33 @@ +{ lib +, behave +, buildPythonPackage +, fetchPypi +, lxml +, pytest +, pyparsing +, mock +}: + +buildPythonPackage rec { + pname = "python-docx"; + version = "0.8.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "117i84s6fcdsrfckbvznnqgqwhnf1x0523ps16cki8sg9byydv2m"; + }; + + checkInputs = [ behave mock pyparsing pytest ]; + propagatedBuildInputs = [ lxml ]; + + checkPhase = '' + py.test tests + ''; + + meta = { + description = "Create and update Microsoft Word .docx files"; + homepage = https://python-docx.readthedocs.io/en/latest/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.alexchapman ]; + }; +} diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 9d29e109db49..12b6bf929187 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-gnupg"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg"; + sha256 = "0wzvx8y4ii1y1vch28a0m6f2y4px9r7qd8fpimsx6y5z4pfscm2s"; }; propagatedBuildInputs = [ gnupg1 ]; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 8c78cfeacbd4..68b46743d35f 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,29 +1,34 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, future, six, ecdsa, pycryptodome, pytest +, future, six, ecdsa, pycryptodome, pytest, cryptography }: buildPythonPackage rec { pname = "python-jose"; - name = "${pname}-${version}"; - version = "1.3.2"; + version = "2.0.2"; + + # no tests in PyPI tarball src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; - rev = version; - sha256 = "0933pbflv2pvws5m0ksz8y1fqr8m123smmrbr5k9a71nssd502sv"; + # 2.0.2 not tagged on GitHub + # see https://github.com/mpdavis/python-jose/issues/86 + rev = "28cc6719eceb89129eed59c25f7bdac015665bdd"; + sha256 = "03wkq2rszy0rzy5gygsh4s7i6ls8zflgbcvxnflvmh7nis7002fp"; }; - buildInputs = [ pytest ]; - checkPhase = "py.test ."; - patches = [ - # to use pycryptodme instead of pycrypto - ./pycryptodome.patch + checkInputs = [ + pytest + cryptography # optional dependency, but needed in tests ]; + checkPhase = '' + py.test + ''; + propagatedBuildInputs = [ future six ecdsa pycryptodome ]; + meta = with stdenv.lib; { homepage = https://github.com/mpdavis/python-jose; description = "A JOSE implementation in Python"; - platforms = platforms.all; license = licenses.mit; maintainers = [ maintainers.jhhuh ]; }; diff --git a/pkgs/development/python-modules/python-jose/pycryptodome.patch b/pkgs/development/python-modules/python-jose/pycryptodome.patch deleted file mode 100644 index 665ad5980343..000000000000 --- a/pkgs/development/python-modules/python-jose/pycryptodome.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ru python-jose-1.3.2/requirements.txt python-jose-1.3.2.new/requirements.txt ---- python-jose-1.3.2/requirements.txt 2016-09-05 15:13:49.000000000 +0200 -+++ python-jose-1.3.2.new/requirements.txt 2017-03-15 11:35:47.118001810 +0100 -@@ -1,3 +1,3 @@ --pycrypto -+pycryptodome - six - future -diff -ru python-jose-1.3.2/setup.py python-jose-1.3.2.new/setup.py ---- python-jose-1.3.2/setup.py 2016-09-05 15:13:49.000000000 +0200 -+++ python-jose-1.3.2.new/setup.py 2017-03-15 11:37:15.725077184 +0100 -@@ -25,12 +25,8 @@ - - - def get_install_requires(): -- if platform.python_implementation() == 'PyPy': -- crypto_lib = 'pycryptodome >=3.3.1, <3.4.0' -- else: -- crypto_lib = 'pycrypto >=2.6.0, <2.7.0' - return [ -- crypto_lib, -+ 'pycryptodome >=3.3.1, <3.5.0', - 'six <2.0', - 'ecdsa <1.0', - 'future <1.0', -diff -ru python-jose-1.3.2/tox.ini python-jose-1.3.2.new/tox.ini ---- python-jose-1.3.2/tox.ini 2016-09-05 15:13:49.000000000 +0200 -+++ python-jose-1.3.2.new/tox.ini 2017-03-15 11:36:50.423055657 +0100 -@@ -6,7 +6,7 @@ - py.test --cov-report term-missing --cov jose - deps = - future -- pycrypto -+ pycryptodome - ecdsa - pytest - pytest-cov diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix new file mode 100644 index 000000000000..4c1bd05f4a0f --- /dev/null +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, stdenv }: + +buildPythonPackage rec { + pname = "python-ly"; + version = "0.9.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x98dv7p8mg26p4816yy8hz4f34zf6hpnnfmr56msgh9jnsm2qfl"; + }; + + # tests not shipped on `pypi` and + # seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70 + doCheck = false; + + meta = with stdenv.lib; { + description = "Tool and library for manipulating LilyPond files"; + license = licenses.gpl2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 03c37f7a6c45..c0a398a3399d 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-slugify"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp"; + sha256 = "5dbb360b882b2dabe0471a1a92f604504d83c2a73c71f2098d004ab62e695534"; }; doCheck = !isPy3k; # (only) on python3 unittest loader (loadTestsFromModule) fails diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix new file mode 100644 index 000000000000..d5cf709104fc --- /dev/null +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, pkgconfig +, systemd, libyaml, openzwave, cython +, six, pydispatcher, urwid }: + +buildPythonPackage rec { + pname = "python_openzwave"; + version = "0.4.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "17wdgwg212agj1gxb2kih4cvhjb5bprir4x446s8qwx0mz03azk2"; + extension = "zip"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd libyaml openzwave cython ]; + propagatedBuildInputs = [ six urwid pydispatcher ]; + + # primary location for the .xml files is in /etc/openzwave so we override the + # /usr/local/etc lookup instead as that allows us to dump new .xml files into + # /etc/openzwave if needed + postPatch = '' + substituteInPlace src-lib/libopenzwave/libopenzwave.pyx \ + --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave + ''; + + # no tests available + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper for the OpenZWave C++ library"; + homepage = https://github.com/OpenZWave/python-openzwave; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu ]; + inherit (openzwave.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 1fba3303e3fe..a34924374819 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.1"; + version = "2018.3"; src = fetchPypi { inherit pname version; - sha256 = "0063b87285cb1172e3602a996bfd7342bf407361cf67b562cb6d806f70422e71"; + sha256 = "26143e4ce415919272a5a8d05727bf5e026faa6536fe0ba85302e5b88ebae9f5"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix new file mode 100644 index 000000000000..26107ea3c4af --- /dev/null +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, tornado +, zeromq3 +, py +, python +}: + +buildPythonPackage rec { + pname = "pyzmq"; + version = "17.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0145ae59139b41f65e047a3a9ed11bbc36e37d5e96c64382fcdff911c4d8c3f0"; + }; + + checkInputs = [ pytest tornado ]; + buildInputs = [ zeromq3]; + propagatedBuildInputs = [ py ]; + + # test_socket.py seems to be hanging + # others fail + checkPhase = '' + py.test $out/${python.sitePackages}/zmq/ -k "not test_socket \ + and not test_current \ + and not test_instance \ + and not test_callable_check \ + and not test_on_recv_basic \ + and not test_on_recv_wake" + ''; +} diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 035ea32b3989..d1aa4f096fe6 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "04skhjb2dbbhvpq0x71nnz2h68805fkxfpkdjhwvd7lzsljjbbq8"; + sha256 = "8e78e7ce28015c1041be68b90f43048c9815e8c89d3362f8073feecdc70eafba"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 33d199ad274a..2052d4421e5e 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "raven"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "raven-python"; rev = version; - sha256 = "184wpr0zdcm260pxqll9kpmp2ywisn75k8pdm8gc6xmk740in1hj"; + sha256 = "0vb6zczfgrrh0qw5wlbvk703r11y091k6r53fbbhpbwh4hva30nx"; }; # way too many dependencies to run tests diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index d99829194939..aa3928db8911 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -2,26 +2,28 @@ , buildPythonPackage , fetchPypi , pytest -, CommonMark +, mock +, cmarkgfm , bleach , docutils +, future , pygments , six }: buildPythonPackage rec { pname = "readme_renderer"; - version = "17.4"; + version = "18.1"; src = fetchPypi { inherit pname version; - sha256 = "82d68175feec897af2a38fe8590778f14c3be5324cc62e3ce5752a9b1e4b60ab"; + sha256 = "e18cab7f1b07412990df1b59e1be04e1538f514a5bba53ec8777bfc5aac27563"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ - CommonMark bleach docutils pygments six + bleach cmarkgfm docutils future pygments six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix new file mode 100644 index 000000000000..c8886b75d644 --- /dev/null +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, requests, six, urllib3 }: + +buildPythonPackage rec { + pname = "requests-cache"; + version = "0.4.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ requests six urllib3 ]; + + meta = with stdenv.lib; { + description = "Persistent cache for requests library"; + homepage = https://pypi.python.org/pypi/requests-cache; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix new file mode 100644 index 000000000000..ef87c4f10195 --- /dev/null +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, python +, mock, testrepository, testtools +, requests, six }: + +buildPythonPackage rec { + pname = "requests-mock"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b"; + }; + + patchPhase = '' + sed -i 's@python@${python.interpreter}@' .testr.conf + ''; + + checkInputs = [ mock testrepository testtools ]; + + propagatedBuildInputs = [ requests six ]; +} diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index e7834e62b829..809c8d3c96df 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; - maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with lib.maintainers; [ jgeerds ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix new file mode 100644 index 000000000000..4cc74431fc85 --- /dev/null +++ b/pkgs/development/python-modules/responses/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi +, cookies, mock, requests, six }: + +buildPythonPackage rec { + pname = "responses"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c6082710f4abfb60793899ca5f21e7ceb25aabf321560cc0726f8b59006811c9"; + }; + + propagatedBuildInputs = [ cookies mock requests six ]; + + doCheck = false; +} diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix new file mode 100644 index 000000000000..6443a4e2bbfe --- /dev/null +++ b/pkgs/development/python-modules/rlp/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "rlp"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; + }; + + buildInputs = [ pytest ]; + + meta = { + description = "A package for encoding and decoding data in and from Recursive Length Prefix notation"; + homepage = "https://github.com/ethereum/pyrlp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 22f351211191..be3316cf697e 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "3.0.2"; + version = "3.0.3"; pname = "robotframework"; disabled = isPy3k; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/r/robotframework/${name}.tar.gz"; - sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; + sha256 = "a5ffe9283c9247c3a1e81228fcc009819d8f94b48768170268a3e6274a998bca"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index 008bafae9d75..105119522287 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose }: buildPythonPackage rec { pname = "root_numpy"; @@ -11,6 +11,11 @@ buildPythonPackage rec { }; disabled = isPy3k; # blocked by #27649 + checkInputs = [ nose ]; + checkPhase = '' + python setup.py install_lib -d . + nosetests -s -v root_numpy + ''; propagatedBuildInputs = [ numpy root ]; diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix index 0827786acfcd..e9061b0a6a33 100644 --- a/pkgs/development/python-modules/rootpy/default.nix +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables, pytest }: buildPythonPackage rec { pname = "rootpy"; @@ -14,6 +14,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ]; + checkInputs = [ pytest ]; + checkPhase = '' + # tests fail with /homeless-shelter + export HOME=$PWD + # skip problematic tests + py.test rootpy -k "not test_stl and not test_cpp and not test_xrootd_glob_single and not test_xrootd_glob_multiple" + ''; + meta = with lib; { homepage = http://www.rootpy.org; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix new file mode 100644 index 000000000000..8db7ae3b3372 --- /dev/null +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, readline +, R +, pcre +, lzma +, bzip2 +, zlib +, icu +, singledispatch +, six +, jinja2 +, pytest +}: + +buildPythonPackage rec { + version = "2.8.2"; + pname = "rpy2"; + disabled = isPyPy; + src = fetchPypi { + inherit version pname; + sha256 = "0k5jp6n1lfab7a6r5568aq31hg4fgf2cwy0hzvf3chp6yhyk26ic"; + }; + buildInputs = [ + readline + R + pcre + lzma + bzip2 + zlib + icu + ]; + propagatedBuildInputs = [ + singledispatch + six + jinja2 + ]; + checkInputs = [ pytest ]; + # Tests fail with `assert not _relpath.startswith('..'), "Path must be within the project"` + # in the unittest `loader.py`. I don't know what causes this. + doCheck = false; + # without this tests fail when looking for libreadline.so + LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs; + + meta = { + homepage = http://rpy.sourceforge.net/rpy2; + description = "Python interface to R"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ joelmo ]; + }; + } diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix new file mode 100644 index 000000000000..956a96f14046 --- /dev/null +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3 }: + +buildPythonPackage rec { + pname = "s3fs"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "f19b2e81cfcf6f2849fa8195c366c6e81d2378400bab0611f461c4e55d4f6bed"; + }; + + buildInputs = [ docutils ]; + propagatedBuildInputs = [ boto3 ]; + + # Depends on `moto` which has a long dependency chain with exact + # version requirements that can't be made to work with current + # pythonPackages. + doCheck = false; + + meta = with stdenv.lib; { + description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; + homepage = http://github.com/dask/s3fs/; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix new file mode 100644 index 000000000000..d33de9c2a73a --- /dev/null +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -0,0 +1,24 @@ +{lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}: + +buildPythonPackage rec { + pname = "sasmodels"; + version = "0.96"; + + buildInputs = [pytest]; + propagatedBuildInputs = [docutils matplotlib numpy scipy]; + + preCheck = ''export HOME=$(mktemp -d)''; + + src = fetchgit { + url = "https://github.com/SasView/sasmodels.git"; + rev = "v${version}"; + sha256 = "11qaaqdc23qzb75zs48fkypksmcb332vl0pkjqr5bijxxymgm7nw"; + }; + + meta = { + description = "Library of small angle scattering models"; + homepage = http://sasview.org; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 1f4a34d18a38..c24592ef9650 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -1,30 +1,35 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, isPyPy +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k, pythonOlder , matplotlib, pycrypto, ecdsa -# Python3: pyx +, enum34, mock }: buildPythonPackage rec { pname = "scapy"; - version = "2.3.3"; - name = pname + "-" + version; + version = "2.4.0"; - disabled = isPy3k || isPyPy; + disabled = isPyPy; src = fetchFromGitHub { owner = "secdev"; repo = "scapy"; rev = "v${version}"; - sha256 = "1c22407vhksnhc0rwrslnp9zy05qmk2zmdm2imm3iw7g6kx7gak1"; + sha256 = "0dw6kl1qi9bf3rbm79gb1h40ms8y0b5dbmpip841p2905d5r2isj"; }; - # Temporary workaround, only needed for 2.3.3 + # TODO: Temporary workaround patches = [ ./fix-version-1.patch ./fix-version-2.patch ]; - propagatedBuildInputs = [ matplotlib pycrypto ecdsa ]; + propagatedBuildInputs = + [ matplotlib pycrypto ecdsa ] + ++ lib.optional (isPy3k && pythonOlder "3.4") [ enum34 ] + ++ lib.optional doCheck [ mock ]; + + # Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate) + doCheck = if isPy3k then false else true; meta = with stdenv.lib; { description = "Powerful interactive network packet manipulation program"; - homepage = http://www.secdev.org/projects/scapy/; + homepage = https://scapy.net/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ primeos bjornfor ]; diff --git a/pkgs/development/python-modules/scapy/fix-version-1.patch b/pkgs/development/python-modules/scapy/fix-version-1.patch index 3864a41964e2..33d099e7a648 100644 --- a/pkgs/development/python-modules/scapy/fix-version-1.patch +++ b/pkgs/development/python-modules/scapy/fix-version-1.patch @@ -1,11 +1,11 @@ --- a/setup.py 2018-02-15 22:14:08.531591678 +0100 -+++ b/setup.py 2018-02-15 22:14:57.947703737 +0100 ++++ b/setup.py 2018-03-27 17:15:38.617315539 +0200 @@ -47,7 +47,7 @@ setup( name='scapy', - version=__import__('scapy').VERSION, -+ version='2.3.3', ++ version='2.4.0', packages=[ 'scapy', 'scapy/arch', diff --git a/pkgs/development/python-modules/scapy/fix-version-2.patch b/pkgs/development/python-modules/scapy/fix-version-2.patch index 62d43b51fbb9..41a195fb722f 100644 --- a/pkgs/development/python-modules/scapy/fix-version-2.patch +++ b/pkgs/development/python-modules/scapy/fix-version-2.patch @@ -1,11 +1,15 @@ ---- a/scapy/__init__.py 2017-12-29 18:57:35.315472160 +0100 -+++ b/scapy/__init__.py 2018-02-15 22:36:43.102132489 +0100 -@@ -73,7 +73,7 @@ - tag = f.read() - return tag - except: -- return 'unknown.version' -+ return '2.3.3' +--- a/scapy/__init__.py 2018-03-27 17:38:52.706481269 +0200 ++++ b/scapy/__init__.py 2018-03-27 17:39:56.576688890 +0200 +@@ -82,9 +82,10 @@ + if match: + return "git-archive.dev" + match.group(1) + elif sha1: +- return "git-archive.dev" + sha1 ++ return '2.4.0' + else: +- return 'unknown.version' ++ return '2.4.0' ++ VERSION = _version() diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index df2e569076a2..9adac49bdcc8 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,13 +1,12 @@ -{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; - version = "1.0.0"; - name = "${pname}-${version}"; + version = "1.0.1"; - src = fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10"; + src = fetchPypi { + inherit pname version; + sha256 = "8739c67842ed9a1c34c62d6cca6301d0ade40d50ef14ba292bd331f0d6c940ba"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 7ea0705f8154..35115a45716e 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytest , configparser +, isPy3k }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; checkPhase = "HOME=. py.test"; - checkInputs = [ pytest configparser ]; + checkInputs = [ pytest ] ++ lib.optional (!isPy3k) configparser; meta = with lib; { description = "Send file to trash natively under macOS, Windows and Linux"; diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 40a580877af5..1d9274610dad 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -35,4 +35,8 @@ buildPythonPackage rec { pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; + + meta = { + broken = true; # 2018-11-04 + }; } diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index 779e974f15e3..93e172a4f606 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -13,8 +13,6 @@ buildPythonPackage rec { pname = "service_identity"; version = "17.0.0"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "pyca"; @@ -33,6 +31,6 @@ buildPythonPackage rec { meta = with lib; { description = "Service identity verification for pyOpenSSL"; license = licenses.mit; - homepage = "https://service-identity.readthedocs.io"; + homepage = https://service-identity.readthedocs.io; }; } diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index cd07a64ae49b..972d8e90bf63 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "38.4.1"; + version = "39.0.1"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3b5f74bd33b046a121f052632f248b580f5e83848bb4cebda9e38741a445a969"; + sha256 = "bec7badf0f60e7fc8153fac47836edc41b74e5d541d7692e614e635720d6a7c7"; }; nativeBuildInputs = [ unzip wrapPython ]; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index 260f899f56d8..3e78c9b45bf6 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "setuptools_scm"; name = "${pname}-${version}"; - version = "1.15.6"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9"; + sha256 = "70a4cf5584e966ae92f54a764e6437af992ba42ac4bca7eb37cc5d02b98ec40a"; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 2e2020f61f09..c4992eb9d9bb 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -3,7 +3,9 @@ , isPy3k , fetchPypi , boto +, boto3 , bz2file +, mock , moto , requests , responses @@ -12,14 +14,26 @@ buildPythonPackage rec { pname = "smart_open"; name = "${pname}-${version}"; - version = "1.5.6"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "8fd2de1c359bd0074bd6d334a5b9820ae1c5b6ba563970b95052bace4b71baeb"; + sha256 = "0y1c29pdxxgxkymr7g2n59siqqaq351zbx9vz8433dxvzy4qgd7p"; }; - propagatedBuildInputs = [ boto bz2file requests responses moto ]; + # nixpkgs version of moto is >=1.2.0, remove version pin to fix build + postPatch = '' + substituteInPlace ./setup.py --replace "moto==0.4.31" "moto" + ''; + + # moto>=1.0.0 is backwards-incompatible and some tests fail with it, + # so disable tests for now + doCheck = false; + + checkInputs = [ mock moto responses ]; + + # upstream code requires both boto and boto3 + propagatedBuildInputs = [ boto boto3 bz2file requests ]; meta = { license = lib.licenses.mit; description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file"; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index b94374aeda86..16c1841a3d62 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib , pkgs , buildPythonPackage , python , fetchPypi +, pythonOlder , html5lib , pytest -, cython , preshed , ftfy , numpy @@ -16,8 +16,11 @@ , dill , requests , thinc -, pip , regex +, cymem +, pathlib +, msgpack-python +, msgpack-numpy }: buildPythonPackage rec { @@ -30,38 +33,32 @@ buildPythonPackage rec { }; prePatch = '' - substituteInPlace setup.py --replace \ - "'html5lib==1.0b8'," \ - "'html5lib'," - - substituteInPlace setup.py --replace \ - "'regex==2017.4.5'," \ - "'regex'," - - substituteInPlace setup.py --replace \ - "'ftfy==2017.4.5'," \ - "'ftfy'," - - substituteInPlace setup.py --replace \ - "'pathlib'," \ - "\"pathlib; python_version<'3.4'\"," + substituteInPlace setup.py \ + --replace "html5lib==" "html5lib>=" \ + --replace "regex==" "regex>=" \ + --replace "ftfy==" "ftfy>=" \ + --replace "msgpack-python==" "msgpack-python>=" \ + --replace "msgpack-numpy==" "msgpack-numpy>=" \ + --replace "pathlib" "pathlib; python_version<\"3.4\"" ''; propagatedBuildInputs = [ - cython - dill - html5lib - murmurhash numpy - plac + murmurhash + cymem preshed - regex - requests - six thinc + plac + six + html5lib ujson + dill + requests + regex ftfy - ]; + msgpack-python + msgpack-numpy + ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ pytest @@ -72,7 +69,7 @@ buildPythonPackage rec { # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow # ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = https://github.com/explosion/spaCy; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index fb37279ea847..a87362dfc3c0 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "da987de5fcca21a4acc7f67a86a363039e67ac3e8827161e61b91deb131c0ee8"; + sha256 = "5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 00ea37e3adae..6ac6fe21e4d2 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.2.4"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "6997507af46b10630e13b605ac278b78885fd683d038896dbee0e7ec41d809d2"; + sha256 = "7cb00cc9b9f92ef8b4391c8a2051f81eeafefe32d63c6b395fd51401e9a39edb"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 5d5e6d4bfd2b..d5c89aefef7c 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.3"; + version = "1.2.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0db9d1dd2e9624befff25f7e1a356f32366e4f05fd7e1a1783499816416ae28e"; + sha256 = "cb70fdedd8dc0a30cf361d8e5401a5b07fc75c13847b13567b98966be4e3d063"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 31fd0977c144..6930cb2a559f 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "86332553392f865403883e44695bd8d9d47fe3887c01e17591955237b8fd2d8f"; + sha256 = "1e17e10bac4c56ef5b6752866a7d100f5ae856ff97d805c4d6cac73be80863d3"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix new file mode 100644 index 000000000000..37091da1b499 --- /dev/null +++ b/pkgs/development/python-modules/tblib/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "tblib"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7"; + }; + + meta = with stdenv.lib; { + description = "Traceback fiddling library. Allows you to pickle tracebacks."; + homepage = https://github.com/ionelmc/python-tblib; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix new file mode 100644 index 000000000000..c9b89ff7616a --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchurl +, buildPythonPackage +, isPy3k, isPy36, pythonOlder +, numpy +, six +, protobuf +, absl-py +, mock +, backports_weakref +, enum34 +, tensorflow-tensorboard +, cudaSupport ? false +}: + +# tensorflow is built from a downloaded wheel because the source +# build doesn't yet work on Darwin. + +buildPythonPackage rec { + pname = "tensorflow"; + version = "1.5.0"; + format = "wheel"; + + src = fetchurl { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py3-none-any.whl"; + sha256 = "1mapv45n9wmgcq3i3im0pv0gmhwkxw5z69nsnxb1gfxbj1mz5h9m"; + }; + + propagatedBuildInputs = [ numpy six protobuf absl-py ] + ++ lib.optional (!isPy3k) mock + ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ] + ++ lib.optional (pythonOlder "3.6") tensorflow-tensorboard; + + # tensorflow depends on tensorflow_tensorboard, which cannot be + # built at the moment (some of its dependencies do not build + # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of + # bleach) Hence we disable dependency checking for now. + installFlags = lib.optional isPy36 "--no-dependencies"; + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = platforms.darwin; + # Python 2.7 build uses different string encoding. + # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253 + broken = cudaSupport || !isPy3k; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 85dd30118cc3..8d2d6fa9c14c 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -149,7 +149,7 @@ in buildPythonPackage rec { homepage = http://tensorflow.org; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; - platforms = with platforms; if cudaSupport then linux else linux ++ darwin; + platforms = platforms.linux; broken = !(xlaSupport -> cudaSupport); }; } diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 933b4be1caf3..55631f291c74 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "5.4.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "338aed9695c432b7c9b8a271dabb521e3e7e2c96b11f7b4e60552f1c8408a8f0"; + sha256 = "f6c4cf24d043f9d8e9a9337371ec1d2f6638a0032504bd67dbd724224fd64969"; }; checkInputs = [ mock manuel pytest sybil zope_component ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 2c6df953e169..62e0d28959a2 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,13 +28,18 @@ buildPythonPackage rec { pname = "thinc"; version = "6.10.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "msgpack-python==" "msgpack-python>=" \ + --replace "msgpack-numpy==" "msgpack-numpy>=" + ''; + propagatedBuildInputs = [ cython cymem diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix new file mode 100644 index 000000000000..6d0ee30bbb48 --- /dev/null +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, webencodings, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: + +buildPythonPackage rec { + pname = "tinycss2"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c53c2c0e914c7711c295b3101bcc78e0b7eda23ff20228a936efe11cdcc7136"; + }; + + propagatedBuildInputs = [ webencodings ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "Low-level CSS parser for Python"; + homepage = https://github.com/Kozea/tinycss2; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index 7bf21b025219..6161b0492be6 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tiros"; name = "${pname}-${version}"; - version = "1.0.42"; + version = "1.0.44"; src = fetchPypi { inherit pname version; - sha256 = "d0f9bc6d463654c971a78e02a3159ec62a2db684a217a7e940e66d4a381bdd52"; + sha256 = "d6bf7410967554ec283f9d4eabc0ce6821d6e6d36001afbdb7fe0826423d4f37"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix new file mode 100644 index 000000000000..a80657dc4b45 --- /dev/null +++ b/pkgs/development/python-modules/toml/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "toml"; + version = "0.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf"; + }; + + # This package has a test script (built for Travis) that involves a) + # looking in the home directory for a binary test runner and b) using + # git to download a test suite. + doCheck = false; + + meta = with stdenv.lib; { + description = "a Python library for parsing and creating TOML"; + homepage = "https://github.com/uiri/toml"; + license = licenses.mit; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index ec431a6e85b3..37b1c7bcf5cb 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -7,15 +7,17 @@ , certifi , singledispatch , pythonOlder +, futures }: buildPythonPackage rec { pname = "tornado"; - version = "4.5.3"; - name = "${pname}-${version}"; + version = "5.0.2"; + propagatedBuildInputs = [ backports_abc certifi singledispatch ] - ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname; + ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname + ++ lib.optional (pythonOlder "3.2") futures; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -25,6 +27,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a"; + sha256 = "1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7"; + }; + + meta = { + description = "A web framework and asynchronous networking library"; + homepage = http://www.tornadoweb.org/; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index bc70d65cc1f8..359f13e2a00b 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tox"; - version = "2.9.1"; + version = "3.0.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ py virtualenv pluggy six ]; @@ -19,6 +19,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8"; + sha256 = "96efa09710a3daeeb845561ebbe1497641d9cef2ee0aea30db6969058b2bda2f"; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 44943cdababd..23ad1bc2624d 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.19.6"; + version = "4.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5ec0d4442358e55cdb4a0471d04c6c831518fd8837f259db5537d90feab380df"; + sha256 = "b94af236084ceaad93a6ada00bd9976900b172ec9b821828ed0d4b53f7431170"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 34c221324283..afb35b579731 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "transaction"; - version = "2.1.2"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r"; + sha256 = "f2242070e437e5d555ea3df809cb517860513254c828f33847df1c5e4b776c7a"; }; propagatedBuildInputs = [ zope_interface mock ]; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 16fc8530a0da..3a6b5f62e4f5 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,18 +1,18 @@ { lib, fetchPypi, buildPythonPackage, - protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1 + protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "trezor"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "2dd01e11d669cb8f5e40fcf1748bcabc41fb5f41edb010fc807dc3088f9bd7de"; + sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; }; - propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 ]; + propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; # There are no actual tests: "ImportError: No module named tests" doCheck = false; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index b4662c640a35..4abd97d24362 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,27 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "txaio"; - version = "2.8.2"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571"; + sha256 = "dfc3a7d04b4b484ae5ff241affab5bb01306b1e950dd6f54fd036cfca94345d0"; }; - buildInputs = [ pytest mock ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ six twisted ]; - patchPhase = '' - sed -i '152d' test/test_logging.py - ''; - - # test_chained_callback has been removed just post-2.7.1 because the functionality was decided against and the test - # breaks on python 3.6 https://github.com/crossbario/txaio/pull/104 checkPhase = '' - py.test -k "not (test_sdist or test_chained_callback)" + py.test -k "not test_sdist" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index bab0bc288502..cbb3f9bfa8f8 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.4.1"; + version = "2.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "2f31fc1b6dd8632c230ea7012470e40f77119f20999274dda6f1afa9c305e590"; + sha256 = "7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix new file mode 100644 index 000000000000..129ad0ded6c7 --- /dev/null +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -0,0 +1,23 @@ +{lib, fetchPypi, buildPythonPackage, six}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "unittest-xml-reporting"; + version = "2.1.1"; + + propagatedBuildInputs = [six]; + + # The tarball from Pypi doesn't actually contain the unit tests + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6"; + }; + meta = with lib; { + homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; + description = "A unittest runner that can save test results to XML files"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix new file mode 100644 index 000000000000..c469fd8dd1cc --- /dev/null +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, simplejson, pytest, glibcLocales }: + +buildPythonPackage rec { + pname = "uritemplate"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d"; + }; + + propagatedBuildInputs = [ simplejson ]; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.UTF-8 py.test + ''; + + meta = with lib; { + homepage = https://github.com/python-hyper/uritemplate; + description = "URI template parsing for Humans"; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index df0c83605f75..ffb2bb761900 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "15.1.0"; + version = "15.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a"; + sha256 = "1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix new file mode 100644 index 000000000000..8d52f65d498e --- /dev/null +++ b/pkgs/development/python-modules/vobject/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: + +buildPythonPackage rec { + version = "0.9.5"; + pname = "vobject"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; + }; + + disabled = isPyPy; + + propagatedBuildInputs = [ dateutil ]; + + checkPhase = "${python.interpreter} tests.py"; + + meta = with lib; { + description = "Module for reading vCard and vCalendar files"; + homepage = http://eventable.github.io/vobject/; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index f2b5e06baaa2..589f8de99ee5 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { pname = "vowpalwabbit"; name = "${pname}-${version}"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl{ url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "abd22bfae99fb102cf8a6aec49e8c278cb7317d3a7eb60f70cd102be9c336fd5"; + sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304"; }; # vw tries to write some explicit things to home # python installed: The directory '/homeless-shelter/.cache/pip/http' diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix new file mode 100644 index 000000000000..7bae1e9860be --- /dev/null +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, nose }: + +buildPythonPackage rec { + pname = "python-vxi11"; + version = "0.9"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "python-ivi"; + repo = pname; + rev = "v${version}"; + sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; + }; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + description = "VXI-11 driver for controlling instruments over Ethernet"; + homepage = https://github.com/python-ivi/python-vxi11; + license = licenses.mit; + maintainers = with maintainers; [ bgamari ]; + }; +} diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index d4a47138d4ab..b5c9e14da355 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,14 +1,27 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: buildPythonPackage rec { pname = "wakeonlan"; - version = "1.0.0"; + version = "1.1.6"; src = fetchPypi { inherit pname version; - sha256 = "1snkyc6ph0bnypqs5yjw35mx3f9ij4808r5i06gl2vhn1rfzgyh1"; + sha256 = "5e6013a17004809e676c150689abd94bcc0f12a37ad3fbce1f6270968f95ffa9"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools-scm ~= 1.15.7" "setuptools-scm" + ''; + + checkInputs = [ pytest mock ]; + + nativeBuildInputs = [ setuptools_scm ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "A small python module for wake on lan"; homepage = https://github.com/remcohaszing/pywakeonlan; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix new file mode 100644 index 000000000000..ac83430fbae2 --- /dev/null +++ b/pkgs/development/python-modules/warrant/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi +, mock +, boto3, envs, python-jose, requests }: + +buildPythonPackage rec { + pname = "warrant"; + version = "0.6.1"; + + # move to fetchPyPi when https://github.com/capless/warrant/issues/97 is fixed + src = fetchFromGitHub { + owner = "capless"; + repo = "warrant"; + rev = "ff2e4793d8479e770f2461ef7cbc0c15ee784395"; + sha256 = "0gw3crg64p1zx3k5js0wh0x5bldgs7viy4g8hld9xbka8q0374hi"; + }; + + # this needs to go when 0.6.2 or later is released + postPatch = '' + substituteInPlace requirements.txt \ + --replace "python-jose-cryptodome>=1.3.2" "python-jose>=2.0.0" + ''; + + checkInputs = [ mock ]; + + propagatedBuildInputs = [ boto3 envs python-jose requests ]; + + # all the checks are failing + doCheck = false; + + meta = with lib; { + description = "Python library for using AWS Cognito with support for SRP"; + homepage = https://github.com/capless/warrant; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index b71e4d3a4fff..a4b1b9c467a4 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = stdenv.lib.licenses.agpl3; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index c77d8a3859ed..6db21baf7509 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.30.0"; + version = "0.31.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9515fe0a94e823fd90b08d22de45d7bde57c90edce705b22f5e1ecf7e1b653c8"; + sha256 = "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce"; }; checkInputs = [ pytest pytestcov coverage ]; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix new file mode 100644 index 000000000000..89be87e18491 --- /dev/null +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "whichcraft"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + homepage = https://github.com/pydanny/whichcraft; + description = "Cross-platform cross-python shutil.which functionality"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 3228e928e193..2e21ead19e09 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.1.4"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "79f164a644620abbe351440a70468ac3a5b22b392afa4577c8d5f91577a2669b"; + sha256 = "9b584b9210dadc98f1fae384fff5f4db047df0b94a81b2388c7b0b14a99c3f32"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix new file mode 100644 index 000000000000..9de1fd5b3922 --- /dev/null +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, regex +, langcodes +, ftfy +, msgpack +, mecab-python3 +, jieba +, nose +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "wordfreq"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "LuminosoInsight"; + repo = "wordfreq"; + rev = "e3a1b470d9f8e0d82e9f179ffc41abba434b823b"; + sha256 = "1wjkhhj7nxfnrghwvmvwc672s30lp4b7yr98gxdxgqcq6wdshxwv"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + # These languages require additional dictionaries + nosetests -e test_japanese -e test_korean -e test_languages + ''; + + propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; + + # patch to relax version requirements for regex + # dependency to prevent break in upgrade + postPatch = '' + substituteInPlace setup.py --replace "regex ==" "regex >=" + ''; + + disabled = pythonOlder "3"; + + meta = with lib; { + description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; + homepage = https://github.com/LuminosoInsight/wordfreq/; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 5e65940e8468..f5a83a7bc029 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ws4py"; - version = "0.4.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "ee12b58384bab8bfdcd1c76dcd6852047aec163af17175fc0f73e255d107dd7a"; + sha256 = "29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483"; }; checkInputs = [ pytest mock git ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 0cf38e80d2d0..1d18b5830aaf 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.10.1"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "cc183c2d7b1788cdaeb895102b1b6c2b6a3544182ff714e92f404c29db93cc9d"; + sha256 = "dd5af05cc9ddd5713016ec1a7f0d481daf2f0bb4d4e0bd66790503f6412bbc59"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 9b136531a4b9..0f4c081e6260 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.1"; + version = "0.6.0"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "09gbnmr5vn58mm8xi3fmd7fz6743cks6c46dphnxzwax6zsxmy60"; + sha256 = "36142cb72535933e8e1ed39ff2c45559fa7038823bd6be6961ef8ee5bb0f6912"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index d257db704451..c1914a034586 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.20.2"; + version = "0.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7f5efdb7edf0318b91e53721d934580a77153e24a222f52f6e1c3b7629aead43"; + sha256 = "7d8ae3567f3fb2d288f127d35e4decb3348c96cd091001e02e818465da618f90"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 958fcd72f84a..6e05b6ced043 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; homepage = https://github.com/cakebread/yolk; - maintainer = with maintainers; []; + maintainers = with maintainers; []; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix new file mode 100644 index 000000000000..bfc5caea4d07 --- /dev/null +++ b/pkgs/development/python-modules/zict/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, heapdict }: + +buildPythonPackage rec { + pname = "zict"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "63377f063086fc92e5c16e4d02162c571f6470b9e796cf3411ef9e815c96b799"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ heapdict ]; + + meta = with stdenv.lib; { + description = "Mutable mapping tools."; + homepage = https://github.com/dask/zict; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix index 0915eb002b79..2929afed1cd3 100644 --- a/pkgs/development/python-modules/zipfile36/default.nix +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; homepage = https://gitlab.com/takluyver/zipfile36; license = lib.licenses.psfl; - maintainer = lib.maintainers.fridh; + maintainers = lib.maintainers.fridh; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index f704f3052781..25ab7dcd31ad 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.3.0"; + version = "5.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; + sha256 = "0b306042f4f0d558a477d65c34b0dd6e7604c6e583f55dfda52befa2fa13e076"; }; patches = [ diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 49ff6e505f41..633270b9480f 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.16"; + version = "4.4.22"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "63cc481bfb8950c43d4a87926be22cf8c4bb281ef7f818a8ef2d30b55a97c3e0"; + sha256 = "402d4222dc9994baed66a19a1cf5cb5c3fafd065f9cabc4cf7d5a2915e980979"; }; # No tests in archive diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index c8f02bd14780..e6fd09d76471 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -1,120 +1 @@ -R packages -========== - -## Installation - -Define an environment for R that contains all the libraries that you'd like to -use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: - -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - - rEnv = super.rWrapper.override { - packages = with self.rPackages; [ - devtools - ggplot2 - reshape2 - yaml - optparse - ]; - }; - }; -} -``` - -Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user -profile. The set of available libraries can be discovered by running the -command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that -output is the name that has to be passed to rWrapper in the code snipped above. - -However, if you'd like to add a file to your project source to make the -environment available for other contributors, you can create a `default.nix` -file like so: -```nix -let - pkgs = import <nixpkgs> {}; - stdenv = pkgs.stdenv; -in with pkgs; { - myProject = stdenv.mkDerivation { - name = "myProject"; - version = "1"; - src = if pkgs.lib.inNixShell then null else nix; - - buildInputs = with rPackages; [ - R - ggplot2 - knitr - ]; - }; -} -``` -and then run `nix-shell .` to be dropped into a shell with those packages -available. - -## RStudio - -RStudio uses a standard set of packages and ignores any custom R -environments or installed packages you may have. To create a custom -environment, see `rstudioWrapper`, which functions similarly to -`rWrapper`: - -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - - rstudioEnv = super.rstudioWrapper.override { - packages = with self.rPackages; [ - dplyr - ggplot2 - reshape2 - ]; - }; - }; -} -``` - -Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install -this into your user profile. - -Alternatively, you can create a self-contained `shell.nix` without the need to -modify any configuration files: - -```nix -{ pkgs ? import <nixpkgs> {} -}: - -pkgs.rstudioWrapper.override { - packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; -} - -``` - -Executing `nix-shell` will then drop you into an environment equivalent to the -one above. If you need additional packages just add them to the list and -re-enter the shell. - -## Updating the package set - -```bash -nix-shell generate-shell.nix - -Rscript generate-r-packages.R cran > cran-packages.nix.new -mv cran-packages.nix.new cran-packages.nix - -Rscript generate-r-packages.R bioc > bioc-packages.nix.new -mv bioc-packages.nix.new bioc-packages.nix -``` - -`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefor the renaming. - - -## Testing if the Nix-expression could be evaluated - -```bash -nix-build test-evaluation.nix --dry-run -``` - -If this exits fine, the expression is ok. If not, you have to edit `default.nix` +Moved to [/doc/languages-frameworks/r.section.md](/doc/languages-frameworks/r.section.md) diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index ff6c3ad1b903..0d731de33f84 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -3,9 +3,9 @@ { name, buildInputs ? [], ... } @ attrs: stdenv.mkDerivation ({ - buildInputs = buildInputs ++ [R] ++ + buildInputs = buildInputs ++ [R gettext] ++ stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gettext gfortran]; + stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 1f31aec886a6..16f1abe1a899 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -29,7 +29,7 @@ with import ./functions.nix { inherit lib gemConfig; }; let gemFiles = bundlerFiles args; - importedGemset = if builtins.typeOf gemFiles.gemset == "path" + importedGemset = if builtins.typeOf gemFiles.gemset != "set" then import gemFiles.gemset else gemFiles.gemset; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 99d1dd64dc4f..c8f61389ad3f 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -26,12 +26,13 @@ , allowSubstitutes ? false , meta ? {} , postBuild ? "" +, gemConfig ? null }@args: let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" ] + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults in runCommand basicEnv.name cmdArgs '' diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 3aa64356896f..beebd8ada9bb 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.5"; + version = "1.1.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l"; + sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 6043e2d289d7..c06cd9c3eb5a 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "8.8"; + version = "8.9"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "0yawd6mbz6cqj0qlrh01vy33p30f4s3pfrvsxwg5l11p416zzrz4"; + sha256 = "058lffmlzw7nqz5z89m2k640q7ffz6dz008bddvjsgpxbrdb89cd"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 02f44f4bf704..6019235c47b9 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.82"; + version = "1.83"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0kk9injrxbv4mmmjswrh1kidal6l0sdzbp40kv8vwf5aiv8jjaz0"; + sha256 = "14d4afjz0jshwpqryvwvzrs3rrqnd7cgg3x19awgy116591ibd83"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 4a2d298495da..042b338b2b14 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, - findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }: + findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }: with lib; stdenv.mkDerivation rec { - version = "0.66.0"; + version = "0.70.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0l1sdd1n0llmz8m81vym3zhcn824sr9w46h9jpb7i7wrcm4y410d"; + sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; }; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt wtf8 dtoa + ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix new file mode 100644 index 000000000000..a50f6993c331 --- /dev/null +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake +, pkgconfig, makeWrapper }: + +rustPlatform.buildRustPackage rec { + pname = "panopticon"; + version = "unstable-20171202"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "das-labor"; + repo = pname; + rev = "33ffec0d6d379d51b38d6ea00d040f54b1356ae4"; + sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = with qt5; [ + qt5.qtbase + qtdeclarative + qtsvg + qtquickcontrols2 + qtgraphicaleffects + pkgconfig + git + ]; + + cargoSha256 = "02k21mh0jyc6vz52jx1qijsfk07pkdv1g2hqx7gyvmm4v10vbfna"; + doCheck = false; + + postInstall = '' + mkdir -p $out/share/${pname} $out/bin + cp -R qml $out/share/${pname} + mv $out/bin/${pname} $out/share/${pname} + chmod +x $out/share/${pname} + makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + description = "A libre cross-platform disassembler"; + longDescription = '' + Panopticon is a cross platform disassembler for reverse + engineering written in Rust. It can disassemble AMD64, + x86, AVR and MOS 6502 instruction sets and open ELF files. + Panopticon comes with Qt GUI for browsing and annotating + control flow graphs. + ''; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index a8d4c517a90e..83da9926170a 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.1.0"; + version = "6.2.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1d2hbsnyvwvawhfh832yy3w93kr4whrk99zpg4q5ws2b2hhdvzv8"; + sha256 = "12j6m6lhp4xw27x0x8jcy0vlwbanjwks7w6zl56xihv6r8cm40fz"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 3cd1d309e15d..d1ff712be2d3 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -3,35 +3,17 @@ stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "02m5sf45n455hn34y7hrqanj830rc5xhz2ppp1z3mzbz0s515pfl"; + sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - patches = [ - # Fixup version number :D - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/69506b64600df632afdca8b680baa7d946c78644.patch"; - sha256 = "0ks3ixz8bycjcfi26bd0p6z7qaplhq00alw44hsfzpdm4bmr01x0"; - }) - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/8b52c66f4f0091cd9d97389b32aa519c2c602e2b.patch"; - sha256 = "0wcdn35lx2943pfzm7mkg4sr82pm0qz3yxf74m8fxbd70s3w0gkm"; - }) - - # case-insensitive filtering - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/0ebd34370bcaed00000168147572bb78106eeab1.patch"; - sha256 = "0sc50jwhncfnd2i5mlyld4dbdzi2ws7nh4yglkhlap9l9h1jxn20"; - }) - ]; - patchFlags = [ "-p2" ]; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index d70332749d98..5f7b389cc2b1 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchFromGitHub, fetchgit, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, git, -gtk2 ? null, vte ? null, gtkdialog ? null, -python ? null, -ruby ? null, -lua ? null, -useX11, rubyBindings, pythonBindings, luaBindings}: +{stdenv, fetchFromGitHub, pkgconfig, libusb, readline, libewf, perl, zlib, openssl +, gtk2 ? null, vte ? null, gtkdialog ? null +, python ? null +, ruby ? null +, lua ? null +, useX11, rubyBindings, pythonBindings, luaBindings +}: assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; @@ -13,23 +14,26 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.5.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "08zvxgsvc6rqpjaapcxz1wm9vzlrbsqgplfkx0lch2s67v6slr7z"; + sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd"; }; + # do not try to update capstone + WITHOUT_PULL=1; + postPatch = let cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile - capstone = fetchgit { - url = "https://github.com/aquynh/capstone.git"; + capstone = fetchFromGitHub { + owner = "aquynh"; + repo = "capstone"; rev = cs_tip; - sha256 = "1b126npshdbwh5y7rafmb9w4dzlvxsf4ca6bx4zs2y7kbk48jyn8"; - leaveDotGit = true; + sha256 = "0v6rxfpxjq0hf40qn1n5m5wsv1dv6p1j8vm94a708lhvcbk9nkv8"; }; in '' if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi @@ -39,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig git ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index f88546163d44..a4c62e6fc32c 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -116,5 +116,6 @@ in stdenv.mkDerivation rec { homepage = https://retdec.com; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + broken = withPEPatterns; # retdec-full is broken, 2018-04-11 }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 1be5655b1e53..a59b452b432b 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, requireFile, makeWrapper, yacc, gcc +{ stdenv, lib, fetchurl, makeWrapper, yacc, gcc , withISpin ? true, tk, swarm, graphviz }: let @@ -10,14 +10,12 @@ in stdenv.mkDerivation rec { version = "6.4.8"; url-version = stdenv.lib.replaceChars ["."] [""] version; - src = requireFile { - name = "spin${url-version}.tar.gz"; - sha256 = "1rpazi5fj772121cn7r85fxypmaiv0x6x2l82b5y1xqzyf0fi4ph"; - message = '' - reCAPTCHA is preventing us to download the file for you. - Please download it at http://spinroot.com/spin/Src/index.html - and add it to the nix-store using nix-prefetch-url. - ''; + src = fetchurl { + # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. + # Dropbox mirror from developers: + # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADya1lOBJZDbgWGrUSq-dfHa/spin${url-version}.tar.gz?raw=1"; + sha256 = "1rvamdsf0igzpndlr4ck7004jw9x1bg4xyf78zh5k9sp848vnd80"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,12 +23,6 @@ in stdenv.mkDerivation rec { sourceRoot = "Spin/Src${version}"; - unpackPhase = '' - # The archive is compressed twice - gunzip -c $src > spin.tar.gz - tar -xzf spin.tar.gz - ''; - installPhase = '' install -Dm755 spin $out/bin/spin wrapProgram $out/bin/spin \ diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index d1320960f39a..65211ca088b4 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "01xj2hivwwp3msvv0psxyxrzg95vj2ny56l3n90glhwznn7l60ai"; + sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix new file mode 100644 index 000000000000..8816a005ca0f --- /dev/null +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -0,0 +1,111 @@ +{ fetchurl, stdenv, coreutils, makeWrapper }: + +let version = "1.9.6"; in + +stdenv.mkDerivation { + name = "ant-${version}"; + + buildInputs = [ makeWrapper ]; + + src = fetchurl { + url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; + sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4"; + }; + + contrib = fetchurl { + url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2; + sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; + }; + + installPhase = + '' + mkdir -p $out/bin $out/lib/ant + mv * $out/lib/ant/ + + # Get rid of the manual (35 MiB). Maybe we should put this in a + # separate output. Keep the antRun script since it's vanilla sh + # and needed for the <exec/> task (but since we set ANT_HOME to + # a weird value, we have to move antRun to a weird location). + # Get rid of the other Ant scripts since we provide our own. + mv $out/lib/ant/bin/antRun $out/bin/ + rm -rf $out/lib/ant/{manual,bin,WHATSNEW} + mkdir $out/lib/ant/bin + mv $out/bin/antRun $out/lib/ant/bin/ + + # Install ant-contrib. + unpackFile $contrib + cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ + + cat >> $out/bin/ant <<EOF + #! ${stdenv.shell} -e + + ANT_HOME=$out/lib/ant + + # Find the JDK by looking for javac. As a fall-back, find the + # JRE by looking for java. The latter allows just the JRE to be + # used with (say) ECJ as the compiler. Finally, allow the GNU + # JVM. + if [ -z "\$JAVA_HOME" ]; then + for i in javac java gij; do + if p="\$(type -p \$i)"; then + export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))" + break + fi + done + if [ -z "\$JAVA_HOME" ]; then + echo "\$0: cannot find the JDK or JRE" >&2 + exit 1 + fi + fi + + if [ -z \$NIX_JVM ]; then + if [ -e \$JAVA_HOME/bin/java ]; then + NIX_JVM=\$JAVA_HOME/bin/java + elif [ -e \$JAVA_HOME/bin/gij ]; then + NIX_JVM=\$JAVA_HOME/bin/gij + else + NIX_JVM=java + fi + fi + + LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" + + exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ + -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ + org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ + -cp "\$CLASSPATH" "\$@" + EOF + + chmod +x $out/bin/ant + ''; # */ + + meta = { + homepage = http://ant.apache.org/; + description = "A Java-based build tool"; + + longDescription = '' + Apache Ant is a Java-based build tool. In theory, it is kind of like + Make, but without Make's wrinkles. + + Why another build tool when there is already make, gnumake, nmake, jam, + and others? Because all those tools have limitations that Ant's + original author couldn't live with when developing software across + multiple platforms. Make-like tools are inherently shell-based -- they + evaluate a set of dependencies, then execute commands not unlike what + you would issue in a shell. This means that you can easily extend + these tools by using or writing any program for the OS that you are + working on. However, this also means that you limit yourself to the + OS, or at least the OS type such as Unix, that you are working on. + + Ant is different. Instead of a model where it is extended with + shell-based commands, Ant is extended using Java classes. Instead of + writing shell commands, the configuration files are XML-based, calling + out a target tree where various tasks get executed. Each task is run + by an object that implements a particular Task interface. + ''; + + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 6e974b7e93d6..593fe6c159b2 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - version = "0.10.1"; + version = "0.11.1"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0rz6zvkzyglf0mmc178avf52zynz487m4v0089ilsbrgv7v4i0kh"; + sha256 = "e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index 07480d15f211..ef8a0cdc38ef 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1rs2x0b2v92xfsfk0f2nr9x8lz5baawf768s58brj4jiab6mq312"; + sha256 = "7b255f5ec97946c3d32e822b8fcbff0459cfe4f94fb26ee4813ffd80440c93e8"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 75e6bb0404be..59d3c93bb877 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.0.0"; + version = "1.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0ws31ypmksah1c83h4npwg560p8v7n9j6l94p79y5pispjsgzqzl"; + sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index fcf06782e4dd..5fcd6b341653 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 -, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +, useNcurses ? false, ncurses, useQt4 ? false, qt4, ps , buildPlatform, hostPlatform }: with stdenv.lib; -assert wantPS -> (ps != null); assert stdenv ? cc; assert stdenv.cc ? libc; @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { ++ optional useNcurses ncurses ++ optional useQt4 qt4; - propagatedBuildInputs = optional wantPS ps; + propagatedBuildInputs = [ ps ]; CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index c796c31cb70a..5053559bcca3 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -44,6 +44,20 @@ cmakeConfigurePhase() { cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags" fi + # on macOS we want to prefer Unix-style headers to Frameworks + # because we usually do not package the framework + cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + + # we never want to use the global macOS SDK + cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" + + # disable OSX deployment target + # we don't want our binaries to have a "minimum" OSX version + cmakeFlags="-DCMAKE_OSX_DEPLOYMENT_TARGET= $cmakeFlags" + + # correctly detect our clang compiler + cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags" + # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the # basename as the install name, which means that, on Darwin, they diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index aeeb4dbd7798..e6ec8c2a80ce 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -3,14 +3,14 @@ let name = "doit"; - version = "0.31.0"; + version = "0.31.1"; in python3Packages.buildPythonApplication { name = "${name}-${version}"; src = fetchurl { url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz"; - sha256 = "0v1yr04bfqnz3sp261np3zhf0y1b3a1daxc83iq308lscf39fdgx"; + sha256 = "1spm8vfjh4kvalaj0i2ggbdln1yy5k68d8mfwfnpqlzxxx4ikl5s"; }; buildInputs = with python3Packages; [ mock pytest ]; diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 87897017f86a..94fa7e7201a3 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { ./construct-command-line.patch ./long-command-line.patch ./darwin-library_search-dylib.patch + + # Fix support for glibc 2.27's glob + ../4.2/glibc-2.27-glob.patch ]; patchFlags = "-p0"; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index e175205143fc..95466d843d69 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch ./pselect.patch + # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html + ./glibc-2.27-glob.patch ]; nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch new file mode 100644 index 000000000000..186212d0d298 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch @@ -0,0 +1,32 @@ +diff -Naur glob/glob.c glob/glob.c +--- glob/glob.c 2013-10-20 13:14:38.000000000 -0400 ++++ glob/glob.c 2018-03-16 14:32:38.483496170 -0400 +@@ -208,28 +208,9 @@ + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H + # include <alloca.h> +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include <malloc.h> +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif + + #ifndef __GNU_LIBRARY__ + # define __stat stat diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27.patch deleted file mode 100644 index c2639c6cc927..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith <psmith@gnu.org> -Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: * configure.ac: Support GLIBC glob interface version 2 - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff -Naur a/configure b/configure ---- configure 2016-06-10 19:03:21.000000000 -0400 -+++ configure 2018-02-18 04:40:32.971371555 -0500 -@@ -11481,10 +11481,9 @@ - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/head.nix b/pkgs/development/tools/build-managers/gnumake/4.2/head.nix deleted file mode 100644 index 5f3ae10c3e5b..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/head.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, texinfo, guileSupport ? false, pkgconfig , guile ? null, autoreconfHook }: - -assert guileSupport -> ( guile != null ); - -let - version = "4.2.90"; - revision = "48c8a116a914a325a0497721f5d8b58d5bba34d4"; - revCount = "2491"; - shortRev = "48c8a11"; - - baseVersion = "4.2.1"; - baseTarball = fetchurl { - url = "mirror://gnu/make/make-${baseVersion}.tar.bz2"; - sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; - }; -in -stdenv.mkDerivation { - name = "gnumake-${version}pre${revCount}_${shortRev}"; - - src = fetchurl { - url = "http://git.savannah.gnu.org/cgit/make.git/snapshot/make-${revision}.tar.gz"; - sha256 = "0k6yvhr2a5lh1qhflv02dyvq5p20ikgaakm8w6gr4xmkspljwpwx"; - }; - - postUnpack = '' - unpackFile ${baseTarball} - cp make-${baseVersion}/po/*.po $sourceRoot/po - cp make-${baseVersion}/doc/{fdl,make-stds}.texi $sourceRoot/doc - ''; - - patches = [ - # Purity: don't look for library dependencies (of the form `-lfoo') in /lib - # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for - # included Makefiles, don't look in /usr/include and friends. - ./impure-dirs-head.patch - ]; - - postPatch = '' - # These aren't in the 4.2.1 tarball yet. - sed -i -e 's/sr//' -e 's/zh_TW//' po/LINGUAS - ''; - - nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; - buildInputs = stdenv.lib.optional guileSupport guile; - - configureFlags = stdenv.lib.optional guileSupport "--with-guile"; - - outputs = [ "out" "man" "info" ]; - - meta = with stdenv.lib; { - homepage = http://www.gnu.org/software/make/; - description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - - longDescription = '' - Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - - platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch b/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch deleted file mode 100644 index 06d39e13ce39..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur a/src/read.c b/src/read.c ---- a/src/read.c 2017-11-19 15:17:47.000000000 -0500 -+++ b/src/read.c 2018-02-19 08:53:51.548755213 -0500 -@@ -109,10 +109,12 @@ - #endif - INCLUDEDIR, - #ifndef _AMIGA -+#if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", - #endif -+#endif - 0 - }; - -diff -Naur a/src/remake.c b/src/remake.c ---- a/src/remake.c 2017-11-19 15:17:47.000000000 -0500 -+++ b/src/remake.c 2018-02-19 08:54:08.304101943 -0500 -@@ -1601,9 +1601,11 @@ - static const char *dirs[] = - { - #ifndef _AMIGA -+#if 0 - "/lib", - "/usr/lib", - #endif -+#endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index b44289d74f54..bef89c881b5a 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -266,18 +266,13 @@ +@@ -282,18 +282,13 @@ ''' if option.endswith('dir') and os.path.isabs(value) and \ option not in builtin_dir_noprefix_options: @@ -8,7 +8,7 @@ # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -- if commonpath([value, prefix]) != str(PurePath(prefix)): +- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)): - m = 'The value of the {!r} option is {!r} which must be a ' \ - 'subdir of the prefix {!r}.\nNote that if you pass a ' \ - 'relative path, it is assumed to be a subdir of prefix.' @@ -16,7 +16,7 @@ - # Convert path to be relative to prefix - skip = len(prefix) + 1 - value = value[skip:] -+ if commonpath([value, prefix]) == str(PurePath(prefix)): ++ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)): + # Convert path to be relative to prefix + skip = len(prefix) + 1 + value = value[skip:] diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 47e574236329..298c669e690b 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,14 +1,14 @@ -{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let +{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.44.0"; + version = "0.45.1"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1rpqp9iwbvr4xvfdh3iyfh1ha274hbb66jbgw3pa5a73x4d4ilqn"; + sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14"; }; postFixup = '' @@ -43,6 +43,10 @@ in python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) + + # No one will ever need more than 128 bytes of data structure + # https://github.com/mesonbuild/meson/issues/3113 + ./overly-strict-size-check.patch ]; setupHook = ./setup-hook.sh; @@ -65,6 +69,11 @@ in python3Packages.buildPythonApplication rec { endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"} ''; + # 0.45 update enabled tests but they are failing + doCheck = false; + # checkInputs = [ ninja pkgconfig ]; + # checkPhase = "python ./run_project_tests.py"; + inherit (stdenv) cc isCross; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch new file mode 100644 index 000000000000..ea0e9bcd7eac --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch @@ -0,0 +1,12 @@ +diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py +--- a/mesonbuild/compilers/c.py 2017-12-10 08:37:19.000000000 -0500 ++++ b/mesonbuild/compilers/c.py 2018-03-24 07:46:04.739929307 -0400 +@@ -406,7 +406,7 @@ + }}''' + if not self.compiles(t.format(**fargs), env, extra_args, dependencies): + return -1 +- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) ++ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies) + + def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): + if extra_args is None: diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index abb32f257607..54e6d38f716a 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; with pythonPackages; let - version = "1.3.0"; + version = "1.5.0"; in buildPythonApplication rec { inherit version; pname = "pantsbuild.pants"; @@ -12,7 +12,7 @@ in buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "18fcf9047l9k006wz21g525p1w5avyjabmabh0giyz22xnm8g5gp"; + sha256 = "7c0a1206594c615fce0a7f6daa4ea1028645bc20afa5599c2cf0ad7c06223fa7"; }; prePatch = '' @@ -24,10 +24,10 @@ in buildPythonApplication rec { dontStrip = true; propagatedBuildInputs = [ - twitter-common-collections setproctitle setuptools six ansicolors - packaging pathspec scandir twitter-common-dirutil psutil requests - pystache pex docutils markdown pygments twitter-common-confluence - fasteners coverage pywatchman futures cffi + twitter-common-collections setproctitle ansicolors packaging pathspec + scandir twitter-common-dirutil psutil requests pystache pex docutils + markdown pygments twitter-common-confluence fasteners pywatchman + futures cffi subprocess32 contextlib2 faulthandler pyopenssl ]; meta = { diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 7a199cc925a7..926cc83cd976 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = http://bashdb.sourceforge.net/remake/; license = stdenv.lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 01a112bcecce..04102e7e8f86 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "0fy04mnnrbdm7kfnjh6sv1q3g6wqzvwyf1p43f36rw3qalap544a"; + sha256 = "0hc361gb71psadx9gj78j0j60fw4sljjk8sl45hw6yzx3hmmkg9g"; }; patchPhase = '' diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix new file mode 100644 index 000000000000..f8389786b9da --- /dev/null +++ b/pkgs/development/tools/castxml/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub +, pythonPackages +, pkgconfig +, cmake +, llvmPackages +, withMan ? true +}: +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + pname = "CastXML"; + version = "20180403"; + + src = fetchFromGitHub { + owner = "CastXML"; + repo = "CastXML"; + rev = "c2a44d06d9379718292b696f4e13a2725ff9d95e"; + sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj"; + }; + + buildInputs = [ + cmake + llvmPackages.clang-unwrapped + llvmPackages.llvm + ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + + propagatedbuildInputs = [ llvmPackages.libclang ]; + + preConfigure = '' + cmakeFlagsArray+=( + ${if withMan then "-DSPHINX_MAN=ON" else ""} + )''; + + # 97% tests passed, 96 tests failed out of 2866 + # mostly because it checks command line and nix append -isystem and all + doCheck=false; + checkPhase = '' + # -E exclude 4 tests based on names + # see https://github.com/CastXML/CastXML/issues/90 + ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd' + ''; + + meta = with stdenv.lib; { + homepage = http://www.kitware.com; + license = licenses.asl20; + description = "Abstract syntax tree XML output tool"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/bettercap/Gemfile b/pkgs/development/tools/cbor-diag/Gemfile index 8fb2a1c300a7..798e507460eb 100644 --- a/pkgs/tools/security/bettercap/Gemfile +++ b/pkgs/development/tools/cbor-diag/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'bettercap' +gem 'cbor-diag' diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock new file mode 100644 index 000000000000..0d129765aa4a --- /dev/null +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + cbor-diag (0.5.2) + json + treetop (~> 1) + json (2.1.0) + polyglot (0.3.5) + treetop (1.6.10) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + cbor-diag + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/cbor-diag/default.nix b/pkgs/development/tools/cbor-diag/default.nix new file mode 100644 index 000000000000..049d9f38c0c1 --- /dev/null +++ b/pkgs/development/tools/cbor-diag/default.nix @@ -0,0 +1,30 @@ +{ lib, bundlerApp, ruby }: + +bundlerApp { + pname = "cbor-diag"; + + inherit ruby; + gemdir = ./.; + + exes = [ + "cbor2diag.rb" + "cbor2json.rb" + "cbor2pretty.rb" + "cbor2yaml.rb" + "diag2cbor.rb" + "diag2pretty.rb" + "json2cbor.rb" + "json2pretty.rb" + "pretty2cbor.rb" + "pretty2diag.rb" + "yaml2cbor.rb" + ]; + + meta = with lib; { + description = "CBOR diagnostic utilities"; + homepage = https://github.com/cabo/cbor-diag; + license = with licenses; asl20; + maintainers = with maintainers; [ fdns ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/development/tools/cbor-diag/gemset.nix new file mode 100644 index 000000000000..2de0e9a647a7 --- /dev/null +++ b/pkgs/development/tools/cbor-diag/gemset.nix @@ -0,0 +1,36 @@ +{ + cbor-diag = { + dependencies = ["json" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1"; + type = "gem"; + }; + version = "0.5.2"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + type = "gem"; + }; + version = "1.6.10"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/cddl/Gemfile b/pkgs/development/tools/cddl/Gemfile new file mode 100644 index 000000000000..2ba729084f1a --- /dev/null +++ b/pkgs/development/tools/cddl/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cddl' diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock new file mode 100644 index 000000000000..65701dd45bf8 --- /dev/null +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -0,0 +1,28 @@ +GEM + remote: https://rubygems.org/ + specs: + abnc (0.1.0) + cbor-diag (0.5.2) + json + treetop (~> 1) + cddl (0.8.5) + abnc + cbor-diag + colorize + json + regexp-examples + colorize (0.8.1) + json (2.1.0) + polyglot (0.3.5) + regexp-examples (1.4.2) + treetop (1.6.10) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + cddl + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix new file mode 100644 index 000000000000..37ad593d7964 --- /dev/null +++ b/pkgs/development/tools/cddl/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, ruby }: + +bundlerApp { + pname = "cddl"; + + inherit ruby; + gemdir = ./.; + exes = [ "cddl" ]; + + meta = with lib; { + description = "A parser, generator, and validator for CDDL"; + homepage = https://rubygems.org/gems/cddl; + license = with licenses; mit; + maintainers = with maintainers; [ fdns ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix new file mode 100644 index 000000000000..92aa41995051 --- /dev/null +++ b/pkgs/development/tools/cddl/gemset.nix @@ -0,0 +1,69 @@ +{ + abnc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig"; + type = "gem"; + }; + version = "0.1.0"; + }; + cbor-diag = { + dependencies = ["json" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1"; + type = "gem"; + }; + version = "0.5.2"; + }; + cddl = { + dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pg91wrby0qgrdnf089ddy5yy2jalxd3bb9dljj16cpwv4gjx047"; + type = "gem"; + }; + version = "0.8.5"; + }; + colorize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + type = "gem"; + }; + version = "0.8.1"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + regexp-examples = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "104f0j0h2x5ijly7kyaj7zz0md65r2c03cpbi5cngm0hs2sr1qkz"; + type = "gem"; + }; + version = "1.4.2"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + type = "gem"; + }; + version = "1.6.10"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 191812392788..8d43736d3a8a 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "ct-${version}"; - version = "0.5.0"; + version = "0.7.0"; goPackagePath = "github.com/coreos/container-linux-config-transpiler"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "coreos"; repo = "container-linux-config-transpiler"; rev = "v${version}"; - sha256="1gchqvx5a2fhw9bw359azd9zg8d6h50gkzfz21c41vkjln2z6jq6"; + sha256="058zjk9yqgdli55gc6y48455il6wjpslyz2r2ckk2ki9c5qc8b7c"; }; buildFlagsArray = '' diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 515e22788e50..7a5f2f44823b 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: let - version = "2.6.9"; + version = "2.6.10"; goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { @@ -12,7 +12,7 @@ buildGoPackage { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "0rlinj7dcr8vzl1pb15nfny8jkvvj50i8czf4ahv26avnfycm4pz"; + sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 5181361abf67..6cce9803c915 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.5.0"; + version = "10.6.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1ywfki1599ggyq0g3r8f7pi1njvvjz41kjhssfax20ljm2c6q5v0"; + sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0r71zvyg17926h2vpjr3q16l1yqcb8ky21ic5arc7jh82nzywywl"; + sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "13c9jzqj92xf2dzk77xpsfc4dwffvjfp8bqy685shzz1lrrfhfvq"; + sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 394169c9cc9d..df9addcad3cb 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.5.5"; + version = "3.6.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "1ipjbzdb32xigm0vg6zzjnbx9n248rrkr324n5igp53nxbvgf3fs"; + sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index 20123a0600e7..0390e7b86bbc 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = { description = "A declarative language to describe PostgreSQL databases"; - homepage = http://perseas.github.io/; + homepage = https://perseas.github.io/; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ pmeunier ]; }; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 74adac9f8a32..054eabdb5e43 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; license = licenses.gpl3; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5414abff66ae..a52afd6c39ad 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.27"; + version = "1.28"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "0vwsdl61nvnmqswlz5j9m4hg7qirhazwcikcnqf9nx0c13vx6sz2"; + sha256 = "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"; }; patches = [ diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 95c2a6a28a78..128eed603b03 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -5,7 +5,6 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; version = "0.17.3"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mkdocs"; @@ -14,6 +13,11 @@ buildPythonApplication rec { sha256 = "15lv60gdc837zja5kn2rfp78kwyb1ckc43jg01zfzqra4qz7b6rw"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "tornado>=4.1,<5.0" "tornado>=4.1" + ''; + checkInputs = [ nose nose-exclude mock ]; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 4ca3bf5e0741..eeaec8eb0335 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -9,8 +9,12 @@ stdenv.mkDerivation { sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k"; }; - installPhase = "mkdir -p $out; mv * $out/"; dontFixup = true; + # no "make install", gnulib is a collection of source code + installPhase = '' + mkdir -p $out; mv * $out/ + ln -s $out/lib $out/include + ''; meta = { homepage = http://www.gnu.org/software/gnulib/; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 1ea4d160b4cb..89cc7eb1bfee 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,41 +1,67 @@ -{ stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor -, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, libGLU, zlib }: +{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +, libXinerama, libXrandr, libXrender, libpulseaudio ? null +, libXi ? null, libXext, libXfixes, freetype, openssl +, alsaLib, libGLU, zlib, yasm ? null }: -stdenv.mkDerivation rec { +let + options = { + touch = libXi != null; + pulseaudio = false; + }; +in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "2.1.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48"; + sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio libGLU zlib + scons libX11 libXcursor libXinerama libXrandr libXrender + libXi libXext libXfixes freetype openssl alsaLib libpulseaudio + libGLU zlib yasm ]; - patches = [ ./pkg_config_additions.patch ]; + patches = [ + ./pkg_config_additions.patch + ./dont_clobber_environment.patch + ]; enableParallelBuilding = true; buildPhase = '' - scons platform=x11 prefix=$out -j $NIX_BUILD_CORES + scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \ + ${lib.concatStringsSep " " + (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)} ''; installPhase = '' - mkdir $out/bin -p - cp bin/godot.* $out/bin/ + mkdir -p $out/bin + cp bin/godot.x11.tools.* $out/bin/godot + + mkdir -p "$out/share/applications" + cp misc/dist/linux/godot.desktop "$out/share/applications/" + substituteInPlace "$out/share/applications/godot.desktop" \ + --replace "Exec=godot" \ + "Exec=$out/bin/godot" + + mkdir -p "$out/share/icons/hicolor/scalable/apps/" + cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" + cp icon.png "$out/share/icons/godot.png" + + mkdir -p "$out/share/man/man6" + cp misc/dist/linux/godot.6 "$out/share/man/man6/" ''; meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.twey ]; }; } diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch new file mode 100644 index 000000000000..c57c85588a01 --- /dev/null +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -0,0 +1,16 @@ ++++ build/SConstruct +@@ -69,10 +69,10 @@ + custom_tools = ['mingw'] + + env_base = Environment(tools=custom_tools) +-if 'TERM' in os.environ: +- env_base['ENV']['TERM'] = os.environ['TERM'] +-env_base.AppendENVPath('PATH', os.getenv('PATH')) +-env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH')) ++for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): ++ if (k in os.environ): ++ env_base["ENV"][k] = os.environ[k] ++ + env_base.global_defaults = global_defaults + env_base.android_maven_repos = [] + env_base.android_flat_dirs = [] diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index 2302710ac7e4..286372f060ae 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,12 +1,13 @@ -+++ build/platform/x11/detect.py -@@ -139,6 +139,10 @@ - env.ParseConfig('pkg-config xinerama --cflags --libs') ++++ b/platform/x11/detect.py +@@ -142,6 +142,11 @@ env.ParseConfig('pkg-config xcursor --cflags --libs') + env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') + env.ParseConfig('pkg-config xrender --cflags --libs') -+ env.ParseConfig('pkg-config oslibGLU_combined --cflags') ++ env.ParseConfig('pkg-config xext --cflags --libs') ++ env.ParseConfig('pkg-config xfixes --cflags --libs') + env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs') - - if (env['builtin_openssl'] == 'no'): - # Currently not compatible with OpenSSL 1.1.0+ + + if (env['touch']): + x11_error = os.system("pkg-config xi --modversion > /dev/null ") diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix new file mode 100644 index 000000000000..59f7360df2ae --- /dev/null +++ b/pkgs/development/tools/gron/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gron-${version}"; + version = "0.5.1"; + + owner = "tomnomnom"; + repo = "gron"; + goPackagePath = "github.com/${owner}/${repo}"; + + src = fetchFromGitHub { + inherit owner repo; + rev = "v${version}"; + sha256 = "1s688ynjddchviwbiggnfbw28s4wsff2941f4b1q1j7mfak7iym2"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Make JSON greppable!"; + longDescription = '' + gron transforms JSON into discrete assignments to make it easier to grep + for what you want and see the absolute 'path' to it. It eases the + exploration of APIs that return large blobs of JSON but have terrible + documentation. + ''; + homepage = "https://github.com/tomnomnom/gron"; + license = licenses.mit; + maintainers = [ maintainers.fgaz ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/tools/gron/deps.nix b/pkgs/development/tools/gron/deps.nix new file mode 100644 index 000000000000..c5b1feb888ae --- /dev/null +++ b/pkgs/development/tools/gron/deps.nix @@ -0,0 +1,35 @@ +[ + rec { + owner = "fatih"; + repo = "color"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v1.6.0"; + sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + }; + } + rec { + owner = "nwidger"; + repo = "jsoncolor"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; + sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; + }; + } + rec { + owner = "pkg"; + repo = "errors"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } +] diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 7efe556ebde0..781d3b096cfb 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -1,17 +1,16 @@ -{ mkDerivation, base, bytestring, Cabal, containers, deepseq, Diff -, directory, filepath, ShellCheck, stdenv, tasty, tasty-golden -, transformers, fetchFromGitHub +{ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers +, deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty +, tasty-golden, transformers, fetchFromGitHub }: mkDerivation { - pname = "make-travis-yml"; + pname = "haskell-ci"; version = "0"; src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "7ca5d751c35c6dc43392397b4641c4611ed55121"; - sha256 = "04f9jcxqv1mn0rw31x23ns6xdhgqjv55blsksadwr25qn2521zxb"; + rev = "848c2fe5c7d0d95b20312e86b360d5db8c95db75"; + sha256 = "1n4y6j564sxxry19xs4x0ds7fg8h1q0svw9q45477czx82qzavym"; }; - jailbreak = true; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20,8 +19,8 @@ mkDerivation { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Diff directory filepath tasty tasty-golden - transformers + ansi-terminal base bytestring Diff directory filepath tasty + tasty-golden transformers ]; homepage = "https://github.com/haskell-CI/haskell-ci"; description = "Script generator for Travis-CI"; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index e56502a4ad05..c4f6e2565f67 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.3.0"; + version = "1.4.0"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1216qz1kk38vkvfrznjwb65vsbhscqvvrsbp2i6pnf0i85p00pqm"; + sha256 = "1mysw091ddi3abijvciyy73ff31vqq7zb37w30sp3vhm5vq38nn2"; }; buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ]; diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix new file mode 100644 index 000000000000..c434fd5a7dec --- /dev/null +++ b/pkgs/development/tools/iaca/2.1.nix @@ -0,0 +1,34 @@ +{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: +assert stdenv.system == "x86_64-linux"; +with stdenv.lib; + +# v2.1: last version with NHM/WSM arch support +stdenv.mkDerivation { + name = "iaca-2.1"; + src = requireFile { + name = "iaca-version-2.1-lin64.zip"; + sha256 = "11s1134ijf66wrc77ksky9mnb0lq6ml6fzmr86a6p6r5xclzay2m"; + url = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer-download"; + }; + unpackCmd = ''${unzip}/bin/unzip "$src" -x __MACOSX/ __MACOSX/iaca-lin64/ __MACOSX/iaca-lin64/._.DS_Store''; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin $out/lib + cp bin/iaca $out/bin/ + cp lib/* $out/lib + ''; + preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + patchelf \ + --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ + --set-rpath $out/lib:"${libPath}" \ + $out/bin/iaca + ''; + postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib''; + meta = { + description = "Intel Architecture Code Analyzer"; + homepage = https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ kazcw ]; + }; +} diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix new file mode 100644 index 000000000000..025dfc56721d --- /dev/null +++ b/pkgs/development/tools/iaca/3.0.nix @@ -0,0 +1,25 @@ +{ stdenv, requireFile, patchelf, unzip }: +assert stdenv.system == "x86_64-linux"; +with stdenv.lib; + +stdenv.mkDerivation { + name = "iaca-3.0"; + src = requireFile { + name = "iaca-version-v3.0-lin64.zip"; + sha256 = "0qd81bxg269cwwvfmdp266kvhcl3sdvhrkfqdrbmanawk0w7lvp1"; + url = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer-download"; + }; + unpackCmd = ''${unzip}/bin/unzip "$src"''; + installPhase = '' + mkdir -p $out/bin + cp iaca $out/bin + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca + ''; + meta = { + description = "Intel Architecture Code Analyzer"; + homepage = https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ kazcw ]; + }; +} diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 61f211b95802..1d7b22ac5ee0 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "A universal code generator"; platforms = platforms.unix; maintainers = [ maintainers.moosingin3space ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 9762926ddf5e..70b8e7f26638 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, jre }: stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.6.0"; name = "jbake-${version}"; src = fetchzip { - url = "http://jbake.org/files/jbake-${version}-bin.zip"; - sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912"; + url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; + sha256 = "1k71rz82fwyi51xhyghg8laz794xyz06d5apmxa9psy7yz184ylk"; }; buildInputs = [ jre ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JBake is a Java based, open source, static site/blog generator for developers & designers"; - homepage = "http://jbake.org/"; + homepage = "https://jbake.org/"; license = licenses.mit; maintainers = with maintainers; [ moaxcp ]; }; diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix new file mode 100644 index 000000000000..ea6214284582 --- /dev/null +++ b/pkgs/development/tools/jl/default.nix @@ -0,0 +1,28 @@ +{ mkDerivation, fetchFromGitHub +, aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra +, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv +, text, unordered-containers, vector +}: +mkDerivation rec { + pname = "jl"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "chrisdone"; + repo = "jl"; + rev = "v${version}"; + sha256 = "0wsdfj4m729q0kjpkn0ywpncdhvpvvprd4rh45vcg6kjw20krm3r"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions mtl parsec + scientific text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring conduit conduit-extra containers + mtl optparse-simple text vector + ]; + license = stdenv.lib.licenses.bsd3; + description = "Functional sed for JSON"; + maintainers = with stdenv.lib.maintainers; [ fgaz ]; +} diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 1f4c21cb7f9c..0271cbee92c1 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { name = "libsigrok-${version}"; src = fetchurl { - url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz"; + url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz"; inherit sha256; }; firmware = fetchurl { - url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz"; + url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz"; sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Core library of the sigrok signal analysis software suite"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 57bb159c5863..9fd70cb60c96 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.0"; + name = "libsigrokdecode-0.5.1"; src = fetchurl { - url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a"; + url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; + sha256 = "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix deleted file mode 100755 index fff91c6f7f38..000000000000 --- a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{stdenv, fetchurl, glibc, bison, arm-frc-linux-gnueabi-eglibc}: - -stdenv.mkDerivation rec { - _target = "arm-frc-linux-gnueabi"; - - version = "2.28"; - name = "${_target}-binutils-${version}"; - - src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88"; - }; - - nativeBuildInputs = [ bison arm-frc-linux-gnueabi-eglibc ]; - buildInputs = [ glibc ]; - - configureFlags = '' - --target=${_target} - --with-pkgversion='GNU-Binutils-for-FRC' - --with-sysroot=$out/${_target} - --with-build-sysroot=/$out/${_target} - --disable-multilib - --disable-nls - --enable-lto - --disable-libiberty-install - --enable-ld - --enable-gold=default - --enable-plugins - ''; - - postConfigure = '' - make configure-host - ''; - - postInstall = '' - rm -rf $out/share/info - ''; - - meta = { - description = "FRC binutils"; - longDescription = '' - binutils used to build arm-frc-linux-gnueabi and user programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # since 2017-09-10 - priority = 3; - }; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 43efcf462800..affc400a9ed0 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.16"; + name = "automake-1.16.1"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr"; + sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; }; nativeBuildInputs = [ autoconf perl ]; diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index ca6cb14c2a43..a8f6426a3b7b 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index d4a8d483e2e5..48cf4b31a176 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.4"; + name = "babeltrace-1.5.5"; src = fetchurl { url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "1h8zi7afilbfx4jvdlhhgysj6x01w3799mdk4mdcgax04fch6hwn"; + sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/binutils/2.30.nix b/pkgs/development/tools/misc/binutils/2.30.nix deleted file mode 100644 index 830c07330524..000000000000 --- a/pkgs/development/tools/misc/binutils/2.30.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ stdenv, buildPackages -, fetchurl, zlib -, buildPlatform, hostPlatform, targetPlatform -, noSysDirs, gold ? true, bison ? null -}: - -let - version = "2.30"; - basename = "binutils-${version}"; - inherit (stdenv.lib) optional optionals optionalString; - # The targetPrefix prepended to binary names to allow multiple binuntils on the - # PATH to both be usable. - targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; -in - -stdenv.mkDerivation rec { - name = targetPrefix + basename; - - src = fetchurl { - url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; - }; - - patches = [ - # Turn on --enable-new-dtags by default to make the linker set - # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. - ./new-dtags.patch - - # Since binutils 2.22, DT_NEEDED flags aren't copied for dynamic outputs. - # That requires upstream changes for things to work. So we can patch it to - # get the old behaviour by now. - ./dtneeded.patch - - # Make binutils output deterministic by default. - ./deterministic.patch - - # Always add PaX flags section to ELF files. - # This is needed, for instance, so that running "ldd" on a binary that is - # PaX-marked to disable mprotect doesn't fail with permission denied. - ./pt-pax-flags.patch - - # Bfd looks in BINDIR/../lib for some plugins that don't - # exist. This is pointless (since users can't install plugins - # there) and causes a cycle between the lib and bin outputs, so - # get rid of it. - ./no-plugins.patch - - # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and - # elf32-littlearm-vxworks in favor of the first. - # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 - ./disambiguate-arm-targets.patch - - # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's - # not clear why this behavior was decided upon but it has the unfortunate - # consequence that the linker will fail to find transitive dependencies of - # shared objects when cross-compiling. Consequently, we are forced to - # override this behavior, forcing ld to search DT_RPATH even when - # cross-compiling. - ./always-search-rpath.patch - ]; - - outputs = [ "out" "info" "man" ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; - buildInputs = [ zlib ]; - - inherit noSysDirs; - - preConfigure = '' - # Clear the default library search path. - if test "$noSysDirs" = "1"; then - echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt - fi - - # Use symlinks instead of hard links to save space ("strip" in the - # fixup phase strips each hard link separately). - for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do - sed -i "$i" -e 's|ln |ln -s |' - done - ''; - - # As binutils takes part in the stdenv building, we don't want references - # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = if hostPlatform.isDarwin - then "-Wno-string-plus-int -Wno-deprecated-declarations" - else "-static-libgcc"; - - # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - - configureFlags = [ - "--enable-targets=all" "--enable-64-bit-bfd" - "--disable-install-libbfd" - "--disable-shared" "--enable-static" - "--with-system-zlib" - - "--enable-deterministic-archives" - "--disable-werror" - "--enable-fix-loongson2f-nop" - ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ]; - - enableParallelBuilding = true; - - passthru = { - inherit targetPrefix version; - }; - - meta = with stdenv.lib; { - description = "Tools for manipulating binaries (linker, assembler, etc.)"; - longDescription = '' - The GNU Binutils are a collection of binary tools. The main - ones are `ld' (the GNU linker) and `as' (the GNU assembler). - They also include the BFD (Binary File Descriptor) library, - `gprof', `nm', `strip', etc. - ''; - homepage = http://www.gnu.org/software/binutils/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ericson2314 ]; - platforms = platforms.unix; - - /* Give binutils a lower priority than gcc-wrapper to prevent a - collision due to the ld/as wrappers/symlinks in the latter. */ - priority = 10; - }; -} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 05d0d21a179b..123f679d779d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPackages -, fetchurl, zlib +, fetchurl, zlib, autoreconfHook264 , buildPlatform, hostPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: let - # Note to whoever is upgrading this: 2.29 is broken. - # ('nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test' segfaults on aarch64) - # Also glibc might need patching, see commit 733e20fee4a6700510f71fbe1a58ac23ea202f6a. - version = "2.28.1"; + # Remove gold-symbol-visibility patch when updating, the proper fix + # is now upstream. + # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 + version = "2.30"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; # The targetPrefix prepended to binary names to allow multiple binuntils on the @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; patches = [ @@ -61,12 +61,19 @@ stdenv.mkDerivation rec { # override this behavior, forcing ld to search DT_RPATH even when # cross-compiling. ./always-search-rpath.patch - ]; + + # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 + ./gold-symbol-visibility.patch + ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ + bison + ] ++ stdenv.lib.optionals targetPlatform.isiOS [ + autoreconfHook264 + ]; buildInputs = [ zlib ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch new file mode 100644 index 000000000000..0fb05a482d1c --- /dev/null +++ b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch @@ -0,0 +1,79 @@ +commit 8564af037f5c4c6d2744a89497691359205b2bbc +Author: Shea Levy <shea@shealevy.com> +Date: Mon Mar 19 10:52:40 2018 -0400 + + Revert "Allow multiply-defined absolute symbols when they have the same value." + + This reverts commit 5dc824ed42cd173c1525f5abc76f4091f11a4dbc. + +diff --git a/gold/ChangeLog-2017 b/gold/ChangeLog-2017 +index b2a47710b5..d7ca1b48c0 100644 +--- a/gold/ChangeLog-2017 ++++ b/gold/ChangeLog-2017 +@@ -114,11 +114,6 @@ + (localedir): Define as @localedir@. + (gnulocaledir, gettextsrcdir): Use @datarootdir@. + +-2017-11-28 Cary Coutant <ccoutant@gmail.com> +- +- * resolve.cc (Symbol_table::resolve): Allow multiply-defined absolute +- symbols when they have the same value. +- + 2017-11-28 Cary Coutant <ccoutant@gmail.com> + + * object.h (class Sized_relobj_file): Remove discarded_eh_frame_shndx_. +diff --git a/gold/resolve.cc b/gold/resolve.cc +index 4a5784cf8b..803576bfed 100644 +--- a/gold/resolve.cc ++++ b/gold/resolve.cc +@@ -247,28 +247,18 @@ Symbol_table::resolve(Sized_symbol<size>* to, + Object* object, const char* version, + bool is_default_version) + { +- bool to_is_ordinary; +- const unsigned int to_shndx = to->shndx(&to_is_ordinary); +- + // It's possible for a symbol to be defined in an object file + // using .symver to give it a version, and for there to also be + // a linker script giving that symbol the same version. We + // don't want to give a multiple-definition error for this + // harmless redefinition. ++ bool to_is_ordinary; + if (to->source() == Symbol::FROM_OBJECT + && to->object() == object +- && to->is_defined() + && is_ordinary ++ && to->is_defined() ++ && to->shndx(&to_is_ordinary) == st_shndx + && to_is_ordinary +- && to_shndx == st_shndx +- && to->value() == sym.get_st_value()) +- return; +- +- // Likewise for an absolute symbol defined twice with the same value. +- if (!is_ordinary +- && st_shndx == elfcpp::SHN_ABS +- && !to_is_ordinary +- && to_shndx == elfcpp::SHN_ABS + && to->value() == sym.get_st_value()) + return; + +@@ -360,8 +350,8 @@ Symbol_table::resolve(Sized_symbol<size>* to, + && (sym.get_st_bind() == elfcpp::STB_WEAK + || to->binding() == elfcpp::STB_WEAK) + && orig_st_shndx != elfcpp::SHN_UNDEF ++ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF + && to_is_ordinary +- && to_shndx != elfcpp::SHN_UNDEF + && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. + && to->symsize() != 0 + && (sym.get_st_type() != to->type() +@@ -372,7 +362,7 @@ Symbol_table::resolve(Sized_symbol<size>* to, + { + Symbol_location fromloc + = { object, orig_st_shndx, static_cast<off_t>(sym.get_st_value()) }; +- Symbol_location toloc = { to->object(), to_shndx, ++ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), + static_cast<off_t>(to->value()) }; + this->candidate_odr_violations_[to->name()].insert(fromloc); + this->candidate_odr_violations_[to->name()].insert(toloc); diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch new file mode 100644 index 000000000000..919a3920727f --- /dev/null +++ b/pkgs/development/tools/misc/binutils/support-ios.patch @@ -0,0 +1,112 @@ +diff --git a/bfd/config.bfd b/bfd/config.bfd +index f04a993f06..3357022f35 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -238,7 +238,7 @@ case "${targ}" in + + # START OF targmatch.h + #ifdef BFD64 +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + targ_defvec=aarch64_mach_o_vec + targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +@@ -358,7 +358,7 @@ case "${targ}" in + targ_selvecs=arc_elf32_be_vec + ;; + +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + targ_defvec=arm_mach_o_vec + targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +diff --git a/configure.ac b/configure.ac +index aae94501e4..4b1121e0d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then + ;; + *-*-solaris2* | *-*-hpux11*) + ;; +- *-*-darwin* | *-*-aix*) ++ *-*-darwin* | *-*-ios* | *-*-aix*) + ;; + nvptx*-*-*) + ;; +@@ -706,7 +706,7 @@ case "${target}" in + ;; + x86_64-*-darwin[[912]]*) + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs target-libffi" + ;; + *-*-netware*) +@@ -788,7 +788,7 @@ esac + # Disable the go frontend on systems where it is known to not work. Please keep + # this in sync with contrib/config-list.mk. + case "${target}" in +-*-*-darwin* | *-*-cygwin* | *-*-mingw*) ++*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) + unsupported_languages="$unsupported_languages go" + ;; + esac +@@ -797,7 +797,7 @@ esac + # For testing, you can easily override this with --enable-libgo. + if test x$enable_libgo = x; then + case "${target}" in +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + # PR 46986 + noconfigdirs="$noconfigdirs target-libgo" + ;; +@@ -916,11 +916,11 @@ esac + case "${target}" in + *-*-chorusos) + ;; +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -936,7 +936,7 @@ case "${target}" in + noconfigdirs="$noconfigdirs ld gas gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -1226,7 +1226,7 @@ case "${host}" in + hppa*-*) + host_makefile_frag="config/mh-pa" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + host_makefile_frag="config/mh-darwin" + ;; + powerpc-*-aix*) +@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + # warn during gcc/ subconfigure; unless you're bootstrapping with + # -flto it won't be needed until after installation anyway. + case $target in +- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; ++ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; + *) if test x"$enable_lto" = x"yes"; then + AC_MSG_ERROR([LTO support is not enabled for this target.]) + fi +@@ -2590,7 +2590,7 @@ rm -f conftest* + # Decide which environment variable is used to find dynamic libraries. + case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; +- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; ++ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; + *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; + esac diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 2564b42731b3..6f4330ef0a9a 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "2.0.0.2"; + version = "2.18.1"; name = "checkbashisms-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; - sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; + url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; + sha256 = "1yaygfzv5jzvcbahz6sdfnzhch9mxgsrlsym2ad62nk0svsnp24n"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix new file mode 100644 index 000000000000..09220b2dc651 --- /dev/null +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, cmake, llvmPackages, ncurses }: + +let + src = fetchFromGitHub { + owner = "cquery-project"; + repo = "cquery"; + rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e"; + sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg"; + fetchSubmodules = true; + }; + + stdenv = llvmPackages.stdenv; + +in +stdenv.mkDerivation rec { + name = "cquery-${version}"; + version = "2018-03-25"; + + inherit src; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = with llvmPackages; [ clang clang-unwrapped llvm ncurses ]; + + cmakeFlags = [ + "-DSYSTEM_CLANG=ON" + "-DCLANG_CXX=ON" + ]; + + shell = stdenv.shell; + postFixup = '' + # We need to tell cquery where to find the standard library headers. + + standard_library_includes="\\\"-isystem\\\", \\\"${if (stdenv.hostPlatform.libc == "glibc") then stdenv.cc.libc.dev else stdenv.cc.libc}/include\\\"" + standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" + export standard_library_includes + + wrapped=".cquery-wrapped" + export wrapped + + mv $out/bin/cquery $out/bin/$wrapped + substituteAll ${./wrapper} $out/bin/cquery + chmod --reference=$out/bin/$wrapped $out/bin/cquery + ''; + + doInstallCheck = true; + installCheckPhase = '' + pushd ${src} + $out/bin/cquery --ci --clang-sanity-check && \ + $out/bin/cquery --ci --test-unit + ''; + + meta = with stdenv.lib; { + description = "A c/c++ language server powered by libclang"; + homepage = https://github.com/cquery-project/cquery; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.tobim ]; + priority = 3; + }; +} diff --git a/pkgs/development/tools/misc/cquery/wrapper b/pkgs/development/tools/misc/cquery/wrapper new file mode 100644 index 000000000000..f0bea41536d0 --- /dev/null +++ b/pkgs/development/tools/misc/cquery/wrapper @@ -0,0 +1,12 @@ +#! @shell@ -e + +initString="--init={\"extraClangArguments\": [@standard_library_includes@" + +if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then + read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} + initString+=$(printf ', \"%s\"' "${cflags_array[@]}") +fi + +initString+="]}" + +exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@" diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 37ec63627b15..cbf5883b2973 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -6,8 +6,6 @@ , utillinux }: -assert stdenv.isLinux -> (utillinux != null); - stdenv.mkDerivation rec { name = "creduce-${version}"; version = "2.7.0"; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 9a8c24fa1685..c4994ad24d79 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 makeWrapper ]; - buildInputs = [ libbsd perl SysCPU ]; + buildInputs = [ perl SysCPU libbsd ]; postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index b20f63e26253..ae8f17c213a9 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -2,14 +2,14 @@ , python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }: let - version = "${major}.13"; - major = "0.3"; + pname = "d-feet"; + version = "0.3.13"; in python3Packages.buildPythonApplication rec { - name = "d-feet-${version}"; + name = "${pname}-${version}"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; + url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll"; }; @@ -18,6 +18,14 @@ in python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "dfeet"; + versionPolicy = "none"; + }; + }; + meta = { description = "D-Feet is an easy to use D-Bus debugger"; @@ -26,7 +34,7 @@ in python3Packages.buildPythonApplication rec { and invoke methods on those interfaces. ''; - homepage = https://wiki.gnome.org/action/show/Apps/DFeet; + homepage = https://wiki.gnome.org/Apps/DFeet; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ktosiek ]; diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 9e2f35875583..9e8ce3d93314 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: +{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.0.4"; + version = "2.6.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; + sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r"; }; - nativeBuildInputs = [ makeWrapper python ]; + nativeBuildInputs = [ qmake makeWrapper python ]; - buildInputs = [ qt4 ]; + buildInputs = [ ctags ]; - postPatch = '' - sed -i build.py -e 's,qmake-qt4,qmake,' - ''; + dontUseQmakeConfigure = true; buildPhase = ":"; installPhase = '' - python build.py install --prefix="$out" + python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ --prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]} ''; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6e341b577cfb..b786aa2123f6 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,26 +1,34 @@ -{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: +{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.5"; + name = "help2man-1.47.6"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"; + sha256 = "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr"; }; - nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; + nativeBuildInputs = [ gettext LocaleGettext ]; buildInputs = [ perl LocaleGettext ]; doCheck = false; # target `check' is missing patches = if hostPlatform.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; - postInstall = - '' wrapProgram "$out/bin/help2man" \ - --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)" \ - ${stdenv.lib.optionalString hostPlatform.isCygwin "--prefix PATH : ${gettext}/bin"} - ''; - + # We don't use makeWrapper here because it uses substitutions our + # bootstrap shell can't handle. + postInstall = '' + gettext_perl="$(echo ${LocaleGettext}/lib/perl*/site_perl)" + mv $out/bin/help2man $out/bin/.help2man-wrapped + cat > $out/bin/help2man <<EOF + #! $SHELL -e + export PERL5LIB=\''${PERL5LIB:+:}$gettext_perl + ${stdenv.lib.optionalString hostPlatform.isCygwin + "export PATH=\''${PATH:+:}${gettext}/bin"} + exec -a \$0 $out/bin/.help2man-wrapped "\$@" + EOF + chmod +x $out/bin/help2man + ''; meta = with stdenv.lib; { description = "Generate man pages from `--help' output"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index cf9057d35e2c..38b28ec0f607 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub +{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc @@ -54,8 +54,8 @@ let TextDiff TextTable XMLSimple - nixUnstable - nixUnstable.perl-bindings + nix + nix.perl-bindings git boehmgc ]; @@ -77,12 +77,12 @@ in releaseTools.nixBuild rec { [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt guile # optional, for Guile + Guix support - perlDeps perl nixUnstable + perlDeps perl nix postgresql # for running the tests ]; hydraPath = lib.makeBinPath ( - [ sqlite subversion openssh nixUnstable coreutils findutils pixz + [ sqlite subversion openssh nix coreutils findutils pixz gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); @@ -117,7 +117,7 @@ in releaseTools.nixBuild rec { --prefix PATH ':' $out/bin:$hydraPath \ --set HYDRA_RELEASE ${version} \ --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nixUnstable.name or "unknown"} + --set NIX_RELEASE ${nix.name or "unknown"} done ''; # */ diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 775a31df2b17..5176be123018 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; description = "Tools for development and testing of the Intel DRM driver"; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 78b5df21fdea..4aa9dc8b89a0 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "1a9n7s9r0klqvpyr5d3a410cchbsb0syx6cqwbhhnihqyw8dcx1i"; - "i686-linux" = "0snnm5jwynvk6ahgl42yzl2jhld0ykn79rlcq9dsv2gpqnjb2mmv"; - "x86_64-darwin" = "0qw3xkj3n3aja8s8n9r4hbr65jm9m6dgfjhhnrln434648rx7z4v"; + "x86_64-linux" = "1rg4j5jm8mkscrwlbx5qk3qjnblyr8z9x5npvyi73zm0ism0gv4j"; + "i686-linux" = "14swgx9sf23pns2pj30yyhd0p0rnykdimdrnj8rb0r1pqszw57qx"; + "x86_64-darwin" = "10l13r47nx74xicnjgb56nvgvx2al1zx1p8f09pjldaa2gjlll2k"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index d7013ef46eb2..17620c9df6c8 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "0kgsafjn8wzrmiklfc8jg0h3cx25lhlkby8yz35wgpx4wbk3vfjx"; - "x86_64-darwin" = "0i2kq9vyjv151kk7h3dl3hjrqqgxsg0qqxdqwjwlz9ja5axzlxhd"; + "x86_64-linux" = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk"; + "x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/lsof/darwin-dfile.patch b/pkgs/development/tools/misc/lsof/darwin-dfile.patch new file mode 100644 index 000000000000..9952228e613a --- /dev/null +++ b/pkgs/development/tools/misc/lsof/darwin-dfile.patch @@ -0,0 +1,12 @@ +diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c +--- a/dialects/darwin/libproc/dfile.c 2018-02-14 09:28:06.000000000 -0500 ++++ b/dialects/darwin/libproc/dfile.c 2018-04-16 18:52:40.828715293 -0400 +@@ -43,7 +43,7 @@ + #include "lsof.h" + + #if defined(PROC_FP_GUARDED) +-#extern struct pff_tab Pgf_tab[]; ++extern struct pff_tab Pgf_tab[]; + #endif /* defined(PROC_FP_GUARDED) */ + + diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 224e0aba6ef7..ae62c8c7aaef 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,13 +4,13 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in stdenv.mkDerivation rec { name = "lsof-${version}"; - version = "4.89"; + version = "4.90"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; src = fetchurl { - urls = + urls = ["https://fossies.org/linux/misc/lsof_4.90.tar.bz2"] ++ # Mirrors seem to be down... ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] ++ map ( # the tarball is moved after new version is released @@ -23,22 +23,23 @@ stdenv.mkDerivation rec { + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" ) [ false true ] ; - sha256 = "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41"; + sha256 = "1xhn3amvl5mmwji5g90nkw7lfmh2494v18qbv1f729hrg468853g"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - patches = [ ./dfile.patch ]; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|lcurses|lncurses|g' Configure ''; # Stop build scripts from searching global include paths - LSOF_INCLUDE = "${stdenv.cc.libc}/include"; + LSOF_INCLUDE = "${stdenv.lib.getDev stdenv.cc.libc}/include"; configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; preBuild = '' - sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' for filepath in $(find dialects/${dialect} -type f); do sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath done @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.dezgeg ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/lsof/dfile.patch b/pkgs/development/tools/misc/lsof/dfile.patch deleted file mode 100644 index 47202d5ebeab..000000000000 --- a/pkgs/development/tools/misc/lsof/dfile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lsof_4.89_src/dialects/darwin/libproc/dfile.c 2014-10-30 12:39:46.000000000 +0100 -+++ lsof_4.89_src/dialects/darwin/libproc/dfile_new.c 2016-10-04 13:44:58.000000000 +0200 -@@ -286,13 +286,13 @@ - - #if defined(PROC_FP_GUARDED) - if (extra > 1) -- putchar(`,'); -+ putchar(','); - if (lf->guardflags) { - struct pff_tab *tp; - long gf; - - (void) printf("guard="); -- tp = Pgf_tab; -+ tp = Pff_tab; - gf = lf->guardflags; - while (gf && !FsvFlagX) { - while (tp->nm) { diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index eea54dbdf8be..8294b68126fc 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "17wsdhkw8c8gb0d1bcgw4dfx2ljrq4rzgpi8sb9y9hs6pbwqy0xk"; + sha256 = "0x3b6jps053s9pxc7bslj5qsn2z53yf0fk9pcrmxjf9yri17n3qr"; }; nativeBuildInputs = [ pkgconfig ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tracing tools (kernel + user space) for Linux"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index edfc7dc30ca6..b708ce490d29 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 45dd86db41b2..36a89726e81c 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lttv-1.5"; src = fetchurl { - url = "http://lttng.org/files/packages/${name}.tar.bz2"; + url = "https://lttng.org/files/packages/${name}.tar.bz2"; sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix new file mode 100644 index 000000000000..df4b91a79b09 --- /dev/null +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gdb }: + +stdenv.mkDerivation rec { + name = "pwndbg-2018-04-06"; + + src = fetchFromGitHub { + owner = "pwndbg"; + repo = "pwndbg"; + rev = "e225ba9f647ab8f7f4871075529c0ec239f43300"; + sha256 = "1s6m93qi3baclgqqii4fnmzjmg0c6ipkscg7xiljaj5z4bs371j4"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with pythonPackages; [ + future + isort + psutil + pycparser + pyelftools + python-ptrace + ROPGadget + six + unicorn + pygments + enum34 + ]; + + installPhase = '' + mkdir -p $out/share/pwndbg + cp -r *.py pwndbg $out/share/pwndbg + makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ + --add-flags "-q -x $out/share/pwndbg/gdbinit.py" + ''; + + preFixup = '' + sed -i "/import sys/a import sys; sys.path[0:0] = '$PYTHONPATH'.split(':')" \ + $out/share/pwndbg/gdbinit.py + ''; + + meta = with stdenv.lib; { + description = "Exploit Development and Reverse Engineering with GDB Made Easy"; + homepage = http://pwndbg.com; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index f5da3f9daa4d..fce2fa4fa4b4 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.21"; + version = "4.22"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw"; + sha256 = "17dkpnsjxmys1ydidm9wcvc3wscsz44fmlxw3dclspn9cj9d1306"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index d72fc86d7ee5..dbd036d03fdf 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,7 +2,7 @@ , libaio }: stdenv.mkDerivation rec { - name = "sysbench-1.0.13"; + name = "sysbench-1.0.14"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ vim mysql.connector-c libaio ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = "1.0.13"; - sha256 = "1inxyjpcyv2ag3k5riwlaq91362y16yks75vs2crmhjxlxdspy8c"; + rev = "1.0.14"; + sha256 = "0mp1wqdm87zqyn55z23qf1izqz7ijgcbsysdwqndd98w6m5d86rp"; }; meta = { diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 78195e994c94..2ea87fe6d7f1 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -8,18 +8,18 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" let - uhdVer = "003_010_003_000"; - ImgVer = stdenv.lib.replaceStrings ["_"] ["."] uhdVer; + uhdVer = "v" + version; + ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... - version = "3.10.3.0"; + # and xxx.yyy.zzz. Hrmpf... style keeps changing + version = "3.11.0.0"; # Firmware images are downloaded (pre-built) from: # http://files.ettus.com/binaries/images/ uhdImagesSrc = fetchurl { - url = "http://files.ettus.com/binaries/images/uhd-images_${ImgVer}-release.tar.gz"; - sha256 = "198awvw6zsh19ydgx5qry5yc6yahdval9wjrsqbyj51pnr6s5qvy"; + url = "http://files.ettus.com/binaries/images/${ImgVer}"; + sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z"; }; in stdenv.mkDerivation { @@ -28,19 +28,24 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_${uhdVer}"; - sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3"; + rev = "${uhdVer}"; + sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q"; }; enableParallelBuilding = true; - cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"; + # ABI differences GCC 7.1 + # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 + + cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ + [ (stdenv.lib.optionalString stdenv.isArm "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; # Build only the host software preConfigure = "cd host"; + patches = if stdenv.isArm then ./neon.patch else null; postPhases = [ "installFirmware" ]; @@ -60,6 +65,6 @@ in stdenv.mkDerivation { homepage = https://uhd.ettus.com/; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz ]; + maintainers = with maintainers; [ bjornfor fpletz tomberek ]; }; } diff --git a/pkgs/development/tools/misc/uhd/neon.patch b/pkgs/development/tools/misc/uhd/neon.patch new file mode 100644 index 000000000000..18ec59c1d64b --- /dev/null +++ b/pkgs/development/tools/misc/uhd/neon.patch @@ -0,0 +1,19 @@ +Description: When building for armhf, enable NEON + NEON is part of the armhf baseline, so this will always be enabled on + armhf. +Author: Paul Tagliamonte <paultag@debian.org> +Bug-Debian: https://bugs.debian.org/873608 +Origin: vendor +Last-Update: 2017-08-29 + +--- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt ++++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt +@@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V + ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S + ) ++ ++ SET ( CMAKE_CXX_FLAGS "-mfpu=neon" ) + ENDIF() + + ######################################################################## diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index 7e8725745c2e..e0288b686efe 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy"; - version = "0.570"; + version = "0.580"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "09cz0h4d6xcdqlchw080nkjlwki3mgjrlvfnj5hxxwi3cgv9imw3"; + sha256 = "3bd95a1369810f7693366911d85be9f0a0bd994f6cb7162b7a994e5ded90e3d9"; }; propagatedBuildInputs = [ lxml typed-ast psutil ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 186b78ce3f36..6f136a7ef289 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, ncurses, ocaml, writeText}: +{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch ]; + patches = [ ./ldconf.patch ./install_topfind.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; + sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; + }) + ]; dontAddPrefix=true; @@ -34,6 +39,9 @@ stdenv.mkDerivation rec { if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi + if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs" + fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "$createFindlibDestdir"; then mkdir -p $OCAMLFIND_DESTDIR diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index b3a37e3f7608..3caeabaae78b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -1,5 +1,5 @@ { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler -, camlp4 +, camlp4, ocsigen_deriving }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib jbuilder camlp4 ]; + buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ]; buildPhase = "jbuilder build -p js_of_ocaml-camlp4"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 11df26818c1f..6d269552f628 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "17w1pqjk521jd4yp34miyif0cxjxchnw59xhj188qfl635ykb4k8"; + sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9"; }; buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix new file mode 100644 index 000000000000..31a5c3ea17bb --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx +, ocaml-migrate-parsetree, ppx_tools_versioned +, js_of_ocaml, ocaml_lwt +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-lwt-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ]; + + buildPhase = "jbuilder build -p js_of_ocaml-lwt"; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix new file mode 100644 index 000000000000..8f32887c5bf5 --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -0,0 +1,15 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler +, js_of_ocaml, ppx_deriving +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-ppx_deriving_json-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ js_of_ocaml ppx_deriving ]; + + buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json"; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix new file mode 100644 index 000000000000..041fd71f92fa --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler +, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned +, js_of_ocaml, reactivedata, tyxml +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-tyxml-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + + propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; + + buildPhase = "jbuilder build -p js_of_ocaml-tyxml"; +} diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index b6e439e4e174..3f42e71e7783 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: let - version = "0.11.0"; + version = "0.12.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "0c8lv15ngmrc471jmkv0jp3d573chibwnjlavps047d9hd8gwxak"; + sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 2876464ab502..df480903d154 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -10,9 +10,16 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"' + ''; + + buildPhase = "ocamlbuild src/ocamlify.native"; + + installPhase = '' + mkdir -p $out/bin + mv _build/src/ocamlify.native $out/bin/ocamlify + ''; dontStrip = true; diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 23141185f68e..017ef20e81c6 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { walk parse trees. ''; homepage = http://www.antlr.org/; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index 1706b5448e14..3a273e1ddbfa 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -1,20 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "peg-0.1.4"; + name = "peg-0.1.18"; src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "01agf4fbqv0r1xyqvj0va8kcrh3f2ka59f1aqvzfrabn7n5p8ik4"; + sha256 = "114h1y4k8fwcq9m0hfk33dsp7ah8zxzjjzlk71x4iirzczfkn690"; }; preBuild="makeFlagsArray+=( PREFIX=$out )"; - preInstall='' - mkdir -pv $out/bin $out/share/man/man1 - cp -pv *.1 $out/share/man/man1 - ''; - meta = { homepage = http://piumarta.com/software/peg/; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 66895fb7fd3e..6b497e456300 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -20,7 +20,7 @@ let configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = "-std=gnu++98"; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index c5c406ef36c0..153c0f76a405 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "10.1.2"; + version = "11.9.0"; src = fetchPypi { inherit pname version; - sha256 = "ce6dbb305fb1f262dba0dcb50c06591e4d146f7bfe079cc9f0ce3f89c7516ae9"; + sha256 = "7b3c52fb57e17ca61b6141b75c8f5ba61a95c713ca470754240f7f1dbd0a4968"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index de94b7a8eff3..de94b7a8eff3 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix new file mode 100644 index 000000000000..5e88384c58db --- /dev/null +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib +, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +}: + +let + rpath = stdenv.lib.makeLibraryPath [ + cairo + stdenv.cc.cc + gdk_pixbuf + fontconfig + pango + atk + gtk2 + glib + freetype + dbus + nss + nspr + alsaLib + cups + expat + libudev + + gnome2.GConf + + xorg.libX11 + xorg.libXcursor + xorg.libXtst + xorg.libxcb + xorg.libXext + xorg.libXi + xorg.libXdamage + xorg.libXrandr + xorg.libXcomposite + xorg.libXfixes + xorg.libXrender + xorg.libXScrnSaver + ]; +in stdenv.mkDerivation rec { + name = "react-native-debugger-${version}"; + version = "0.7.18"; + + src = fetchurl { + url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; + sha256 = "186n438sy9wzrx2zdw4qq4hsz89wiy01bpfa6fdjisvxgz6r8sgw"; + }; + + buildInputs = [ unzip ]; + buildCommand = '' + shopt -s extglob + mkdir -p $out + unzip $src -d $out + + mkdir $out/{lib,bin,share} + mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/!(lib|share|bin) $out/share + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath ${rpath}:$out/lib \ + $out/share/React\ Native\ Debugger + + ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + ''; + + desktopItem = makeDesktopItem { + name = "rndebugger"; + exec = "React\\ Native\\ Debugger"; + desktopName = "React Native Debugger"; + genericName = "React Native Debugger"; + categories = "Development;Tools;"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/jhen0409/react-native-debugger; + license = licenses.mit; + description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 73e64c83696d..2f4c89ab43be 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,27 +4,27 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.32.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; - rev = version; - sha256 = "15m1y468c7ixzxwx29wazag0i19a3bmzjp53np6b62sf9wfzbsfa"; + rev = "v${version}"; + sha256 = "1bpya490qh2jvq99mdlcifj6mgn3yxr0sqas6y5xw842b46g6hi6"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ llvmPackages.clang-unwrapped ]; + buildInputs = [ llvmPackages.clang-unwrapped.lib ]; configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" + export LIBCLANG_PATH="${llvmPackages.clang-unwrapped.lib}/lib" ''; postInstall = '' - wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" + wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped.lib}/lib" ''; - cargoSha256 = "01h0y5phdv3ab8mk2yxw8lgg9783pjjnjl4087iddqhqanlv600d"; + cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 39f26ed97cc8..cc56e57794a2 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "1m119kbsr6gm8a37q92rflp5mp3fjzw8cy4r5j4bnihkai7khq94"; + sha256 = "1pryrz4ry0pk6kawvj8sxhpqh6c6npxhm187412y2l598dcf9pwl"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.36"; + version = "2.37"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix new file mode 100644 index 000000000000..5d1f015e8052 --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -0,0 +1,19 @@ +{ buildSetupcfg, fetchFromGitHub, lib }: + +buildSetupcfg rec { + info = import ./info.nix; + src = fetchFromGitHub { + owner = "target"; + repo = "setupcfg2nix"; + rev = info.version; + sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6"; + }; + application = true; + meta = { + description = "Generate nix expressions from setup.cfg for a python package."; + homepage = https://github.com/target/setupcfg2nix; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix new file mode 100644 index 000000000000..b0d5873ed63c --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -0,0 +1,7 @@ +{ + pname = ''setupcfg2nix''; + version = ''1.1.0''; + install_requires = [ + ''setuptools'' + ]; +} diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index 2d36b09adb35..3d8027a12994 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sigrok-cli-0.7.0"; src = fetchurl { - url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; + url = "https://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index de0d7fc54de2..bb99e887ac6f 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,29 +1,33 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux }: +, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, go-md2man }: with stdenv.lib; let - version = "0.1.28"; + version = "0.1.29"; src = fetchFromGitHub { rev = "v${version}"; owner = "projectatomic"; repo = "skopeo"; - sha256 = "068nwrr3nr27alravcq1sxyhdd5jjr24213vdgn1dqva3885gbi0"; + sha256 = "1lhzbyj2mm25x12s7g2jx4v8w19izjwlgx4lml13r5yy1spn65k2"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; + goPackagePath = "github.com/projectatomic/skopeo"; + in buildGoPackage rec { name = "skopeo-${version}"; - inherit src; + inherit src goPackagePath; + + outputs = [ "bin" "man" "out" ]; - goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}"; @@ -33,10 +37,17 @@ buildGoPackage rec { export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" ''; + postBuild = '' + # depends on buildGoPackage not changing … + pushd ./go/src/${goPackagePath} + make install-docs MANINSTALLDIR="$man" + popd + ''; + meta = { description = "A command line utility for various operations on container images and image repositories"; homepage = https://github.com/projectatomic/skopeo; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ]; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index fc6bf1921e2f..35e0d276101b 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -3,19 +3,18 @@ let spirv_sources = { - # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in - # `<vulkan-loader-repo>/external_revisions/spirv-tools_revision`. + # `glslang` requires a specific version of `spirv-tools` and `spirv-headers` as specified in `known-good.json`. tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "7e2d26c77b606b21af839b37fd21381c4a669f23"; - sha256 = "1nlzj081v1xdyfz30nfs8hfcnqd072fra127h46gav179f04kss2"; + rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8"; + sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "2bb92e6fe2c6aa410152fc6c63443f452acb1a65"; - sha256 = "1rgjd7kpa7xpbwpzd6m3f6yq44s9xn5ddhz135213pxwbi5c0c26"; + rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00"; + sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm"; }; }; @@ -23,7 +22,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2017-09-01"; + version = "2018-02-05"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index eb626d0aa586..f6687f4e4328 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,21 +1,29 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { name = "textql-${version}"; version = "2.0.3"; - rev = "${version}"; goPackagePath = "github.com/dinedal/textql"; src = fetchFromGitHub { - inherit rev; - owner = "dinedal"; - repo = "textql"; + owner = "dinedal"; + repo = "textql"; + rev = version; sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; + postInstall = '' + install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 + ''; + + # needed for tests + nativeBuildInputs = [ sqlite ]; + goDeps = ./deps.nix; + doCheck = true; + meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = https://github.com/dinedal/textql; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix new file mode 100644 index 000000000000..10a27e2e3b88 --- /dev/null +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "toxiproxy-${version}"; + version = "2.1.3"; + src = fetchFromGitHub { + owner = "Shopify"; + repo = "toxiproxy"; + rev = "v${version}"; + sha256 = "1a7yry846iwi9cs9xam2vjbw73fjy45agjrwk214k0n1ziaawz2f"; + }; + + goPackagePath = "github.com/Shopify/toxiproxy"; + subPackages = ["cmd" "cli"]; + buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}"; + + postInstall = '' + mv $bin/bin/cli $bin/bin/toxiproxy-cli + mv $bin/bin/cmd $bin/bin/toxiproxy-cmd + ''; + + meta = { + description = "Proxy for for simulating network conditions."; + maintainers = with lib.maintainers; [ avnik ]; + }; +} diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index e5a3004bfdb6..3891617e1c79 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation { - name = "tradcpp-0.4"; + name = "tradcpp-0.5.2"; src = fetchurl { - url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.4.tar.gz; - sha256 = "c60aa356945e0b6634bd449ead6a4fca0059d2ce3ae8044cf982140bbd54e688"; + url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; # tradcpp only comes with BSD-make Makefile; the patch adds configure support diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 0822b33aef00..aafff7290c5c 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -6,11 +6,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "vcstool"; - version = "0.1.33"; + version = "0.1.35"; src = fetchPypi { inherit pname version; - sha256 = "1140d3ecafb2c42c2c1a309950c7f327b09b548c00fbf6e37c8f44b8a610dfbc"; + sha256 = "c52ef4bae424deb284d042005db22844dae290758af77d76cac37d26bed9ad1c"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index d0836daf6135..a36c4f4bf806 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -258,6 +258,27 @@ let }; PackageTypes = [ "com.apple.package-type.wrapper.application" ]; } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework"; + Name = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + }; + PackageTypes = [ "com.apple.package-type.wrapper" ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } ]; in diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index c3b26a6ac796..70100c196973 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -5,7 +5,7 @@ xcbuildBuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates $xcbuildFlags build runHook postBuild } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 3a1547440fd6..06c48ec0a73f 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation { ln -s $file done + mkdir $out/usr + ln -s $out/bin $out/usr/bin + mkdir -p $out/Library/Xcode/ ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index bd7dd5924c06..eefe7dcfa74a 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.5.1"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "13m1y1c2h1fvq8fw1vlmnmnh3jx3l2cx7mz3x55sbgwcinzhkz9m"; + sha256 = "0bblp1jy4s9y5rpcqn40w61qwsmxr342xkcn7ykk88i7sng2cgfw"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index c911cdb58250..201e85985d82 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "yq"; - version = "2.4.1"; + version = "2.5.0"; propagatedBuildInputs = [ pyyaml xmltodict jq ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "4833d4055b0f1c1f1a2fd292421b3472da39c7dc2727d7819efd11065a5fd310"; + sha256 = "e9fd2aa32defcd051058e3b6f665873282aa4eed19e11b1db94fe70847535d4c"; }; meta = with lib; { diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index b15109757f2c..80731de84fb2 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "grails-${version}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0rr1q84zgr8xvy40w0wq9ai9gilyn6by4j6av02aszjxciqblvzd"; + sha256 = "087bd1vjpg0wghqbkyldmzma7ziqi7hf745chfr31x8cn5ys0jji"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 03db11df5e48..df46cf3ab920 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -18,11 +18,11 @@ let runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.14.9"; + version = "5.15.0"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "0hq9pcfw1ic2acaknwp2d5yphg901dmk7d4n7ikx42nya8p39c6j"; + sha256 = "17pxgxpss5jxzpmcim7hkyyj0fgyxwdiyxb2idpsna2hmhaipyxa"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index d3e43371c6d2..6dd9dd6f8e1a 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.13.1"; - sha256 = "0ikasm20wq56gvn3j28hxjwbvqqzqj5w0p2sc3ss00v58w5kady4"; + version = "6.14.1"; + sha256 = "1hxyasy42ih9brgp37n9j85s5vwir3g32k5i3j0vx2kizy4xlphi"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 939322a1bc9f..942c6cc3fd83 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.10.0"; - sha256 = "06lhnasmbpwvyv5dfc9kmjj32djllwgvb1xl778cnswdc5qlwbdp"; + version = "8.11.1"; + sha256 = "12kmsh5cl72dq5hzik1cczn2n5crbfqqd1xmrzqgryipx98yp9j0"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 71d0f6e21f97..f6f8aa8d1ab0 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.8.0"; - sha256 = "1b0ynhvnq25w29rmshim0dn4m1dknkn1p52idi6acpzswi4vn1h7"; + version = "9.11.1"; + sha256 = "0k4xkcymf4y3k2bxjryb2lj97bxnng75x7a77i2wgx94749kvp13"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 673ad585dbfb..efc30c1bbf3c 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -28,7 +28,7 @@ let qt4 = pyqt4.qt; in buildPythonApplication rec { - version = "2.0.50"; + version = "2.0.51"; name = "anki-${version}"; src = fetchurl { @@ -37,7 +37,7 @@ in buildPythonApplication rec { # "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "05hq1f9m4vv3zpv7d05m4y6d82ibp1kk0gpwp73vza1ffq0wdcip"; + sha256 = "17prfkz9hbz1sdb62ddi6m4jwsb50n08myhai997x8d0r0xxilw0"; }; propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 01829238daa2..0de118234a7d 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = http://cataclysmdda.org/; + homepage = https://cataclysmdda.org/; license = licenses.cc-by-sa-30; maintainers = [ maintainers.skeidel ]; platforms = platforms.unix; diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index fcc2481cb695..fe4dcb251753 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = http://cataclysmdda.org/; + homepage = https://cataclysmdda.org/; license = licenses.cc-by-sa-30; platforms = platforms.unix; }; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index f77dfe8ba945..70413f0f941b 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,19 +1,24 @@ { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig -, libvorbis, libGL, boost, cmake }: - +, libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 +}: stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "1822release"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8"; + sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph"; }; - buildInputs = [ SDL2 SDL2_image libGL boost libvorbis ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share" + export makeFlags="$makeFlags DESTDIR=$(out)" + ''; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix index 1fd64f5b00d0..682d1e05069a 100644 --- a/pkgs/games/dxx-rebirth/assets.nix +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -42,7 +42,7 @@ let meta = with stdenv.lib; { description = "Descent ${toString ver} assets from GOG"; - homepage = http://www.dxx-rebirth.com/; + homepage = https://www.dxx-rebirth.com/; license = licenses.unfree; maintainers = with maintainers; [ peterhoeg ]; hydraPlatforms = []; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 3b05ed142929..b780d5327f2e 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -4,7 +4,7 @@ let music = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa"; + url = "https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa"; sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc"; }; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { version = "0.59.100"; src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz"; + url = "https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz"; sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka"; }; @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source Port of the Descent 1 and 2 engines"; - homepage = http://www.dxx-rebirth.com/; + homepage = https://www.dxx-rebirth.com/; license = licenses.free; maintainers = with maintainers; [ viric peterhoeg ]; platforms = with platforms; linux; diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index baf8b80add10..020a4593de24 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -16,7 +16,7 @@ let meta = with stdenv.lib; { description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; - homepage = http://www.dxx-rebirth.com/; + homepage = https://www.dxx-rebirth.com/; license = with licenses; [ free unfree ]; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix new file mode 100644 index 000000000000..6bbb58c1a18c --- /dev/null +++ b/pkgs/games/enyo-doom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab, cmake, qtbase }: + +stdenv.mkDerivation rec { + name = "enyo-doom-${version}"; + version = "1.05"; + + src = fetchFromGitLab { + owner = "sdcofer70"; + repo = "enyo-doom"; + rev = version; + sha256 = "1bmpgqwcp7640dbq1w8bkbk6mkn4nj5yxkvmjrl5wnlg0m1g0jr7"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase ]; + + enableParallelBuilding = true; + + meta = { + homepage = "https://gitlab.com/sdcofer70/enyo-doom"; + description = "Frontend for Doom engines"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.tadfisher ]; + }; +} diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index b3319bae9733..2cc63e9ecdef 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -19,15 +19,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "0s7cn5xhzwn793bmvlhlmibhbxdpfmpnpn33k5a4hdprc5gc27rg"; version = "0.16.24"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; }; headless = { - stable = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; }; - experimental = bdist { sha256 = "1ff4yjybiqr5kw583hmxkbrbxa3haj4bkjj8sx811c3s269gspi2"; version = "0.16.24"; }; + stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; + experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; }; demo = { - stable = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; }; + stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; experimental = bdist { }; }; }; @@ -49,7 +49,7 @@ let actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.15.40" + , version ? "0.16.36" , fetcher ? fetchurl , nameMut ? x: x }: diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 263bf5c29dfc..a096b17b71a5 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "freecell-solver-${version}"; - version = "4.16.0"; + version = "4.18.0"; src = fetchurl { url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; - sha256 = "1ihrmxbsli7c1lm5gw9xgrakyn4nsmaj1zgk5gza2ywnfpgdb0ac"; + sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 82d573e47a23..b0bead7bbf9e 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,7 +12,7 @@ let gtkName = if gtkClient then "-gtk" else ""; name = "freeciv"; - version = "2.5.10"; + version = "2.5.11"; in stdenv.mkDerivation { name = "${name}${sdlName}${gtkName}-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; - sha256 = "00mkzhfcbc27d8m7hj644h8lyc9mb8nhqfcngc52zkidarb438f8"; + sha256 = "1bcs4mj4kzkpyrr0yryydmn0dzcqazvwrf02nfs7r5zya9lm572c"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix new file mode 100644 index 000000000000..89b9fca06eab --- /dev/null +++ b/pkgs/games/gcompris/default.nix @@ -0,0 +1,37 @@ +{stdenv, cmake, qtbase, fetchurl, qtdeclarative, qtmultimedia, qttools, qtsensors, qmlbox2d, gettext, qtquickcontrols, qtgraphicaleffects, makeWrapper, + gst_all_1, ninja +}: +stdenv.mkDerivation rec { + version = "0.90"; + name = "gcompris-${version}"; + + src = fetchurl { + url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; + sha256 = "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza"; + }; + + cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"; + + nativeBuildInputs = [ cmake ninja makeWrapper ]; + buildInputs = [ qtbase qtdeclarative qttools qtsensors qmlbox2d gettext qtquickcontrols qtmultimedia qtgraphicaleffects] ++ soundPlugins; + soundPlugins = with gst_all_1; [gst-plugins-good gstreamer gst-plugins-base gst-plugins-bad]; + + postInstall = '' + # install .desktop and icon file + mkdir -p $out/share/applications/ + mkdir -p $out/share/icons/hicolor/256x256/apps/ + cp ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop + cp -r ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png + + wrapProgram "$out/bin/gcompris-qt" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with stdenv.lib; { + description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10"; + homepage = "https://gcompris.net/"; + maintainers = [ maintainers.guibou ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 62ab349afa85..d622299cf0f3 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.2.5"; + version = "3.3.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1x4v3cv448wqx4cdhs28nxrv0lm2c2pd9i2hm92q9lg5yw8vv19q"; + sha256 = "1q1hjfxhksny236a058ys36mpdl434vbmgapqr51n82pia838h2l"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index eb9bed9e1d95..5ab9954739b2 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintlOrEmpty }: +{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: stdenv.mkDerivation rec { name = "lbreakout2-${version}"; version = "2.6.5"; - buildInputs = [ SDL SDL_mixer zlib libpng ] ++ libintlOrEmpty; + buildInputs = [ SDL SDL_mixer zlib libpng libintl ]; src = fetchurl { url = "mirror://sourceforge/lgames/${name}.tar.gz"; sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "Breakout clone from the LGames series"; homepage = http://lgames.sourceforge.net/LBreakout2/; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 9e1e512d711e..dce52d4c2957 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.libXi xorg.xinput + xorg.libXxf86vm ]; preConfigure = '' diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index d3fb8c7bc58e..e4bcef29878c 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng, - SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline, - libxkbcommon, epoxy, at-spi2-core, dbus, libxml2, - enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther +{ stdenv, fetchurl, cmake, pkgconfig +, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal +, freealut, readline, gcc-unwrapped +, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: let @@ -10,32 +10,38 @@ let sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; }; in stdenv.mkDerivation rec { - version = "7.0"; + version = "8.1"; name = "openclonk-${version}"; src = fetchurl { - url = "http://www.openclonk.org/builds/release/7.0/openclonk-${version}-src.tar.bz2"; - sha256 = "0ch71dqaaalg744pc1gvg6sj2yp2kgvy2m4yh6l7ljkpf8fj66mw"; + url = "http://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; + sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; }; postInstall = '' mv -v $out/games/openclonk $out/bin/ '' + stdenv.lib.optionalString enableSoundtrack '' - cp -v ${soundtrack_src} $out/share/games/openclonk/Music.ocg + ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ - cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL - SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp - pkgconfig gtest gmock readline epoxy at-spi2-core dbus libxml2 + SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut + readline ]; + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; + + cmakeBuildType = "RelWithDebInfo"; + meta = with stdenv.lib; { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; - homepage = http://openclonk.org; + homepage = https://www.openclonk.org; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; - platforms = platforms.all; + maintainers = with maintainers; [ lheckemann ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index c6aedcd172e3..069ed900e8f0 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "openra-${version}"; - version = "20180218"; + version = "20180307"; meta = with stdenv.lib; { description = "Real Time Strategy game engine recreating the C&C titles"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "OpenRA"; repo = "OpenRA"; rev = "release-${version}"; - sha256 = "1853p2q88602s3zf22wg1h2qx2x661n20bcjjbfmj0h2d4p9dmaf"; + sha256 = "05c6vrmlgzfxgfx1idqmp6czmr079px3n57q5ahnwzqvcl11a2jj"; extraPostFetch = '' sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index d0a8469dd1d1..78fdb32b4360 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1m29s6shnp7c9qh7pzdbvhy7i5awyzn1hr39xkinrpwgvsxa0lgy"; + sha256 = "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix new file mode 100644 index 000000000000..bee7d7703ab5 --- /dev/null +++ b/pkgs/games/quake2/yquake2/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchFromGitHub, buildEnv, cmake, makeWrapper +, SDL2, libGL +, oggSupport ? true, libogg, libvorbis +, openalSupport ? true, openal +, zipSupport ? true, zlib +}: + +let + mkFlag = b: if b then "ON" else "OFF"; + + games = import ./games.nix { inherit stdenv lib fetchFromGitHub cmake; }; + + wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; }; + + yquake2 = stdenv.mkDerivation rec { + name = "yquake2-${version}"; + version = "7.20"; + + src = fetchFromGitHub { + owner = "yquake2"; + repo = "yquake2"; + rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1yrmn8vajab3zd0fni029s6wrvv2ljn1kyhaiw02wm1dc5yyzb2g"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ SDL2 libGL ] + ++ lib.optionals oggSupport [ libogg libvorbis ] + ++ lib.optional openalSupport openal + ++ lib.optional zipSupport zlib; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DOGG_SUPPORT=${mkFlag oggSupport}" + "-DOPENAL_SUPPORT=${mkFlag openalSupport}" + "-DZIP_SUPPORT=${mkFlag zipSupport}" + "-DSYSTEMWIDE_SUPPORT=ON" + ]; + + preConfigure = '' + # Since we can't expand $out in `cmakeFlags` + cmakeFlags="$cmakeFlags -DSYSTEMDIR=$out/share/games/quake2" + ''; + + installPhase = '' + # Yamagi Quake II expects all binaries (executables and libs) to be in the + # same directory. + mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2 + cp -r release/* $out/lib/yquake2 + ln -s $out/lib/yquake2/quake2 $out/bin/yquake2 + ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded + cp $src/stuff/yq2.cfg $out/share/games/quake2 + ''; + + meta = with stdenv.lib; { + description = "Yamagi Quake II client"; + homepage = "https://www.yamagi.org/quake2/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ tadfisher ]; + }; + }; + +in rec { + inherit yquake2; + + yquake2-ctf = wrapper { + games = [ games.ctf ]; + name = "yquake2-ctf"; + inherit (games.ctf) description; + }; + + yquake2-ground-zero = wrapper { + games = [ games.ground-zero ]; + name = "yquake2-ground-zero"; + inherit (games.ground-zero) description; + }; + + yquake2-the-reckoning = wrapper { + games = [ games.the-reckoning ]; + name = "yquake2-the-reckoning"; + inherit (games.the-reckoning) description; + }; + + yquake2-all-games = wrapper { + games = lib.attrValues games; + name = "yquake2-all-games"; + description = "Yamagi Quake II with all add-on games"; + }; +} diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix new file mode 100644 index 000000000000..059fb26eb9b8 --- /dev/null +++ b/pkgs/games/quake2/yquake2/games.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +let + games = { + ctf = { + id = "ctf"; + version = "1.05"; + description = "'Capture The Flag' for Yamagi Quake II"; + sha256 = "15ihspyshls645ig0gq6bwdzvghyyysqk60g6ad3n4idb2ms52md"; + }; + + ground-zero = { + id = "rogue"; + version = "2.04"; + description = "'Ground Zero' for Yamagi Quake II"; + sha256 = "0x1maaycrxv7d3xvvk1ih2zymhvcd3jnab7g3by8qh6g5y33is5l"; + }; + + the-reckoning = { + id = "xatrix"; + version = "2.05"; + description = "'The Reckoning' for Yamagi Quake II"; + sha256 = "0gf2ryhgz8nw1mb1arlbriihjsx09fa0wmkgcayc8ijignfi1qkh"; + }; + }; + + toDrv = title: data: stdenv.mkDerivation rec { + inherit (data) id version description sha256; + inherit title; + + name = "yquake2-${title}-${version}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "yquake2"; + repo = data.id; + rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/lib/yquake2/${id} + cp Release/* $out/lib/yquake2/${id} + ''; + + meta = with stdenv.lib; { + inherit (data) description; + homepage = "https://www.yamagi.org/quake2/"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ tadfisher ]; + }; + }; + +in + lib.mapAttrs toDrv games diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix new file mode 100644 index 000000000000..8cd1044456ac --- /dev/null +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, buildEnv, makeWrapper, yquake2 }: + +{ games +, name +, description +}: + +let + env = buildEnv { + name = "${name}-env"; + paths = [ yquake2 ] ++ games; + }; + +in stdenv.mkDerivation { + inherit name; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + '' + lib.concatMapStringsSep "\n" (game: '' + makeWrapper ${env}/bin/yquake2 $out/bin/yquake2-${game.title} \ + --add-flags "+set game ${game.id}" + makeWrapper ${env}/bin/yq2ded $out/bin/yq2ded-${game.title} \ + --add-flags "+set game ${game.id}" + '') games; + + meta = { + inherit description; + }; +} diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 7e31202754a9..b84e7dd3af61 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "rocksndiamonds"; - version = "4.0.1.3"; + version = "4.0.1.4"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0y8w96hav7k5qwpm6rvzn3g4czfpsc58dix3x98anqii9l6vwrdd"; + sha256 = "0rvi4crfh4rfczpsflzcfj6nqrg49mhm163k6ms9gxz97xj2jp3g"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index a9f2aae443fc..30e2bcfdf524 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sgt-puzzles-r${version}"; - version = "20171029.69773d8"; + version = "20180409.d95f476"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0m1gaa802jyih9hcwpvb05zrzprgj6akafgvbsnq321s0sqzaxf0"; + sha256 = "1psml0abh3i577dns440h52568ggdny2wk1hhr30815nxibbribx"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index e896c74ca357..c44a166268cc 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -57,6 +57,7 @@ in buildFHSUserEnv rec { xorg.libXext xorg.libX11 xorg.libXfixes + libGL # Not formally in runtime but needed by some games gst_all_1.gstreamer @@ -144,7 +145,6 @@ in buildFHSUserEnv rec { SDL2_mixer gstreamer gst-plugins-base - libGLU libappindicator-gtk2 libcaca libcanberra diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 5fcb5063bbc8..1c145f6d71c0 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -3,12 +3,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "terraria-server-${version}"; - version = "1.3.1.1"; + version = "1.3.5.3"; urlVersion = lib.replaceChars ["."] [""] version; src = fetchurl { url = "http://terraria.org/server/terraria-server-${urlVersion}.zip"; - sha256 = "0bwh0na0dy6cjc1xchd5sp3c7av50q38hk03219dmqd72n9p44rq"; + sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; }; buildInputs = [ file unzip ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 83f34f5b04af..19cf026933e4 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; - enableParallelBuilding = true; + # disable parallel building as it caused sporadic build failures + enableParallelBuilding = false; NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" @@ -81,6 +82,6 @@ in stdenv.mkDerivation rec { homepage = https://te4.org/; license = licenses.gpl3; maintainers = with maintainers; [ chattered peterhoeg ]; - platforms = platforms.linux; + platforms = subtractLists ["aarch64-linux"] platforms.linux; }; } diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 9fd2dc97d980..c9cd7119d8f2 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl +, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , enableTools ? false }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.11"; + version = "1.13.13"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "168732lmdnskca9hrkmaz4mi0bssc5ppklln10s306cbsl93bd39"; + sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre openssl ]; + libvorbis fribidi dbus libpng pcre openssl icu ]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index a82afc1e472c..feeb73a27e90 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups"; + name = "cups"; # weird name to avoid change (for now) + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch" + + "?h=packages/cups&id=41fefa22ac518"; sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; }) ./cups-clean-dirty.patch diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix new file mode 100644 index 000000000000..6f27985bdbfc --- /dev/null +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}: + +let + version = "3.0.1-1"; +cupsdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100421/hl1110cupswrapper-${version}.i386.deb"; + sha256 = "a87880f4ece764a724411b5b24d15d1b912f6ffc6ecbfd9fac4cd5eda13d2eb7"; +}; +srcdir = "hl1110cupswrapper-GPL_src-${version}"; +cupssrc = fetchurl { + url = "http://download.brother.com/welcome/dlf100422/${srcdir}.tar.gz"; + sha256 = "be1dce6a4608cb253b0b382db30bf5885da46b010e8eb595b15c435e2487761c"; +}; +lprdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100419/hl1110lpr-${version}.i386.deb"; + sha256 = "5af241782a0d500d7f47e06ea43d61127f4019b5b1c6e68b4c1cb4521a742c22"; +}; + in +stdenv.mkDerivation { + name = "cups-brother-hl1110"; + + srcs = [ lprdeb cupssrc cupsdeb ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + unpackPhase = '' + tar -xvf ${cupssrc} + ''; + buildPhase = '' + gcc -Wall ${srcdir}/brcupsconfig/brcupsconfig.c -o brcupsconfig4 + ''; + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --replace /opt "$out/opt" \ + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1110/lpd/psconvert2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 $out/lib/cups/filter/brother_lpdwrapper_HL1110 + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother-HL1110-cups-en.ppd $out/lib/cups/filter/brother-HL1110-cups-en.ppd + cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + wrapProgram $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother HL1110 printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1"; + }; +} diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix new file mode 100644 index 000000000000..cda4ed6304d2 --- /dev/null +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, makeWrapper +, cups +, dpkg +, a2ps, ghostscript, gnugrep, gnused, coreutils, file, perl, which +}: + +stdenv.mkDerivation rec { + name = "hll2390dw-cups-${version}"; + version = "4.0.0-1"; + + src = fetchurl { + # The i386 part is a lie. There are x86, x86_64 and armv7l drivers. + # Though this builds only supports x86_64 for now. + url = "http://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; + sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + unpackPhase = "true"; + + installPhase = '' + dpkg-deb -x $src $out + + substituteInPlace $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --replace /opt "$out/opt" \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2390DW\"; #" + + # FIXME : Allow i686 and armv7l variations to be setup instead. + _PLAT=x86_64 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 $out/opt/brother/Printers/HLL2390DW/lpd/brprintconflsr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 $out/opt/brother/Printers/HLL2390DW/lpd/rawtobr3 + + for f in \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/lpdwrapper \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/paperconfigml2 \ + ; do + #substituteInPlace $f \ + wrapProgram $f \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused + ]} + done + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter $out/lib/cups/filter/brother_lpdwrapper_HLL2390DW + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/ + + wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + ''; + + meta = with stdenv.lib; { + homepage = http://www.brother.com/; + description = "Brother HL-L2390DW combined print driver"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128; + maintainers = [ maintainers.samueldr ]; + }; +} + diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 72e265360bf2..287451d338da 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0qix1whz5n4ijnl6d44f1v8nzkpv99wqjyrby8vx6xnpskw5hsxk"; + sha256 = "1f6dw476m9gc94jy38f79a5aa40mk91yc81cdwrsz42wlz3nbdq2"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -62,6 +62,5 @@ in stdenv.mkDerivation rec { description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ layus ]; }; } diff --git a/pkgs/misc/documentation-highlighter/LICENSE b/pkgs/misc/documentation-highlighter/LICENSE new file mode 100644 index 000000000000..422deb7350fe --- /dev/null +++ b/pkgs/misc/documentation-highlighter/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2006, Ivan Sagalaev +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of highlight.js nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md new file mode 100644 index 000000000000..f4baa3c8e001 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/README.md @@ -0,0 +1,152 @@ +This file was generated with pkgs/misc/documentation-highlighter/update.sh + +# Highlight.js + +[](https://travis-ci.org/isagalaev/highlight.js) + +Highlight.js is a syntax highlighter written in JavaScript. It works in +the browser as well as on the server. It works with pretty much any +markup, doesn’t depend on any framework and has automatic language +detection. + +## Getting Started + +The bare minimum for using highlight.js on a web page is linking to the +library along with one of the styles and calling +[`initHighlightingOnLoad`][1]: + +```html +<link rel="stylesheet" href="/path/to/styles/default.css"> +<script src="/path/to/highlight.pack.js"></script> +<script>hljs.initHighlightingOnLoad();</script> +``` + +This will find and highlight code inside of `<pre><code>` tags; it tries +to detect the language automatically. If automatic detection doesn’t +work for you, you can specify the language in the `class` attribute: + +```html +<pre><code class="html">...</code></pre> +``` + +The list of supported language classes is available in the [class +reference][2]. Classes can also be prefixed with either `language-` or +`lang-`. + +To disable highlighting altogether use the `nohighlight` class: + +```html +<pre><code class="nohighlight">...</code></pre> +``` + +## Custom Initialization + +When you need a bit more control over the initialization of +highlight.js, you can use the [`highlightBlock`][3] and [`configure`][4] +functions. This allows you to control *what* to highlight and *when*. + +Here’s an equivalent way to calling [`initHighlightingOnLoad`][1] using +jQuery: + +```javascript +$(document).ready(function() { + $('pre code').each(function(i, block) { + hljs.highlightBlock(block); + }); +}); +``` + +You can use any tags instead of `<pre><code>` to mark up your code. If +you don't use a container that preserve line breaks you will need to +configure highlight.js to use the `<br>` tag: + +```javascript +hljs.configure({useBR: true}); + +$('div.code').each(function(i, block) { + hljs.highlightBlock(block); +}); +``` + +For other options refer to the documentation for [`configure`][4]. + + +## Web Workers + +You can run highlighting inside a web worker to avoid freezing the browser +window while dealing with very big chunks of code. + +In your main script: + +```javascript +addEventListener('load', function() { + var code = document.querySelector('#code'); + var worker = new Worker('worker.js'); + worker.onmessage = function(event) { code.innerHTML = event.data; } + worker.postMessage(code.textContent); +}) +``` + +In worker.js: + +```javascript +onmessage = function(event) { + importScripts('<path>/highlight.pack.js'); + var result = self.hljs.highlightAuto(event.data); + postMessage(result.value); +} +``` + + +## Getting the Library + +You can get highlight.js as a hosted, or custom-build, browser script or +as a server module. Right out of the box the browser script supports +both AMD and CommonJS, so if you wish you can use RequireJS or +Browserify without having to build from source. The server module also +works perfectly fine with Browserify, but there is the option to use a +build specific to browsers rather than something meant for a server. +Head over to the [download page][5] for all the options. + +**Don't link to GitHub directly.** The library is not supposed to work straight +from the source, it requires building. If none of the pre-packaged options +work for you refer to the [building documentation][6]. + +**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be +too big. If you don't see the language you need in the ["Common" section][5], +it can be added manually: + +```html +<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script> +``` + +**On Almond.** You need to use the optimizer to give the module a name. For +example: + +``` +r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js +``` + + +## License + +Highlight.js is released under the BSD License. See [LICENSE][7] file +for details. + +## Links + +The official site for the library is at <https://highlightjs.org/>. + +Further in-depth documentation for the API and other topics is at +<http://highlightjs.readthedocs.io/>. + +Authors and contributors are listed in the [AUTHORS.en.txt][8] file. + +[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload +[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html +[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block +[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options +[5]: https://highlightjs.org/download/ +[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html +[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE +[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix new file mode 100644 index 000000000000..a9fbcc178bb8 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -0,0 +1,12 @@ +{ stdenv, runCommand }: +runCommand "documentation-highlighter" { + meta = { + description = "Highlight.js sources for the Nix Ecosystem's documentation."; + homepage = https://highlightjs.org; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.grahamc ]; + }; +} '' + cp -r ${./.} $out +'' diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/pkgs/misc/documentation-highlighter/highlight.pack.js new file mode 100644 index 000000000000..f909702367ec --- /dev/null +++ b/pkgs/misc/documentation-highlighter/highlight.pack.js @@ -0,0 +1,2 @@ +/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */ +!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',""")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,r:0,c:[{cN:"attr",b:/\S+/}]},s={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,s,i];return t.c=a,{aliases:["nixos"],k:r,c:a}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}}); \ No newline at end of file diff --git a/pkgs/misc/documentation-highlighter/loader.js b/pkgs/misc/documentation-highlighter/loader.js new file mode 100644 index 000000000000..4ad7dbf24b51 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/loader.js @@ -0,0 +1,7 @@ +/* This file is NOT part of highlight.js */ +document.onreadystatechange = function () { + var listings = document.querySelectorAll('.programlisting, .screen'); + for (i = 0; i < listings.length; ++i) { + hljs.highlightBlock(listings[i]); + } +} diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/pkgs/misc/documentation-highlighter/mono-blue.css new file mode 100644 index 000000000000..884c97c7673f --- /dev/null +++ b/pkgs/misc/documentation-highlighter/mono-blue.css @@ -0,0 +1,59 @@ +/* + Five-color theme from a single blue hue. +*/ +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: #eaeef3; +} + +.hljs { + color: #00193a; +} + +.hljs-keyword, +.hljs-selector-tag, +.hljs-title, +.hljs-section, +.hljs-doctag, +.hljs-name, +.hljs-strong { + font-weight: bold; +} + +.hljs-comment { + color: #738191; +} + +.hljs-string, +.hljs-title, +.hljs-section, +.hljs-built_in, +.hljs-literal, +.hljs-type, +.hljs-addition, +.hljs-tag, +.hljs-quote, +.hljs-name, +.hljs-selector-id, +.hljs-selector-class { + color: #0048ab; +} + +.hljs-meta, +.hljs-subst, +.hljs-symbol, +.hljs-regexp, +.hljs-attribute, +.hljs-deletion, +.hljs-variable, +.hljs-template-variable, +.hljs-link, +.hljs-bullet { + color: #4c81c9; +} + +.hljs-emphasis { + font-style: italic; +} diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/misc/documentation-highlighter/update.sh new file mode 100755 index 000000000000..3b77af4af416 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl -p unzip + +set -eu +set -o pipefail + +root=$(pwd) + +if [ ! -f "./update.sh" ]; then + echo "Please run this script from within pkgs/misc/documentation-highlighter/!" + exit 1 +fi + +scratch=$(mktemp -d -t tmp.XXXXXXXXXX) +function finish { + rm -rf "$scratch" +} +trap finish EXIT + + +mkdir $scratch/src +cd $scratch/src + +token=$(curl https://highlightjs.org/download/ -c "$scratch/jar" \ + | grep csrf \ + | cut -d"'" -f6) + +curl --header "Referer: https://highlightjs.org/download/"\ + -b "$scratch/jar" \ + --data "csrfmiddlewaretoken=$token&nix.js=on&bash.js=on" \ + https://highlightjs.org/download/ > $scratch/out.zip + +unzip "$scratch/out.zip" +out="$root/" +mkdir -p "$out" +cp ./{highlight.pack.js,LICENSE,styles/mono-blue.css} "$out" + +( + echo "This file was generated with pkgs/misc/documentation-highlighter/update.sh" + echo "" + cat README.md +) > "$out/README.md" diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 3a46414512cf..7c8750905d9c 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.2.13"; + name = "gutenprint-5.2.14"; src = fetchurl { url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; - sha256 = "0hi7s0y59306p4kp06sankfa57k2805khbknkvl9d036hdfp9afr"; + sha256 = "1293x19gw1b742id7c7bz5giv3vlxaqpmbdz2g0n99wny5k0ggs5"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index ed29ee1575cc..b18ae7762df2 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -70,6 +70,7 @@ pythonPackages.buildPythonApplication { pygobject2 reportlab usbutils + sip ] ++ stdenv.lib.optionals withQt5 [ pyqt5 ]; diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 5928d53d5422..c0c3b40f6b65 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib, mesa }: +{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 6ba5290fa424..6d462c0e3797 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fs-uae-${version}"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; - sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2"; + url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; + sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index c402dd444289..5af3042bde4d 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Playstation 1 emulator"; - homepage = http://pcsxr.codeplex.com/; + homepage = https://pcsxr.codeplex.com/; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index d6b3b6a98706..8a3f7796aef4 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -232,10 +232,11 @@ in with stdenv.lib.licenses; mame = (mkLibRetroCore { core = "mame"; + version = "2018-03-02"; src = fetchRetro { repo = "mame"; - rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e"; - sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1"; + rev = "893f1ac2231b348b63209fd5b2545f770458ae8f"; + sha256 = "1j9p82q9jhf5lf4w392zd09bq0j4iw1afhznymg0v60jv592h3gz"; }; description = "Port of MAME to libretro"; license = gpl2Plus; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 9af5c889c42f..db58c398526a 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses - ++ lib.optional vaSupport pkgs.libva-full + ++ lib.optional vaSupport pkgs.libva ++ lib.optional pcapSupport pkgs.libpcap ++ lib.optional v4lSupport pkgs.libv4l ++ lib.optional saneSupport pkgs.sane-backends @@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.libGL.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 928e692df6b4..91fb0da82d8a 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -56,12 +56,9 @@ let wine-build = build: release: }); in if wineRelease == "staging" then - let wineUnstable = wine-build wineBuild "unstable"; in - # wine staging is not yet at 3.0, using unstable - # FIXME update winestaging sources - wineUnstable - # callPackage ./staging.nix { - # inherit libtxc_dxtn_Name wineUnstable; - # } + callPackage ./staging.nix { + inherit libtxc_dxtn_Name; + wineUnstable = wine-build wineBuild "unstable"; + } else wine-build wineBuild wineRelease diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5950310a73f7..f86e34a5d542 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,18 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.3"; + version = "3.5"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505"; + sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - # FIXME update winestaging sources, when 3.3 is released - # FIXME then revert the staging derivation in ./default.nix - sha256 = "0000000000000000000000000000000000000000000000000000000000000000"; + sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -64,5 +62,4 @@ in rec { repo = "winetricks"; rev = version; }; - } diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 84272992f2bb..af4c54d9d0d8 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pythonPackages, lilypond}: +{ lib, fetchFromGitHub, python3Packages, lilypond }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "frescobaldi-${version}"; - version = "2.0.16"; + version = "3.0.0"; - src = fetchurl { - url = "https://github.com/wbsoft/frescobaldi/releases/download/" - + "v2.0.16/${name}.tar.gz"; - sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q"; + src = fetchFromGitHub { + owner = "wbsoft"; + repo = "frescobaldi"; + rev = "v${version}"; + sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd"; }; - propagatedBuildInputs = with pythonPackages; [ lilypond - pyqt4 poppler-qt4 pygame ]; + propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ]; - patches = [ ./setup.cfg.patch ./python-path.patch ]; + # no tests in shipped with upstream + doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://frescobaldi.org/; description = ''Frescobaldi is a LilyPond sheet music text editor''; longDescription = '' @@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec { fonts and keyboard shortcuts ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.sepi ]; + maintainers = with maintainers; [ sepi ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/frescobaldi/python-path.patch b/pkgs/misc/frescobaldi/python-path.patch deleted file mode 100644 index 6c54d9f208ec..000000000000 --- a/pkgs/misc/frescobaldi/python-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi ---- frescobaldi-2.0.16/frescobaldi 2014-10-24 11:29:28.705687224 +0200 -+++ frescobaldi-2.0.16.new/frescobaldi 2014-10-24 11:31:08.086444793 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - import sys - import frescobaldi_app.main - import app -Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app -Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch deleted file mode 100644 index 502cdd61966d..000000000000 --- a/pkgs/misc/frescobaldi/setup.cfg.patch +++ /dev/null @@ -1,13 +0,0 @@ -Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build -Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app -Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx -diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg ---- frescobaldi-2.0.16.old/setup.cfg 2012-02-05 07:08:24.000000000 +0100 -+++ frescobaldi-2.0.16/setup.cfg 2014-10-24 15:08:48.141335620 +0200 -@@ -1,6 +1,2 @@ --[bdist_wininst] --bitmap=frescobaldi-wininst.bmp --install-script=frescobaldi-wininst.py -- - [sdist] - force-manifest=1 diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 43d23dd525ae..848215ae17af 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "jack1-${version}"; - version = "0.124.1"; + version = "0.125.0"; src = fetchurl { url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; - sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"; + sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; configureFlags = '' diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index ba2a8b2448ef..94d5449100db 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0ri2l8pyl1fnx0zypliwprkk1wkaxz8ywkgz8h2f08v7h1zgq1m6"; + sha256 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 2883604491c6..ce911ae40d5e 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "05ay6hdc1jgi6b00bd998zc39ca8jhnk7i6m3mw70s0baqv1scik"; + sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 7cb3e68dec86..5fff7b8f0ea3 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "i3lock-pixeled-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz"; - sha256 = "046qbx4qvcc66h53h4mm9pyjj9gjc6dzy38a0f0jc5a84xbivh7k"; + sha256 = "0vlynm833fk1mmdnkcgh4hwqmfypn22zskhysm110k39zvikif0h"; }; propagatedBuildInputs = with pkgs; [ diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index d081581d2552..f38851d6fa0c 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -16,18 +16,15 @@ stdenv.mkDerivation rec { name = "${basename}-${version}"; basename = "light-locker"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "the-cavalry"; repo = basename; rev = "v${version}"; - sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj"; + sha256 = "1zsafc10bmliknf12h3mgy7f73lvgph0q0wkaqp42iagmw11yaj8"; }; - # Patch so that systemd is "found" when configuring. - patches = [ ./systemd.patch ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which xfce.xfce4-dev-tools glib systemd libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ]; diff --git a/pkgs/misc/screensavers/light-locker/systemd.patch b/pkgs/misc/screensavers/light-locker/systemd.patch deleted file mode 100644 index 9cba8b9c0d2f..000000000000 --- a/pkgs/misc/screensavers/light-locker/systemd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac.in b/configure.ac.in -index f7d5f5d..341bc83 100644 ---- a/configure.ac.in -+++ b/configure.ac.in -@@ -424,7 +424,7 @@ AC_ARG_WITH(systemd, - [with_systemd=$withval], [with_systemd=auto]) - - PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login], -+ [libsystemd], - [have_systemd=yes], [have_systemd=no]) - - if test "x$with_systemd" = "xauto" ; then diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 8539db5e0027..6e4ae16e9c82 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/pipeseroni/pipes.sh; description = "Animated pipes terminal screensaver"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 6b310236de42..82ce4c20df8e 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, writeText , xproto, libX11, libXext, libXrandr # default header can be obtained from -# http://git.suckless.org/slock/tree/config.def.h +# https://git.suckless.org/slock/tree/config.def.h , conf ? null }: with stdenv.lib; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "slock-1.4"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/slock; + homepage = https://tools.suckless.org/slock; description = "Simple X display locker"; longDescription = '' Simple X display locker. This is the simplest X screen locker. diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 8035e7da37db..d93d982924d1 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.38"; + version = "5.39"; name = "xscreensaver-${version}"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "1f58h5rgjbxr4hh40m6zkpkzbzg68l7nqzjwal0b17yysafbmsf6"; + sha256 = "09i47h4hdgwxyqgrsnshl4l5dv5mrsp37h705cc22lwby601ikj8"; }; buildInputs = diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index c38d9b03a6e9..c62250b1124c 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.0.174"; + version = "3.93.0.225"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "0fkvcpx2vhyr3z74r5mcpjh293w3cfm07axj8dj84nl2hi6im8b6"; + sha256 = "1mjdvfvx45pdypl34yghgi47bj86rwvryx9mwhwwb09psn9smp49"; }; preferLocalBuild = true; diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 26c371716427..1221c6606872 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "greybird"; - version = "3.22.6"; + version = "3.22.7"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "${pname}"; rev = "v${version}"; - sha256 = "16rifkyy8l4v03rx85j7m6rfdal99l1xdmghysh95r6lx4y6r01i"; + sha256 = "118k0bb780h54i2vn5my5r6vbkk134899xwp4aigw5a289xzryvb"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index 58001183bd9e..69a874d07c3f 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: +{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }: stdenv.mkDerivation rec { name = "materia-theme-${version}"; - version = "20180110"; + version = "20180321"; src = fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; rev = "v${version}"; - sha256 = "1knfcc4bqibshbk5s4461brzw780gj7c1i42b168c6jw9p6br6bf"; + sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6"; }; - nativeBuildInputs = [ gnome3.glib libxml2 ]; + nativeBuildInputs = [ gnome3.glib libxml2 bc ]; buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ]; @@ -22,14 +22,15 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs install.sh sed -i install.sh \ - -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \ - -e "s|/usr||" - destdir="$out" ./install.sh + -e "s|if .*which gnome-shell.*;|if true;|" \ + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|" + mkdir -p $out/share/themes + ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING ''; meta = with stdenv.lib; { - description = "A Material Design theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; + description = "A Material Design theme for GNOME/GTK+ based desktop environments"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/numix-solarized/default.nix index 4ede14d3bb39..3c81e4308ca9 100644 --- a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix-solarized/default.nix @@ -1,26 +1,40 @@ -{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }: +{ stdenv, fetchFromGitHub, python3, sass, glib, gdk_pixbuf, libxml2, + inkscape, optipng, gtk-engine-murrine +}: stdenv.mkDerivation rec { - version = "20160919"; + version = "20170810"; name = "numix-solarized-gtk-theme-${version}"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "numix-solarized-gtk-theme"; rev = version; - sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad"; + sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl"; }; + nativeBuildInputs = [ python3 sass glib gdk_pixbuf libxml2 inkscape optipng ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + postPatch = '' - substituteInPlace Makefile --replace \ - 'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes" patchShebangs . + substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out + substituteInPlace scripts/render-assets.sh \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ + --replace /usr/bin/optipng ${optipng}/bin/optipng ''; - buildInputs = [sass glib gdk_pixbuf]; + buildPhase = "true"; + + installPhase = '' + for theme in *.colors; do + make THEME="''${theme/.colors/}" install + done + ''; meta = with stdenv.lib; { - description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart"; + description = "Solarized versions of Numix GTK2 and GTK3 theme"; longDescription = '' This is a fork of the Numix GTK theme that replaces the colors of the theme and icons to use the solarized theme with a solarized green accent color. @@ -29,7 +43,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; license = licenses.gpl3; - maintainers = [ maintainers.offline ]; platforms = platforms.linux; + maintainers = [ maintainers.offline ]; }; } diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix new file mode 100644 index 000000000000..b29565d01ecb --- /dev/null +++ b/pkgs/misc/tmux-plugins/default.nix @@ -0,0 +1,224 @@ +{ fetchgit, stdenv, pkgs }: + +let + rtpPath = "share/tmux-plugins"; + + addRtp = path: pluginName: attrs: derivation: + derivation // { rtp = "${derivation}/${path}/${builtins.replaceStrings ["-"] ["_"] pluginName}.tmux"; } // { + overrideAttrs = f: buildTmuxPlugin (attrs // f attrs); + }; + + buildTmuxPlugin = a@{ + pluginName, + namePrefix ? "tmuxplugin-", + src, + unpackPhase ? "", + configurePhase ? "", + buildPhase ? "", + addonInfo ? null, + preInstall ? "", + postInstall ? "", + path ? (builtins.parseDrvName pluginName).name, + dependencies ? [], + ... + }: + addRtp "${rtpPath}/${path}" pluginName a (stdenv.mkDerivation (a // { + name = namePrefix + pluginName; + + inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; + + installPhase = '' + runHook preInstall + + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target + if [ -n "$addonInfo" ]; then + echo "$addonInfo" > $target/addon-info.json + fi + + runHook postInstall + ''; + + dependencies = [ pkgs.bash ] ++ dependencies; + })); + + buildTmuxPluginFrom2Nix = a: buildTmuxPlugin ({ + buildPhase = ":"; + configurePhase =":"; + } // a); + +in rec { + + battery = buildTmuxPluginFrom2Nix { + pluginName = "battery"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-battery"; + rev = "09be78c35ee84f858f724442b94ad045ade23eb0"; + sha256 = "0gm6qiay0k5b3yzrabfmh4inyh9r6rfhja2l3r4cixcvc8sgvh8l"; + }; + }; + + continuum = buildTmuxPluginFrom2Nix { + pluginName = "continuum"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-continuum"; + rev = "90f4a00c41de094864dd4e29231253bcd80d4409"; + sha256 = "1hviqz62mnq5h4vgcy9bl5004q18yz5b90bnih0ibsna877x3nbc"; + }; + dependencies = [ resurrect ]; + }; + + copycat = buildTmuxPluginFrom2Nix { + pluginName = "copycat"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-copycat"; + rev = "6f9b9cd2d93872cef60e3ea7f7ae89598569ed25"; + sha256 = "12dgn5wnzrhd6sqa64w875ld3lrrny8xvdq6b6lzxyain9q49mrf"; + }; + }; + + cpu = buildTmuxPluginFrom2Nix { + pluginName = "cpu"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-cpu"; + rev = "12f7a74e25bf59701456e2c0d98b39bb19ec7039"; + sha256 = "0qxn8ngg297980lj6w8ih2m8m8bxxdbcz5hsjmlia92h5rdkm5kl"; + }; + }; + + fpp = buildTmuxPluginFrom2Nix { + pluginName = "fpp"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-fpp"; + rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e"; + sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws"; + }; + postInstall = '' + sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux + ''; + dependencies = [ pkgs.fpp ]; + }; + + logging = buildTmuxPluginFrom2Nix { + pluginName = "logging"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-logging"; + rev = "b2706119cd587230beae02980d3d7fa2d5afebe9"; + sha256 = "1w1ymscfbz87lypaxgjdva1rg7jw2jyf7nnfgyngghw9m1l2xk2c"; + }; + }; + + net-speed = buildTmuxPluginFrom2Nix { + pluginName = "net-speed"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-net-speed"; + rev = "536d2bdd053a3bdfcc5cf7680c0dba76127c95ca"; + sha256 = "1bly5f40dgiym378jkfwm7qag9xl6qvziqiqnj65yblqd5py325z"; + }; + }; + + maildir-counter = buildTmuxPluginFrom2Nix { + pluginName = "maildir-counter"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-maildir-counter"; + rev = "9415f0207e71e37cbd870c9443426dbea6da78b9"; + sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4"; + }; + }; + + online-status = buildTmuxPluginFrom2Nix { + pluginName = "online-status"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-online-status"; + rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312"; + sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r"; + }; + }; + + open = buildTmuxPluginFrom2Nix { + pluginName = "open"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-open"; + rev = "f99d3189c445188eae5fa9bfeabc95df16deca92"; + sha256 = "13q3zd5jv7akkjjwhgimmfylrvalxdn54fnpfb14g6xam6h8808m"; + }; + }; + + pain-control = buildTmuxPluginFrom2Nix { + pluginName = "pain-control"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-pain-control"; + rev = "731667692da46d51a6a9dffb4c43384a5d68ff28"; + sha256 = "1ihpl5wgjmhfgcrasgnydd7vpsar865sx2whra19gpfm4bglmdzl"; + }; + }; + + prefix-highlight = buildTmuxPluginFrom2Nix { + pluginName = "prefix-highlight"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-prefix-highlight"; + rev = "34f7125ae46e5123bedad03e08027332d1186186"; + sha256 = "16z8sm8pifg1m9lmv0z50fb0ws9mk5zqs7a1ddl2bfwkqi7yc0c0"; + }; + }; + + resurrect = buildTmuxPluginFrom2Nix { + pluginName = "resurrect"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-resurrect"; + rev = "7c77c70483b818d331e46c4cf64c716ded09a152"; + sha256 = "08gjxwdmfy16xpgi87rp9dj5338imqsy392pixf7xcnr05413ap1"; + }; + }; + + sensible = buildTmuxPluginFrom2Nix { + pluginName = "sensible"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sensible"; + rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; + sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; + }; + }; + + sessionist = buildTmuxPluginFrom2Nix { + pluginName = "sessionist"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sessionist"; + rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89"; + sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4"; + }; + }; + + sidebar = buildTmuxPluginFrom2Nix { + pluginName = "sidebar"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sidebar"; + rev = "23014524cab53f8d36373983500fe05a527a444d"; + sha256 = "1w363587isdip1r81h0vkp5163lpa83lvasg8l04h43sbip2y6i8"; + }; + }; + + urlview = buildTmuxPluginFrom2Nix { + pluginName = "urlview"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-urlview"; + rev = "b84c876cffdd22990b4ab51247e795cbd7813d53"; + sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn"; + }; + postInstall = '' + sed -i -e '14,20{s|urlview|${pkgs.urlview}/bin/urlview|g}' $target/urlview.tmux + ''; + dependencies = [ pkgs.urlview ]; + }; + + yank = buildTmuxPluginFrom2Nix { + pluginName = "yank"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-yank"; + rev = "feb9611b7d1c323ca54cd8a5111a53e3e8265b59"; + sha256 = "1ywbm09jfh6cm2m6gracmdc3pp5p2dwraalbhfaafqaydjr22qc3"; + }; + }; + +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 3198086ffb6d..a48f9943779a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip +{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby , which, fetchgit, llvmPackages, rustPlatform , xkb_switch, rustracerd, fzf, skim , python3, boost, icu, ncurses @@ -20,7 +20,7 @@ in # TL;DR # Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix </dev/null"` +# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"` # Copy the generated expression(s) into this file. # If plugin is complicated then make changes to ./vim2nix/additional-nix-code @@ -52,39 +52,51 @@ rec { # Update with vimUtils.vimPlugins.pluginnames2Nix command # aliasess - "sourcemap.vim" = sourcemap; - Colour_Sampler_Pack = Colour-Sampler-Pack; - Gundo = gundo-vim; # backwards compat, added 2015-10-03 - YouCompleteMe = youcompleteme; airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 + bats = bats-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; coffeeScript = coffee-script; # backwards compat, added 2014-10-18 - colors-solarized = Solarized; + Solarized = vim-colors-solarized; + solarized = vim-colors-solarized; + colors-solarized = vim-colors-solarized; + caw = caw-vim; colorsamplerpack = Colour_Sampler_Pack; + Colour_Sampler_Pack = Colour-Sampler-Pack; command_T = command-t; # backwards compat, added 2014-10-18 + commentary = vim-commentary; committia = committia-vim-git; concealedyank = concealedyank-vim; context-filetype = context_filetype-vim; + Cosco = cosco-vim; css_color_5056 = vim-css-color; + CSApprox = csapprox; + csv = csv-vim; ctrlp = ctrlp-vim; cute-python = vim-cute-python-git; denite = denite-nvim; easy-align = vim-easy-align; + easygit = vim-easygit; easymotion = vim-easymotion; echodoc = echodoc-vim; eighties = vim-eighties; - ghc-mod-vim = ghcmod; - gist-vim = Gist; + extradite = vim-extradite; + fugitive = vim-fugitive; + ghc-mod-vim = ghcmod-vim; + ghcmod = ghcmod-vim; + goyo = goyo-vim; + Gist = gist-vim; gitgutter = vim-gitgutter; gundo = gundo-vim; + Gundo = gundo-vim; # backwards compat, added 2015-10-03 haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 haskellConcealPlus = vim-haskellConcealPlus; haskellconceal = vim-haskellconceal; hier = vim-hier; hlint-refactor = hlint-refactor-vim; - hoogle = Hoogle; + hoogle = vim-hoogle; + Hoogle = vim-hoogle; ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; mayansmoke = mayansmoke-git; @@ -95,36 +107,57 @@ rec { neomru = neomru-vim; neosnippet = neosnippet-vim; neoyank = neoyank-vim-git; - nerdcommenter = The_NERD_Commenter; - nerdtree = The_NERD_tree; + The_NERD_Commenter = nerdcommenter; + The_NERD_tree = nerdtree; open-browser = open-browser-vim; + pathogen = vim-pathogen; peskcolor = peskcolor-vim-git; polyglot = vim-polyglot; + prettyprint = vim-prettyprint; quickrun = vim-quickrun; + rainbow_parentheses = rainbow_parentheses-vim; repeat = vim-repeat; + riv = riv-vim; rhubarb = vim-rhubarb; + sensible = vim-sensible; signature = vim-signature; + snipmate = vim-snipmate; + sourcemap = sourcemap-vim; + "sourcemap.vim" = sourcemap-vim; + surround = vim-surround; + sleuth = vim-sleuth; solidity = vim-solidity; stylish-haskell = vim-stylish-haskell; stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 - supertab = Supertab; - syntastic = Syntastic; + Supertab = supertab; + Syntastic = syntastic; + SyntaxRange = vim-SyntaxRange; + table-mode = vim-table-mode; + taglist = taglist-vim; tabpagebuffer = tabpagebuffer-vim; - tabular = Tabular; - tagbar = Tagbar; + tabpagecd = vim-tabpagecd; + Tabular = tabular; + Tagbar = tagbar; thumbnail = thumbnail-vim; + tlib = tlib_vim; tmux-navigator = vim-tmux-navigator; tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; unite = unite-vim; + UltiSnips = ultisnips; vim-grepper = vim-grepper-git; vim-test = vim-test-git; vimproc = vimproc-vim; vimshell = vimshell-vim; + vinegar = vim-vinegar; watchdogs = vim-watchdogs; - webapi-vim = WebAPI; + WebAPI = webapi-vim; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 - yankring = YankRing; + yankring = YankRing-vim; + Yankring = YankRing-vim; + YouCompleteMe = youcompleteme; + xterm-color-table = xterm-color-table-vim; + zeavim = zeavim-vim; # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { @@ -176,405 +209,389 @@ rec { # --- generated packages bellow this line --- - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CSApprox-2013-07-26"; + vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-auto-save-2017-11-08"; src = fetchgit { - url = "git://github.com/godlygeek/csapprox"; - rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; - sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + url = "https://github.com/907th/vim-auto-save"; + rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; + sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; }; dependencies = []; }; - CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2017-03-15"; + vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-autoformat-2018-03-02"; src = fetchgit { - url = "git://github.com/chrisbra/CheckAttach"; - rev = "b583efd45e03902438a55299623390a0f9253513"; - sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + url = "https://github.com/Chiel92/vim-autoformat"; + rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79"; + sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf"; }; dependencies = []; }; - Cosco = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Cosco-2018-02-15"; + ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-py-matcher-2017-11-01"; src = fetchgit { - url = "git://github.com/lfilho/cosco.vim"; - rev = "434dc68b93b8f42babe1887a269145ce39c97edf"; - sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv"; + url = "https://github.com/FelikZ/ctrlp-py-matcher"; + rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; + sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; }; dependencies = []; }; - Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2016-10-10"; + ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-cmatcher-2015-10-15"; src = fetchgit { - url = "git://github.com/mattn/gist-vim"; - rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; - sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + url = "https://github.com/JazzCore/ctrlp-cmatcher"; + rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; + sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; }; dependencies = []; - + buildInputs = [ python ]; + buildPhase = '' + patchShebangs . + ./install.sh + ''; }; - Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle-2018-03-04"; + julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "julia-vim-2018-03-27"; src = fetchgit { - url = "git://github.com/Twinside/vim-hoogle"; - rev = "871d104c92e33cb238506f2805f1652561978cc8"; - sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; + url = "https://github.com/JuliaEditorSupport/julia-vim"; + rev = "4593c8b1ffe20022677e524487c8554d96cf8f84"; + sha256 = "0yrdzkxyg6cg2i4bd6bqbq0w63hssh3nd0f0qnfl7v5pkq9yba4w"; }; dependencies = []; }; - Solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized-2011-05-09"; + zeavim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zeavim-vim-2018-03-22"; src = fetchgit { - url = "git://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + url = "https://github.com/KabbAmine/zeavim.vim"; + rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; + sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; }; dependencies = []; }; - Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2017-11-14"; + vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-nix-2018-04-15"; src = fetchgit { - url = "git://github.com/ervandew/supertab"; - rev = "40fe711e088e2ab346738233dd5adbb1be355172"; - sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + url = "https://github.com/LnL7/vim-nix"; + rev = "bf5779180bf0e3cb6c967f87d6262a976e055e32"; + sha256 = "023c932vybycj8zasvgvp7xhp42i2iy26msjgjsgzfwmdf5w877y"; }; dependencies = []; }; - Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2018-02-20"; + vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-actions-2018-01-18"; src = fetchgit { - url = "git://github.com/scrooloose/syntastic"; - rev = "b7b473b2688827dcd7d8c801197b8bfc31b20dc4"; - sha256 = "11nwzgb5s75z348px81mmxh681rs25ccls9x5z8f36i7ykq46j1x"; + url = "https://github.com/MarcWeber/vim-addon-actions"; + rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; + sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "SyntaxRange-2018-03-09"; + vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-async-2017-03-20"; src = fetchgit { - url = "git://github.com/inkarkat/vim-SyntaxRange"; - rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; - sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + url = "https://github.com/MarcWeber/vim-addon-async"; + rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; + sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; }; - dependencies = []; + dependencies = ["vim-addon-signs"]; }; - Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular-2016-05-04"; + vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-background-cmd-2015-12-11"; src = fetchgit { - url = "git://github.com/godlygeek/tabular"; - rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; - sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; + url = "https://github.com/MarcWeber/vim-addon-background-cmd"; + rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; + sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils"]; }; - Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-12-17"; + vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-commenting-2013-06-10"; src = fetchgit { - url = "git://github.com/majutsushi/tagbar"; - rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; - sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9"; + url = "https://github.com/MarcWeber/vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; }; dependencies = []; }; - The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2018-03-03"; + vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-completion-2015-02-10"; src = fetchgit { - url = "git://github.com/scrooloose/nerdcommenter"; - rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1"; - sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4"; + url = "https://github.com/MarcWeber/vim-addon-completion"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; }; - dependencies = []; + dependencies = ["tlib"]; }; - The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2018-03-13"; + vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-errorformats-2014-11-05"; src = fetchgit { - url = "git://github.com/scrooloose/nerdtree"; - rev = "a172d7cfcb4fe9b927dcc24184204fc89d826301"; - sha256 = "1nfk1j2n2jgrdhcahva1kq3qjj4fdn1x20xxvgl88v3j3fj62n0f"; + url = "https://github.com/MarcWeber/vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; }; dependencies = []; }; - UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2017-06-30"; + vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-goto-thing-at-cursor-2012-01-11"; src = fetchgit { - url = "git://github.com/SirVer/ultisnips"; - rev = "423f264e753cec260b4f14455126e6db7ba429af"; - sha256 = "19g3k0nqzizv39rxwgkca9n2gsd19z2wwsmicr0zcgnf50nhkznh"; + url = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; }; - dependencies = []; + dependencies = ["tlib"]; }; - VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2018-02-17"; + vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-local-vimrc-2015-03-19"; src = fetchgit { - url = "git://github.com/vimoutliner/vimoutliner"; - rev = "ec4dc9bd932a0cce476a3f8f0a78ca61ff94188c"; - sha256 = "0fj3ya7n9wfbnkcdwp9kggm8c3p5jm3iwzbk4gdqjmhqkvdfz5rk"; + url = "https://github.com/MarcWeber/vim-addon-local-vimrc"; + rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; + sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; }; dependencies = []; }; - WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2018-02-08"; + vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-manager-2017-05-07"; src = fetchgit { - url = "git://github.com/mattn/webapi-vim"; - rev = "6459fbdd7fd38c4630fb49e9c687946633b58849"; - sha256 = "0ndskj9rw526kgl1y645w1gqmsdw3268ps1armccadjj9d8flkdi"; - }; - dependencies = []; - - }; - - YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YankRing"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=23487"; - name = "yankring_190.zip"; - sha256 = "0nnxpsfjp2p9jvs3y5ynnd5s56snz9927zdp9bgmay2jgxfmp0si"; + url = "https://github.com/MarcWeber/vim-addon-manager"; + rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; + sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; }; - buildInputs = [ unzip ]; dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=1234"; - }; - - sourceRoot = "."; + buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; }; - caw = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "caw-2018-01-01"; + vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mru-2013-08-08"; src = fetchgit { - url = "git://github.com/tyru/caw.vim"; - rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; - sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + url = "https://github.com/MarcWeber/vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; }; - dependencies = []; + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; }; - clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2018-01-18"; + vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mw-utils-2018-03-09"; src = fetchgit { - url = "git://github.com/Rip-Rip/clang_complete"; - rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; - sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; + url = "https://github.com/MarcWeber/vim-addon-mw-utils"; + rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; + sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; }; dependencies = []; - # In addition to the arguments you pass to your compiler, you also need to - # specify the path of the C++ std header (if you are using C++). - # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). - # The linked ruby code shows generates the required '.clang_complete' for cmake based projects - # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" - ''; + }; - commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2017-10-09"; + vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-nix-2017-09-11"; src = fetchgit { - url = "git://github.com/tpope/vim-commentary"; - rev = "89f43af18692d22ed999c3097e449f12fdd8b299"; - sha256 = "0nqm4s00c607r58fz29n67r2z5p5r9qayl5y1chy8bcrl59m17a2"; + url = "https://github.com/MarcWeber/vim-addon-nix"; + rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; + sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; }; - dependencies = []; + dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; - csv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-2018-01-03"; + vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-other-2014-07-15"; src = fetchgit { - url = "git://github.com/chrisbra/csv.vim"; - rev = "a50b977fa25a854e7d099198bfa65e2dc680898b"; - sha256 = "02a6289rbjw8r0l668ala5abfr2rls3slrnk4yrsfc6ka550zj9y"; + url = "https://github.com/MarcWeber/vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; }; - dependencies = []; + dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; }; - ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-cmatcher-2015-10-15"; + vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-php-manual-2015-01-01"; src = fetchgit { - url = "git://github.com/JazzCore/ctrlp-cmatcher"; - rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; - sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; + url = "https://github.com/MarcWeber/vim-addon-php-manual"; + rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; + sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; }; dependencies = []; - buildInputs = [ python ]; - buildPhase = '' - patchShebangs . - ./install.sh - ''; + }; - ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2017-11-01"; + vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-signs-2013-04-19"; src = fetchgit { - url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; - sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; + url = "https://github.com/MarcWeber/vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; }; dependencies = []; }; - ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-z-2015-10-17"; + vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-sql-2017-02-11"; src = fetchgit { - url = "git://github.com/amiorin/ctrlp-z"; - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + url = "https://github.com/MarcWeber/vim-addon-sql"; + rev = "048a139af36829fce670c8ff80d3aad927557ee6"; + sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; }; - dependencies = []; + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; }; - easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "easygit-2017-08-11"; + vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-syntax-checker-2017-06-26"; src = fetchgit { - url = "git://github.com/chemzqm/vim-easygit"; - rev = "8f66da54da627395309548efee6d8705b7f50768"; - sha256 = "013jl330k9yjcvzzqhwz93adm4349gkl3q1c55m1zfkg3afmvnwd"; + url = "https://github.com/MarcWeber/vim-addon-syntax-checker"; + rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; + sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite-2015-09-22"; + vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-toggle-buffer-2012-01-13"; src = fetchgit { - url = "git://github.com/int3/vim-extradite"; - rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; - sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + url = "https://github.com/MarcWeber/vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "forms-2012-11-28"; + vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-xdebug-2014-08-29"; src = fetchgit { - url = "git://github.com/megaannum/forms"; - rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; - sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + url = "https://github.com/MarcWeber/vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; }; - dependencies = ["self"]; + dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; }; - fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2018-03-14"; + tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tsuquyomi-2018-03-23"; src = fetchgit { - url = "git://github.com/tpope/vim-fugitive"; - rev = "3e0bd86b99c50691f830d9e25a4bbe2a88078f8f"; - sha256 = "1prfb0m61r499i35qn1ql2pag5w64mhpkby4wbbvlpm50xwq8w9b"; + url = "https://github.com/Quramy/tsuquyomi"; + rev = "94f10d312134fc59b53b2e821d3315320f694cf0"; + sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay"; }; dependencies = []; }; - ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2016-06-19"; + clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "clang_complete-2018-01-18"; src = fetchgit { - url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; - sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + url = "https://github.com/Rip-Rip/clang_complete"; + rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; + sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; }; dependencies = []; - + # In addition to the arguments you pass to your compiler, you also need to + # specify the path of the C++ std header (if you are using C++). + # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). + # The linked ruby code shows generates the required '.clang_complete' for cmake based projects + # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 + # as an alternative you can execute the following command: + # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" + ''; }; - vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2017-11-08"; + riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "riv-vim-2018-01-21"; src = fetchgit { - url = "https://github.com/907th/vim-auto-save"; - rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; - sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; + url = "https://github.com/Rykka/riv.vim"; + rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09"; + sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j"; }; dependencies = []; }; - vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2018-03-02"; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-nvim-2018-04-16"; src = fetchgit { - url = "https://github.com/Chiel92/vim-autoformat"; - rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79"; - sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf"; + url = "https://github.com/Shougo/deoplete.nvim"; + rev = "0d48792663437d81bdfa195c676d5c37ef10c89a"; + sha256 = "1zqrxxi7ci1mp5ml7nayj3crzpqgdl09q20wilp68kf2mvll28xi"; }; dependencies = []; }; - vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-02-25"; + ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ultisnips-2018-04-16"; src = fetchgit { - url = "https://github.com/LnL7/vim-nix"; - rev = "36c5feb514930e8fb8e2f4567d6b0d9e806fc2eb"; - sha256 = "1v0vm0h5j6zzwhm5gw3xcmckswma3a5kxyli34i8hy14yli0ff3d"; + url = "https://github.com/SirVer/ultisnips"; + rev = "905e5249246169b6db2bb060e0a2b06eac1890e6"; + sha256 = "025b2f4gs04qb6wnxa0yclwm5jysdj6q10i2zkbiclvblfbxxv19"; }; dependencies = []; }; - tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2018-03-02"; + vim-hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-hoogle-2018-03-04"; src = fetchgit { - url = "https://github.com/Quramy/tsuquyomi"; - rev = "064f5a2ccaf642681634cf06b8ce45751e1d0475"; - sha256 = "12pik378p5c2w219yg8pb8lrdkhxvk0mvkji9dhh0h5v9yzk5x4z"; + url = "https://github.com/Twinside/vim-hoogle"; + rev = "871d104c92e33cb238506f2805f1652561978cc8"; + sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; }; dependencies = []; }; - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-02-28"; + vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gitgutter-2018-04-11"; src = fetchgit { - url = "https://github.com/Shougo/deoplete.nvim"; - rev = "642f9e9b0ed9457734d974aeb9417192077b7551"; - sha256 = "1si07fw1ckgdl74xx0bq6hhd0nyi67gkjanqz4v317zpmzhcvi76"; + url = "https://github.com/airblade/vim-gitgutter"; + rev = "5481318fc1b97e7c04eab5496ec45c63335d6bc1"; + sha256 = "1jwqxkaqvkmdqi9k9nx25xz28av374a70izs0534hx12crgg8g3w"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2017-11-22"; + name = "Spacegray-vim-2018-04-07"; src = fetchgit { url = "https://github.com/ajh17/Spacegray.vim"; - rev = "9a952cee86397ce28aef890209ccee2397d9a32e"; - sha256 = "0ddxkmqcjns0vznqcwji835kkn8pps93kyksx34b57ssr1qq28d1"; + rev = "255a6086aa5af07e38e441964623029a39fa17c1"; + sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj"; }; dependencies = []; @@ -591,6 +608,17 @@ rec { }; + vim-colors-solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-colors-solarized-2011-05-09"; + src = fetchgit { + url = "https://github.com/altercation/vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + }; + dependencies = []; + + }; + vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-closetag-2018-03-09"; src = fetchgit { @@ -602,6 +630,28 @@ rec { }; + ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-z-2015-10-17"; + src = fetchgit { + url = "https://github.com/amiorin/ctrlp-z"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + }; + dependencies = []; + + }; + + vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-logreview-2017-07-08"; + src = fetchgit { + url = "https://github.com/andreshazard/vim-logreview"; + rev = "b7b66ab338e904127d796af49235b8c29742f18f"; + sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + }; + dependencies = []; + + }; + peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "peskcolor-vim-git-2016-06-11"; src = fetchgit { @@ -647,11 +697,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-01-24"; + name = "clighter8-2018-04-15"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "314ab6887cfe785146b86d754441904a927f7999"; - sha256 = "1j2lfx10r978348nycw5mpg2ahwiqcgqml2g2vps5yy9x891fzya"; + rev = "6d325abd043fd1bc31bea821f751996541bfc944"; + sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq"; }; dependencies = []; preFixup = '' @@ -661,11 +711,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-03-18"; + name = "neomake-2018-04-17"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "b225234f71983ed95aac6efb8e4c43ee950a4f20"; - sha256 = "19v0c710yyjd0rlhz43frsh1kcdnj602xz7flqfpv6kbcr5lsq22"; + rev = "df72c7a2f1bdcc08b5dbcd86f165fe7cd5eb6e1f"; + sha256 = "1vlc0irqkl27dyh52wci36fcj80a67fcb9q9cpcbr94lwh4l7l26"; }; dependencies = []; @@ -705,22 +755,22 @@ rec { }; denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2017-11-03"; + name = "denite-extra-2018-03-18"; src = fetchgit { url = "https://github.com/chemzqm/denite-extra"; - rev = "2cea3e857b51fcde425339adeec12854e6cecbb6"; - sha256 = "1qa0ajs6vix0vvm1z7rhxq9bfx4aggq97gxghrxpvsc059c7w9wv"; + rev = "c48443ba1a27375b8a3c04b7b0a5b2c96c7ff62b"; + sha256 = "142s6c4af7h0jrnyl0smflg2wmkwsvhvly04rci3p54x59w7xdc5"; }; dependencies = []; }; denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2017-11-02"; + name = "denite-git-2018-03-20"; src = fetchgit { url = "https://github.com/chemzqm/denite-git"; - rev = "d40026c9b2c0e53ecdd3883d26260f19c74c7dfe"; - sha256 = "0c9602pj67hqfkyvanz5gw1s6vlf8q7s9r55g4dws5aakvjbqc0g"; + rev = "d1feb1470f667a5086ae45136642cefa5fc74810"; + sha256 = "001mwa6691a46lv9m9w8gb2syxgsny6ifv4l80f1chb7hjkblkhh"; }; dependencies = []; @@ -737,6 +787,50 @@ rec { }; + sourcemap-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sourcemap-vim-2012-09-19"; + src = fetchgit { + url = "https://github.com/chikatoike/sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; + }; + dependencies = []; + + }; + + CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "CheckAttach-2017-03-15"; + src = fetchgit { + url = "https://github.com/chrisbra/CheckAttach"; + rev = "b583efd45e03902438a55299623390a0f9253513"; + sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + }; + dependencies = []; + + }; + + csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csv-vim-2018-04-15"; + src = fetchgit { + url = "https://github.com/chrisbra/csv.vim"; + rev = "5ca39450e6d40265086d929ff82ca2c9566fdc68"; + sha256 = "0i6j6c6027vpdcjq6znmkbdbbsdgwqb89jswkyhyx7ff3lwmzryq"; + }; + dependencies = []; + + }; + + sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sparkup-2012-06-10"; + src = fetchgit { + url = "https://github.com/chrisgeo/sparkup"; + rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; + sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sort-motion-2018-03-05"; src = fetchgit { @@ -760,33 +854,55 @@ rec { }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2017-03-31"; + name = "spacevim-2018-03-29"; src = fetchgit { url = "https://github.com/ctjhoa/spacevim"; - rev = "f4cd52c1746021bb3278c6a085e8d07f1c1a9258"; - sha256 = "0y146z0w1cbqwzw84k479a5hxs1phg1s11fqfvszn8928fsm8c4d"; + rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; + sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-02-10"; + name = "ctrlp-vim-2018-04-10"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "35c9b961c916e4370f97cb74a0ba57435a3dbc25"; - sha256 = "08g1w7lfxpp0b175fkyyb8njpz7jwysfba0s20873f2frj6c77rc"; + rev = "4b9e7cac612902a25498cca49f13475fe1a821a4"; + sha256 = "1wa2kxiwipnxwd19gyv6grgqn0ms6zdxsj2xg80whkk3namlgg7m"; + }; + dependencies = []; + + }; + + vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim2hs-2014-04-16"; + src = fetchgit { + url = "https://github.com/dag/vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; + }; + dependencies = []; + + }; + + quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "quickfixstatus-2011-09-02"; + src = fetchgit { + url = "https://github.com/dannyob/quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; }; dependencies = []; }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2017-11-21"; + name = "agda-vim-2018-03-16"; src = fetchgit { url = "https://github.com/derekelkins/agda-vim"; - rev = "13e3b24aeb8677205ff43a79c6c7e090a602b31a"; - sha256 = "17vp11x1w9bibl5ibsvhw5m5ma2r8pzddshgxdvfg22wprx0kcp0"; + rev = "911a9695f550b47e4dedbe8a3dd1b6a9a745fe52"; + sha256 = "1bmi3d39hllrsnsy37dxhziffvs9qzns631gd9psk6xgcchkan7n"; }; dependencies = []; @@ -803,6 +919,17 @@ rec { }; + vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-table-mode-2018-03-22"; + src = fetchgit { + url = "https://github.com/dhruvasagar/vim-table-mode"; + rev = "e646bee5c45201b52f8f879eddf84b5c2e360e98"; + sha256 = "1kaszrik5mqrvavl0lzfy9i0r3b2vf1jmjxp23azy0jfanflrxwa"; + }; + dependencies = []; + + }; + vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jade-2017-04-07"; src = fetchgit { @@ -826,11 +953,11 @@ rec { }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-03-19"; + name = "vim-2018-04-13"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "0743d3d7b3769d012827bc8d1e5375164791cc2f"; - sha256 = "0fxkwvz3a8gpcg958hikpkn8rrhivb40yybvm1lrab5vzzbpphb3"; + rev = "7668d800a20c1f180bb49655d98378f2605ad616"; + sha256 = "07xcqickvw22yx5b91blvb463jn5dpn3drzf8y0nmpz08kfs4qfc"; }; dependencies = []; @@ -847,6 +974,17 @@ rec { }; + ghcmod-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ghcmod-vim-2016-06-19"; + src = fetchgit { + url = "https://github.com/eagletmt/ghcmod-vim"; + rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; + sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + }; + dependencies = []; + + }; + neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-ghc-2017-08-17"; src = fetchgit { @@ -892,11 +1030,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2018-03-20"; + name = "vim-elixir-2018-04-16"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "99022e6a7df9581109a26a369eb12d87eeabb2dc"; - sha256 = "1gs9f0mgp17iib7pxc79gjifwr8qzvl48ybjp985qvlbf5bq0n9z"; + rev = "36e54e1cf965d92f251ead359207d4a7b04cfdf2"; + sha256 = "0y296falc5l6k52vpw1f0bwzxgdbdjiljjg394s472228mnb2r3p"; }; dependencies = []; @@ -925,11 +1063,11 @@ rec { }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-03-04"; + name = "vim-localvimrc-2018-04-05"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "632d27c6c29bb2f05131c4bd2c804b9bf6068d57"; - sha256 = "1xj9qvpvhzi31wj0wp0i67j233vzaj3zpplpacszki31bsai263f"; + rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648"; + sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja"; }; dependencies = []; @@ -957,6 +1095,17 @@ rec { pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; }; + supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "supertab-2017-11-14"; + src = fetchgit { + url = "https://github.com/ervandew/supertab"; + rev = "40fe711e088e2ab346738233dd5adbb1be355172"; + sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + }; + dependencies = []; + + }; + YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "YUNOcommit-vim-2014-11-26"; src = fetchgit { @@ -969,11 +1118,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-03-20"; + name = "vim-go-2018-04-11"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "37e2587aa82fc7a7106a95e86fa54ae54ecb744b"; - sha256 = "00sgij05fs0mqvd1cw4rrym0zv8h45kfiihijwmrlw72jqhys919"; + rev = "7491209072ed4aa746e6fe7894f976ecd251801e"; + sha256 = "1a7fy8n9h383776jixlwxl8y3h8h5mixi0bcv4lv61x0g3xxh8gx"; }; dependencies = []; @@ -1012,6 +1161,50 @@ rec { }; + vim-snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snipmate-2017-04-20"; + src = fetchgit { + url = "https://github.com/garbas/vim-snipmate"; + rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; + sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + + }; + + vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vundle-2018-02-02"; + src = fetchgit { + url = "https://github.com/gmarik/vundle"; + rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; + sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + }; + dependencies = []; + + }; + + csapprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csapprox-2013-07-26"; + src = fetchgit { + url = "https://github.com/godlygeek/csapprox"; + rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; + sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + }; + dependencies = []; + + }; + + tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabular-2016-05-04"; + src = fetchgit { + url = "https://github.com/godlygeek/tabular"; + rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; + sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; + }; + dependencies = []; + + }; + vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-codefmt-2017-03-04"; src = fetchgit { @@ -1024,22 +1217,22 @@ rec { }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2017-04-06"; + name = "vim-jsonnet-2018-04-10"; src = fetchgit { url = "https://github.com/google/vim-jsonnet"; - rev = "2637e273713322befc476760809d46500e6088f3"; - sha256 = "0fxmqasznb3ra49r4j3fmksik7narnd3b6j1j4najp4l61x27ip2"; + rev = "1425166887329363381194adc457b02b663b1354"; + sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; }; dependencies = []; }; vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-maktaba-2017-12-29"; + name = "vim-maktaba-2018-04-09"; src = fetchgit { url = "https://github.com/google/vim-maktaba"; - rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982"; - sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm"; + rev = "77a4dcecd7d65ae2bf362bd7d9055d2806a8edf3"; + sha256 = "0fvspd6q0dj9bqnv8xavfx7xwmg5g68r1kksfv54bbzckkhkw28w"; }; dependencies = []; @@ -1056,6 +1249,17 @@ rec { }; + xterm-color-table-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "xterm-color-table-vim-2013-12-31"; + src = fetchgit { + url = "https://github.com/guns/xterm-color-table.vim"; + rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; + sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + }; + dependencies = []; + + }; + vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jsdoc-2017-12-18"; src = fetchgit { @@ -1078,6 +1282,17 @@ rec { }; + vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snippets-2018-04-16"; + src = fetchgit { + url = "https://github.com/honza/vim-snippets"; + rev = "d081fa5117acdd972bd0a3ec1c0424e79ef6121e"; + sha256 = "0wrm5f15lf6hlyv9ca2a8jil14647acicsmaq34nr11gd375bvvc"; + }; + dependencies = []; + + }; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "idris-vim-2017-12-04"; src = fetchgit { @@ -1089,23 +1304,45 @@ rec { }; + vim-SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-SyntaxRange-2018-03-09"; + src = fetchgit { + url = "https://github.com/inkarkat/vim-SyntaxRange"; + rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; + sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + }; + dependencies = []; + + }; + + vim-extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-extradite-2015-09-22"; + src = fetchgit { + url = "https://github.com/int3/vim-extradite"; + rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; + sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + }; + dependencies = []; + + }; + calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2017-12-14"; + name = "calendar-vim-2018-03-12"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "25009a8eeae8ecca0c0d74f06f62ad82d2557c1c"; - sha256 = "0kswc92frzsgsd2qzajxdndkyd2yxh8gmcxib5a3by8sg27qvi8p"; + rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e"; + sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2018-01-31"; + name = "lightline-vim-2018-04-14"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "78c43c144643e49c529a93b9eaa4eda12614f923"; - sha256 = "1g1s8bi6pzjc9kbqd1mn1d2ym6c90xf22dv2wfli0nyp6dsja2v2"; + rev = "e54d2ae512c9c081bfff9303cb22ffa94ed48ba3"; + sha256 = "042sfdwj46yv0bmf0cm5vm24j197isc3asdj4ymxzh5d6jy2i5qb"; }; dependencies = []; @@ -1122,6 +1359,17 @@ rec { }; + vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-cursorword-2017-10-19"; + src = fetchgit { + url = "https://github.com/itchyny/vim-cursorword"; + rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; + sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; + }; + dependencies = []; + + }; + vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gitbranch-2017-05-28"; src = fetchgit { @@ -1145,11 +1393,11 @@ rec { }; vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-03-08"; + name = "vim-test-git-2018-04-16"; src = fetchgit { url = "https://github.com/janko-m/vim-test.git"; - rev = "3760d79934bb95c782611601187067730e108a26"; - sha256 = "06l4h66vzk4h628q45g3z529m3db28d5qfiabwr6l6x9sph5ha82"; + rev = "61dbd5621bcf0fe74c1008083d7f103f041fc7c7"; + sha256 = "0r5nxspznniviy0j89pmvksgvyzrzvx1qivabbcds7i62vqrxyw0"; }; dependencies = []; @@ -1266,11 +1514,22 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-03-09"; + name = "fzf-vim-2018-04-17"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "a362bc58f1fbbfbbbef749851006e46155979c7d"; - sha256 = "187d7aw5g7nr6cg5la86kdplb32zy58w1mfm3npb47qm9sydgql6"; + rev = "bbda33b402d92d43c75827bd54ee1932cf03a7b6"; + sha256 = "02f16kdgs1ahsja84ls1zpjidcg1yx1bhpp39fd7zqqvzw16mf1q"; + }; + dependencies = []; + + }; + + goyo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "goyo-vim-2017-06-01"; + src = fetchgit { + url = "https://github.com/junegunn/goyo.vim"; + rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; + sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; }; dependencies = []; @@ -1287,6 +1546,28 @@ rec { }; + vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easy-align-2017-06-03"; + src = fetchgit { + url = "https://github.com/junegunn/vim-easy-align"; + rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; + sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; + }; + dependencies = []; + + }; + + vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-dashboard-2017-08-08"; + src = fetchgit { + url = "https://github.com/junegunn/vim-github-dashboard"; + rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; + sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; + }; + dependencies = []; + + }; + vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-peekaboo-2017-03-20"; src = fetchgit { @@ -1342,6 +1623,61 @@ rec { }; + vim-tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-tabpagecd-2013-11-29"; + src = fetchgit { + url = "https://github.com/kana/vim-tabpagecd"; + rev = "8b71a03a037608fa5918f5096812577cec6355e4"; + sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; + }; + dependencies = []; + + }; + + vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-coffee-script-2018-02-27"; + src = fetchgit { + url = "https://github.com/kchmck/vim-coffee-script"; + rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; + sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; + }; + dependencies = []; + + }; + + rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rainbow_parentheses-vim-2013-03-04"; + src = fetchgit { + url = "https://github.com/kien/rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; + }; + dependencies = []; + + }; + + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signature-2018-04-04"; + src = fetchgit { + url = "https://github.com/kshenoy/vim-signature"; + rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8"; + sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72"; + }; + dependencies = []; + + }; + + vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gista-2017-02-20"; + src = fetchgit { + url = "https://github.com/lambdalisue/vim-gista"; + rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; + sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { @@ -1376,11 +1712,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-03-20"; + name = "vimtex-2018-04-15"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "17d809706edcb277f1ee7fa5e33aff3619926fe4"; - sha256 = "0hq9zyrr1c5myi7llh9s2s7qchzsvyz8gdiq6y5r44idwa53na2w"; + rev = "a7fc6f62e8234fc0696cfe4325153e922e2fddd5"; + sha256 = "0bvv9k3zqdmvh80mwhrzxwjacrfq1x56ba7yqndggygfxb3l17mf"; + }; + dependencies = []; + + }; + + cosco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "cosco-vim-2018-02-15"; + src = fetchgit { + url = "https://github.com/lfilho/cosco.vim"; + rev = "434dc68b93b8f42babe1887a269145ce39c97edf"; + sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv"; }; dependencies = []; @@ -1435,27 +1782,93 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2018-03-08"; + name = "vim-highlightedyank-2018-04-17"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "775326f9cf63098a347cea842bb6069590771371"; - sha256 = "1414acj3ma7iydkr8vgysblmbcizflm9ivwhikanj1klyj0jm2rl"; + rev = "6387f7cc3b768300d1fcf82d367dbcb8d16b6230"; + sha256 = "1ldyiy3qlxnxqkqa9yv39y5xkm7gma5gjy6nccqxxxjpjlyj39hb"; + }; + dependencies = []; + + }; + + tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tagbar-2017-12-17"; + src = fetchgit { + url = "https://github.com/majutsushi/tagbar"; + rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; + sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9"; + }; + dependencies = []; + + }; + + vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsbeautify-2018-01-31"; + src = fetchgit { + url = "https://github.com/maksimr/vim-jsbeautify"; + rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; + sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; }; dependencies = []; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Jenkinsfile-vim-syntax-2018-03-05"; + name = "Jenkinsfile-vim-syntax-2018-04-03"; src = fetchgit { url = "https://github.com/martinda/Jenkinsfile-vim-syntax"; - rev = "6d8957428ef53620f00c1ec74d08712f41515085"; - sha256 = "1pn33lvv5cls45vd8g1cm2fi0cm1lzwnsqcacgxcv67l25mg5979"; + rev = "45418b171e06f63e0814cac6a656832384708aba"; + sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; + }; + dependencies = []; + + }; + + gist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gist-vim-2016-10-10"; + src = fetchgit { + url = "https://github.com/mattn/gist-vim"; + rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; + sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + }; + dependencies = []; + + }; + + webapi-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "webapi-vim-2018-03-14"; + src = fetchgit { + url = "https://github.com/mattn/webapi-vim"; + rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; + sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; + }; + dependencies = []; + + }; + + undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "undotree-2017-10-26"; + src = fetchgit { + url = "https://github.com/mbbill/undotree"; + rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; + sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; }; dependencies = []; }; + forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "forms-2012-11-28"; + src = fetchgit { + url = "https://github.com/megaannum/forms"; + rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; + sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + }; + dependencies = ["self"]; + + }; + self = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "self-2014-05-28"; src = fetchgit { @@ -1479,33 +1892,44 @@ rec { }; vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grepper-git-2018-03-06"; + name = "vim-grepper-git-2018-04-13"; src = fetchgit { url = "https://github.com/mhinz/vim-grepper.git"; - rev = "46d78f293b12d8ba743f68ce4fb69881a64d30b2"; - sha256 = "19pbsv8i58r2z5a2yvn8f8v7gjz82nn8mw0hhfzwg5nlj0nn5kx3"; + rev = "27e73cfa7970bf38fe9037c0053a2edbb622b000"; + sha256 = "1hy9rjvfgry9426gflw4k5qmwzmijwg3gzmmzavf7m7sagl101kd"; + }; + dependencies = []; + + }; + + vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signify-2018-04-17"; + src = fetchgit { + url = "https://github.com/mhinz/vim-signify"; + rev = "8351e5212f9415ccc1d9696518e1ec4337ad539f"; + sha256 = "12gix280mmsgn1z1ihbvzh67xqribrc39h670fzyn6302dzb05p0"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-02-28"; + name = "vim-startify-2018-04-10"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "226cafe0a0e42339919577c7388f7acdc554127b"; - sha256 = "1w6ycxha9mcrf5q9f5zr627fg70gmabbd5b4yd8pnhbrsfjyvrf8"; + rev = "532f3db6be8c6e123abb3f6523c419b6b19436da"; + sha256 = "19inxsafsivdwgdvw59x3dbx65xkb09q0k2p66q4n57fj60bajmb"; }; dependencies = []; }; vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-object-2017-03-23"; + name = "vim-indent-object-2018-04-08"; src = fetchgit { url = "https://github.com/michaeljsmith/vim-indent-object"; - rev = "41d700f14b3decccdde421fbfe49e95a084a2f89"; - sha256 = "12mi4n5abfxx7xjl46aw400acgrjf1fxjgzak763l874y0whf5v2"; + rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; + sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; }; dependencies = []; @@ -1547,6 +1971,17 @@ rec { }; + gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gruvbox-2018-02-25"; + src = fetchgit { + url = "https://github.com/morhetz/gruvbox"; + rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; + sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; + }; + dependencies = []; + + }; + hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hlint-refactor-vim-2015-12-05"; src = fetchgit { @@ -1580,12 +2015,23 @@ rec { }; + vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easygit-2018-04-02"; + src = fetchgit { + url = "https://github.com/neoclide/vim-easygit"; + rev = "db10f7bbe0106c7b74875d4530f0c20e6aceee51"; + sha256 = "194mgkyqxn4s8mj8gwkjznixm7kbpzhawr6f0bphk6bc5llphnkr"; + }; + dependencies = []; + + }; + haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2018-01-25"; + name = "haskell-vim-2018-04-13"; src = fetchgit { url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "430b529224c5f9ae53b148f814b7b1fc82b8b525"; - sha256 = "15z259b9b3wbklc8rndsq2rlhgccvxhfgd76yy80jqjmfmzib8kg"; + rev = "e027b314df128979dbd00dd94c9db080db156b5c"; + sha256 = "13dx1ifwa444q8zkwda4qha74xjm4jfhhk9lbgbj9p1mj7gvbl7f"; }; dependencies = []; @@ -1614,6 +2060,17 @@ rec { ''; }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-iced-coffee-script-2013-12-27"; + src = fetchgit { + url = "https://github.com/noc7c9/vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; + }; + dependencies = []; + + }; + shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "shabadou-vim-2016-07-19"; src = fetchgit { @@ -1647,23 +2104,34 @@ rec { }; + vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-javascript-2018-04-06"; + src = fetchgit { + url = "https://github.com/pangloss/vim-javascript"; + rev = "c99c96bdf12b5a5749c9bbdb977b070e14c15eb3"; + sha256 = "1lyiy7vfkliw91j6mvq77n4221fws6hkv0az362r32114d97309l"; + }; + dependencies = []; + + }; + vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2018-03-19"; + name = "vim-markdown-2018-03-23"; src = fetchgit { url = "https://github.com/plasticboy/vim-markdown"; - rev = "45852fa3e937150aae93efb3dc10f4370b4763a9"; - sha256 = "131njs5pw72sknb6kb64g86biw4zmfaibcvm25kbwhxqkl27wxhn"; + rev = "8ace66328c7a2f416671b863cd842712d36c53cc"; + sha256 = "09pcxwwblq2bwdrq6qa42hw7sllgym42n7gb8igg6p9krkwvjx7s"; }; dependencies = []; }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-03-17"; + name = "python-mode-2018-04-09"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "585b369e9cc4710432ae50466f8292725211c2ff"; - sha256 = "03lp9fk6vzagxqiv6lw3p4063hf5ipjss1m7wvhcwkxm8x1i605v"; + rev = "5308d0cc241080057a58c1772ebd254f2922998d"; + sha256 = "1pkwhl9ab1fybc4sp5721xzlrzhzigf34w8zlmxby8v4nvmb8ggq"; }; dependencies = []; @@ -1681,11 +2149,22 @@ rec { }; purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2018-03-11"; + name = "purescript-vim-2018-03-31"; src = fetchgit { url = "https://github.com/raichoo/purescript-vim"; - rev = "bd19dedebc7420565b8aec111e59217da838db59"; - sha256 = "1h7fh5kfs4s735gj2nc7dvsir5fzvg49ajvcg35filwlx13r9nvj"; + rev = "8528d2a4a84f428aefad5882212c34db5c852699"; + sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf"; + }; + dependencies = []; + + }; + + vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pencil-2017-06-14"; + src = fetchgit { + url = "https://github.com/reedes/vim-pencil"; + rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; + sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; }; dependencies = []; @@ -1703,22 +2182,22 @@ rec { }; committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "committia-vim-git-2018-03-01"; + name = "committia-vim-git-2018-04-11"; src = fetchgit { url = "https://github.com/rhysd/committia.vim.git"; - rev = "78d5aceaeed3ba7d6ed503df7ae54a5e7505eed0"; - sha256 = "1wpvjkb62vb70yg7x3k84rk6fv0ykxms7bpn511z8dbs5v8xzzjg"; + rev = "02a317cb49689b2424232d607d218511f921f2e4"; + sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5"; }; dependencies = []; }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-02-24"; + name = "vim-grammarous-2018-04-16"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "c039e40bc9124a2467376da2434a46cd216c49c6"; - sha256 = "1mg3nqm4klimnljd642cd3z7nvhbrg1va09d7bnxcp6flyabpbfh"; + rev = "fc7e73f2af96fb1745887dabde9bf8b945d0273d"; + sha256 = "0zfnbdsva140hc50s4fr1as5c1mn3hfm43x53sk50fylb51r9hr7"; }; dependencies = []; # use `:GrammarousCheck` to initialize checking @@ -1745,11 +2224,11 @@ rec { }; vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2018-03-03"; + name = "vim-puppet-2018-04-12"; src = fetchgit { url = "https://github.com/rodjek/vim-puppet"; - rev = "921ccf81b5e11b40a49c458469ffa46c0d0560f8"; - sha256 = "0c1lnxn2ja68p8vhvv5gzg3m79aiazpfagmjnydfndv1dvbww39a"; + rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; + sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; }; dependencies = []; @@ -1789,22 +2268,55 @@ rec { }; vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2018-03-10"; + name = "vim-devicons-2018-03-14"; src = fetchgit { url = "https://github.com/ryanoasis/vim-devicons"; - rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48"; - sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc"; + rev = "390b0142f1b6f02bdecc4867009e83c9ecc01db2"; + sha256 = "1pzvhdcgyp85xx858a7i357d3xymrd0y2afwfpnsrhz35fsaw96z"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2018-03-13"; + name = "neoformat-2018-04-07"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "9ab966a6def98bab5cd88bcdd9b376da3ce471b4"; - sha256 = "1d745zhmx8ghh9s09kwpmxflgff5lgczcg3gzb46gk7vq7y6s47d"; + rev = "77c2c007508823f353f75a6b525d63ae21e55e82"; + sha256 = "1xrvbkc8y40dgyiq5jnp0nhg19mh7m7v902hb9z3lkl6fsbcwbmb"; + }; + dependencies = []; + + }; + + nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nerdcommenter-2018-03-03"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdcommenter"; + rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1"; + sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4"; + }; + dependencies = []; + + }; + + nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nerdtree-2018-04-10"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdtree"; + rev = "727770147a7589ab3a06722f4852c0237c8b3549"; + sha256 = "105vgwy7qs6l92dm6kfby7lmxv35v2hbpjk9z5sr0qak5rad4m6c"; + }; + dependencies = []; + + }; + + syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "syntastic-2018-04-17"; + src = fetchgit { + url = "https://github.com/scrooloose/syntastic"; + rev = "d31e270cc8affc6338a9ed44e2efcaec0ca4cd34"; + sha256 = "121a1mxgfng2y5zmivyyk02mca8pyw72crivf4f1q9nhn0barf57"; }; dependencies = []; @@ -1822,44 +2334,44 @@ rec { }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2018-02-06"; + name = "vim-polyglot-2018-04-03"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "96c5c20e418fa95b7137b6ef418946f25de91b1b"; - sha256 = "0izqrl6rgfy9rva6qlyib9w3vwdva290cajnyblmxff3gfql1vrj"; + rev = "cab6866e21341cab7419cdb4ae1fd18437d31bb0"; + sha256 = "17mizznm80yj5vz6vajwix8m8xmsn552lph5vmic5dpg7bcny6m6"; }; dependencies = []; }; context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "context_filetype-vim-2018-02-06"; + name = "context_filetype-vim-2018-04-01"; src = fetchgit { url = "https://github.com/shougo/context_filetype.vim"; - rev = "514b50f812904f063736cda3c787db7d9b290151"; - sha256 = "1xb7lcvriyadrzz93vps9hsa2x8vi8lbwfzk2gm2l3i90mf9xddq"; + rev = "9ed76080795ef76f52b8c9ae4432df7cd81abc5a"; + sha256 = "137ki4104j4ch54k9n1l1xd75vbxqssi1fdckzv8kd07m5i159i2"; }; dependencies = []; }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-02-28"; + name = "denite-nvim-2018-04-14"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "b16579be4431a7eb708deb17d73ec641a8c89a54"; - sha256 = "0kabnbqc4j2mgf5m5h0i3yy9pbpk3igrmcwmpq1vs4c4nb1bgkiy"; + rev = "c0c75a752577399be53aa7a7e235e6ff5387494c"; + sha256 = "1zbf2f0w02q8jwr824l6v0pxbc620rwfsah6mxyqbr5mxddcf1v6"; }; dependencies = []; }; echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "echodoc-vim-2018-02-18"; + name = "echodoc-vim-2018-03-26"; src = fetchgit { url = "https://github.com/shougo/echodoc.vim"; - rev = "ba85a728a6628fa22f1e4088637a005f21338cd5"; - sha256 = "119azfkrplr6a14wypaw27rff332ji1rhnw1lfrzq9nir7kfd4p6"; + rev = "f1f711bc814165cf5b09b56fd5d733917ed1c015"; + sha256 = "0l0sm862fbr8p8m4wykx1riidxgp233cq6r2zdm2l7gvmqyj3zcr"; }; dependencies = []; @@ -1888,11 +2400,11 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2018-01-28"; + name = "neocomplete-vim-2018-03-28"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "1401a1c6ab56546c55804ba09e6c9fe87654e954"; - sha256 = "01s2cx1cd4j16pb6ixrx9z8h4dsj2dvlxfly2gzm9khpsgsx454h"; + rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; + sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; }; dependencies = []; @@ -1921,11 +2433,11 @@ rec { }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2018-03-12"; + name = "neosnippet-snippets-2018-04-15"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "4aaa1713c88a74e340a97afa80d0b935f60bfecd"; - sha256 = "10i2b9b8la3ia2f0nkg2bfjz54h0b1slqn1jrb7a8iwg5jmsn7yh"; + rev = "f453635c60998071299c3239c3d881f2be0c248e"; + sha256 = "1df6mzk5yjhjlmzgz7lr9aa69a973mzfxmwldqnpi6yjfnmjn04c"; }; dependencies = []; @@ -1943,11 +2455,11 @@ rec { }; neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoyank-vim-git-2017-12-19"; + name = "neoyank-vim-git-2018-03-26"; src = fetchgit { url = "https://github.com/shougo/neoyank.vim.git"; - rev = "5d6e6f80e1920fc38ab5cf779c424a1fdb49202d"; - sha256 = "0l2gfwyiyzppb0hs9sx3x7ndq9zzinppzqq3njwjzd1qgfv29jpq"; + rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; + sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; }; dependencies = []; @@ -1965,11 +2477,11 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2018-01-12"; + name = "unite-vim-2018-04-14"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "cc0af4798f91e1c3a4a78ae028a3ac3e61d25eb3"; - sha256 = "1vj3bpdyv7wq0xnk9ladacy1giz5x92a62akasbd84bkd79gaxwv"; + rev = "7252fc334ed24722ad70867ba9e4aba125b611d7"; + sha256 = "0r2na9i15qfmshzk0wr845nyn8h8mpbkz5xanjibsch2xz6fps76"; }; dependencies = []; @@ -2016,11 +2528,11 @@ rec { }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2018-02-03"; + name = "alchemist-vim-2018-03-22"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "1bc6ac4405f0b7bbf5dd963313f103f1416f27cb"; - sha256 = "0ff83xknlkb2rdhvpp75nclilb4mlmkr86lp9jwb52dc0a6l2g8i"; + rev = "fdc880663e0d76d29d6310553ae12d51565f692d"; + sha256 = "03p5cw5j1j6v3x9gg61d95qzcijj1q0yqz5qdkjgll0fp507j8ak"; }; dependencies = []; @@ -2059,23 +2571,67 @@ rec { }; + vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-multiple-cursors-2018-04-09"; + src = fetchgit { + url = "https://github.com/terryma/vim-multiple-cursors"; + rev = "8ae5dd3f4f344cc2abe79783a8b808e4093bf084"; + sha256 = "0zj5dm86daqzl6f76prlfalpsb3vxxl7x1k6kza8hcbyicaxsi49"; + }; + dependencies = []; + + }; + vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimpreviewpandoc-2016-03-07"; + name = "vimpreviewpandoc-2018-04-02"; src = fetchgit { url = "https://github.com/tex/vimpreviewpandoc"; - rev = "b109d41ad6478df5ec7f1311950c6efca66f36e4"; - sha256 = "1gx326xarjs3qjygpkrknncad90crjqfx8v6pir4r7k1hl7dfxc4"; + rev = "83b0958b570dace55166f565e2d88c468d99d854"; + sha256 = "1fa8624wxry53x62xjmglgm6kwppfcg50ifbzms555bfjsd4fxn8"; + }; + dependencies = []; + + }; + + vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ft-diff_fold-2013-02-10"; + src = fetchgit { + url = "https://github.com/thinca/vim-ft-diff_fold"; + rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; + }; + dependencies = []; + + }; + + vim-prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-prettyprint-2016-07-16"; + src = fetchgit { + url = "https://github.com/thinca/vim-prettyprint"; + rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; + sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; }; dependencies = []; }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-02-21"; + name = "vim-quickrun-2018-04-16"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "8d864e7feb7ac9dded84808f76fcb3fcd3ed8ae3"; - sha256 = "0m2l1ajgagryaff3gaw91930y5p5ni1s2s4gnahwvqyiq3jdxaxh"; + rev = "630ddff167e30c55d21985713ad6729adeb8e40b"; + sha256 = "0r2gg3a8q5627n28xgyhmb6275xwvg76ghc1wdy38xdszvykh024"; + }; + dependencies = []; + + }; + + vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scouter-2014-08-10"; + src = fetchgit { + url = "https://github.com/thinca/vim-scouter"; + rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; + sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; }; dependencies = []; @@ -2104,33 +2660,77 @@ rec { }; vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-solidity-2018-02-11"; + name = "vim-solidity-2018-04-17"; src = fetchgit { url = "https://github.com/tomlion/vim-solidity"; - rev = "46b87988e196abe646516932427253a838f7fff8"; - sha256 = "0djqqxlh314n6yhn5m2min3nl435n4qcjgsyca7qbz4wvgmbwnlk"; + rev = "569bbbedc3898236d5912fed0caf114936112ae4"; + sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; + }; + dependencies = []; + + }; + + tlib_vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tlib_vim-2018-04-08"; + src = fetchgit { + url = "https://github.com/tomtom/tlib_vim"; + rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; + sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + }; + dependencies = []; + + }; + + vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-commentary-2018-04-06"; + src = fetchgit { + url = "https://github.com/tpope/vim-commentary"; + rev = "296d99b353261191adb7a356ee3fefbce8e6096b"; + sha256 = "1n29rbgm2464byncmgxbvyizmag1gzswg00nfg2387nwprmpg7zj"; }; dependencies = []; }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-03-18"; + name = "vim-dispatch-2018-04-15"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "4104901e9d6a304a5022b780f8e20d3becc7da93"; - sha256 = "1n01g7q6cvdjz3fw7pfmx2r8kzhilxprd25nfj9zj01mbxbkz3mc"; + rev = "f6b3e7799e6dce08869d7744aa7faa6528f065f5"; + sha256 = "1zn6c54hlygkx348vd7kgkfpdj93vsijhc2ma42k6s7vhwqfyylg"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2018-02-18"; + name = "vim-eunuch-2018-03-16"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "b62f7d4d4dcb6bdb840441c11435aa4361ec0454"; - sha256 = "0h6q4jjqb9b0cdbg0ymm5kfw1a2b4m83fqdfw61637rd6i0ganks"; + rev = "0971b4cb5c0865d3dd0316f725cd4236ff75b828"; + sha256 = "1lw2ycgxypp0j8kyvlgn8hivqf1dj9rfrx8n7zgayy5w756g45cy"; + }; + dependencies = []; + + }; + + vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-fugitive-2018-04-15"; + src = fetchgit { + url = "https://github.com/tpope/vim-fugitive"; + rev = "40d78f07dee2ffab68abb9d6d1a9e27843df0fe0"; + sha256 = "16fh3n8sr57cfhfpilqhz9f3svhj4swa9yqjf4wicbw9zn40hrir"; + }; + dependencies = []; + + }; + + vim-pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pathogen-2018-04-05"; + src = fetchgit { + url = "https://github.com/tpope/vim-pathogen"; + rev = "06da921608b971fb47603671bcafdb2843992eb3"; + sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; }; dependencies = []; @@ -2158,6 +2758,28 @@ rec { }; + vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-sensible-2018-01-22"; + src = fetchgit { + url = "https://github.com/tpope/vim-sensible"; + rev = "2d60332fa5b2b1ea346864245569df426052865a"; + sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb"; + }; + dependencies = []; + + }; + + vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-sleuth-2018-03-30"; + src = fetchgit { + url = "https://github.com/tpope/vim-sleuth"; + rev = "3b9df28c39f93c5ec8179d958900be1d0100b536"; + sha256 = "10rba71hmmbgv5kfsl0lmj59z1nz7b2rr6p0dmww82zp6cyzy5j0"; + }; + dependencies = []; + + }; + vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-speeddating-2017-05-24"; src = fetchgit { @@ -2169,6 +2791,28 @@ rec { }; + vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-surround-2016-06-01"; + src = fetchgit { + url = "https://github.com/tpope/vim-surround"; + rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; + sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; + }; + dependencies = []; + + }; + + vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-vinegar-2018-04-03"; + src = fetchgit { + url = "https://github.com/tpope/vim-vinegar"; + rev = "97f3fbc9596f3997ebf8e30bfdd00ebb34597722"; + sha256 = "0y2nzvn4xxbgyjmm4mirwak4hnzka2g3w8xm64f1smh4cb3jn0yf"; + }; + dependencies = []; + + }; + hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hasksyn-2014-09-03"; src = fetchgit { @@ -2191,6 +2835,17 @@ rec { }; + caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "caw-vim-2018-01-01"; + src = fetchgit { + url = "https://github.com/tyru/caw.vim"; + rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; + sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + }; + dependencies = []; + + }; + open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "open-browser-vim-2018-03-11"; src = fetchgit { @@ -2202,12 +2857,23 @@ rec { }; + neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-look-2018-01-21"; + src = fetchgit { + url = "https://github.com/ujihisa/neco-look"; + rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; + sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; + }; + dependencies = []; + + }; + youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-03-19"; + name = "youcompleteme-2018-04-16"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "788c293aee78c6ab60cbc06bbc3339e7b2bff98f"; - sha256 = "1a7dgk04lgai51s9yjxzc87cdmm9wix2fx4kfm95s02qm2dnryci"; + rev = "6975efddc1a90514db7c8ee882ccac91f70ff4cc"; + sha256 = "1zmbb91fc0axavxln4milmn95d9szx8zwdiiwqjdyybkm29nxhc9"; }; dependencies = []; buildPhase = '' @@ -2228,12 +2894,23 @@ rec { }; }; + vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-airline-2018-04-17"; + src = fetchgit { + url = "https://github.com/vim-airline/vim-airline"; + rev = "3ad4a18d858bb80d45a1c054b845021abe5c8f0d"; + sha256 = "1sgf9czgajba8nf7xbfa2dm26vw356ca55m1myaxlkqrlcckcvav"; + }; + dependencies = []; + + }; + vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2018-01-05"; + name = "vim-airline-themes-2018-03-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "4b7f77e770a2165726072a2b6f109f2457783080"; - sha256 = "02wbch9mbj0slafd5jrklmyawrxpisf8c3f5c72gq30j8hlyb86n"; + rev = "b0fca80555b8249f3c62271b7635542a7de22363"; + sha256 = "1ap7b7v1v3n4hpnj2w24w0dli2sliphvpyfhkdbhbq4c30znm1pk"; }; dependencies = []; @@ -2272,6 +2949,17 @@ rec { }; + vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ruby-2018-04-01"; + src = fetchgit { + url = "https://github.com/vim-ruby/vim-ruby"; + rev = "71f5df78a45c5458da793b2c897ff5dcdcd9a819"; + sha256 = "1nblkhb1yp3q0rfq43l9968inn1z26vngf28n23y161ncfmq674y"; + }; + dependencies = []; + + }; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Colour-Sampler-Pack-2012-11-29"; src = fetchgit { @@ -2316,6 +3004,17 @@ rec { }; + YankRing-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "YankRing-vim-2015-07-28"; + src = fetchgit { + url = "https://github.com/vim-scripts/YankRing.vim"; + rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; + sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; + }; + dependencies = []; + + }; + a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "a-vim-2010-11-06"; src = fetchgit { @@ -2349,6 +3048,17 @@ rec { }; + bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "bats-vim-2013-07-03"; + src = fetchgit { + url = "https://github.com/vim-scripts/bats.vim"; + rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; + sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; + }; + dependencies = []; + + }; + changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "changeColorScheme-vim-2010-10-17"; src = fetchgit { @@ -2360,6 +3070,17 @@ rec { }; + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "matchit-zip-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/matchit.zip"; + rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; + sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; + }; + dependencies = []; + + }; + mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "mayansmoke-git-2010-10-17"; src = fetchgit { @@ -2393,6 +3114,17 @@ rec { }; + taglist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "taglist-vim-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/taglist.vim"; + rev = "53041fbc45398a9af631a20657e109707a455339"; + sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; + }; + dependencies = []; + + }; + wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "wombat256-vim-2010-10-17"; src = fetchgit { @@ -2404,23 +3136,45 @@ rec { }; + vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimoutliner-2018-04-09"; + src = fetchgit { + url = "https://github.com/vimoutliner/vimoutliner"; + rev = "4f12628247940d98eedd594961695dc504261058"; + sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78"; + }; + dependencies = []; + + }; + + vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimwiki-2018-04-17"; + src = fetchgit { + url = "https://github.com/vimwiki/vimwiki"; + rev = "90dc1e58717bd25798bb16d3badab8908b619912"; + sha256 = "01a2gy1r4k5gw7vrdn6p0vmybb2s0gf9q0w07qps5cnxapsggxk9"; + }; + dependencies = []; + + }; + ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-03-10"; + name = "ale-2018-04-17"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "05d39bc1a9eb79ff6f36b190b4612ff052812e7e"; - sha256 = "0p8pllh93bd43051rjcw9jamkmldb0rc3x8llw010m05jgrkngda"; + rev = "f9ba3d924fc445ceea6ab7a6700b95dd12d268ca"; + sha256 = "12905gq95xif3963720yqywvzpvxz7j8qyk0i6pnmzjf92xnk8xm"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2018-01-28"; + name = "vim-wakatime-2018-04-05"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "dadf0bc9697a3eea043190e9ccfe4fb2e53a20ca"; - sha256 = "0fimkkkxii0g12xfbq8vs0i50ffincsbpz96x55q0j7gnlxbhwfr"; + rev = "e0e7621f18a8763b851b0feb4a735633bf147cf7"; + sha256 = "1xnrcxd7r08hqrv2fnv8x8p60nx2flh2pfcr4pkkscr0ilinakwz"; }; dependencies = []; buildInputs = [ python ]; @@ -2485,6 +3239,17 @@ rec { }; + vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-latex-live-preview-2017-11-09"; + src = fetchgit { + url = "https://github.com/xuhdev/vim-latex-live-preview"; + rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; + sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; + }; + dependencies = []; + + }; + nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "nim-vim-2018-02-27"; src = fetchgit { @@ -2504,7 +3269,7 @@ rec { sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -2514,783 +3279,24 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2018-02-25"; + name = "deoplete-jedi-2018-04-07"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "0410de74239b79d9fc21fe1076e46a97aa0d44cc"; - sha256 = "0bp4d5q5y72bhmrwcczz6g1z53n372qydbsxjl7r2amaiy0l3yl0"; + rev = "eb777b50b7d218a23464c7d58c8573b5223d52f4"; + sha256 = "1j2jfvgzj2y7pp8z441rs8ffbn1hmiwa7h556kf6mjlmyzs5cfma"; }; dependencies = []; }; zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2018-03-16"; + name = "zig-vim-2018-04-15"; src = fetchgit { url = "https://github.com/zig-lang/zig.vim"; - rev = "7d2905a945308cc5ac4e0c32d9f5be86edf08399"; - sha256 = "1afy9md2xb7acrphwmplyrln8h6cckbfd6a6ls0hlmb3jybzk0zy"; - }; - dependencies = []; - - }; - - goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2017-06-01"; - src = fetchgit { - url = "git://github.com/junegunn/goyo.vim"; - rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; - sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; - }; - dependencies = []; - - }; - - gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gruvbox-2018-02-25"; - src = fetchgit { - url = "git://github.com/morhetz/gruvbox"; - rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; - sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; + rev = "eba14b79890b674432a78291ff0f16de4da2ed08"; + sha256 = "1yj7gijwbsc1vrxlb158pf083ahrpgg5g7j3gjrkrazdcmmx5d2j"; }; dependencies = []; }; - - maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "maktaba-2017-12-29"; - src = fetchgit { - url = "git://github.com/google/vim-maktaba"; - rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982"; - sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm"; - }; - dependencies = []; - - }; - - matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "matchit-zip"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; - name = "matchit.zip"; - sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=39"; - }; - - unpackPhase = '' - ( - sourceRoot=d - mkdir $sourceRoot; cd $sourceRoot; - unzip $src - ) - ''; - }; - - neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-look-2018-01-21"; - src = fetchgit { - url = "git://github.com/ujihisa/neco-look"; - rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; - sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; - }; - dependencies = []; - - }; - - pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2018-03-14"; - src = fetchgit { - url = "git://github.com/tpope/vim-pathogen"; - rev = "f4fd6044e37a4e255f2ea934e9e1ebc7bfe70f70"; - sha256 = "1fjnfr8zjk39xvv64qg7ydic87gmg547siqplxgdv9a0vkk0p7jd"; - }; - dependencies = []; - - }; - - prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "prettyprint-2016-07-16"; - src = fetchgit { - url = "git://github.com/thinca/vim-prettyprint"; - rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; - sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; - }; - dependencies = []; - - }; - - quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus-2011-09-02"; - src = fetchgit { - url = "git://github.com/dannyob/quickfixstatus"; - rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; - }; - dependencies = []; - - }; - - rainbow_parentheses = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses-2013-03-04"; - src = fetchgit { - url = "git://github.com/kien/rainbow_parentheses.vim"; - rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; - }; - dependencies = []; - - }; - - riv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "riv-2018-01-21"; - src = fetchgit { - url = "git://github.com/Rykka/riv.vim"; - rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09"; - sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j"; - }; - dependencies = []; - - }; - - sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2018-01-22"; - src = fetchgit { - url = "git://github.com/tpope/vim-sensible"; - rev = "2d60332fa5b2b1ea346864245569df426052865a"; - sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb"; - }; - dependencies = []; - - }; - - sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2017-10-24"; - src = fetchgit { - url = "git://github.com/tpope/vim-sleuth"; - rev = "d56a4302358359ddf9845252addf637a5e6bd6d5"; - sha256 = "1klp2lqsql90v156kih0mnm0j957pc4r0zy5y6srww2q3wkkjgr2"; - }; - dependencies = []; - - }; - - snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2017-04-20"; - src = fetchgit { - url = "git://github.com/garbas/vim-snipmate"; - rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; - sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - sourcemap = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap-2012-09-19"; - src = fetchgit { - url = "git://github.com/chikatoike/sourcemap.vim"; - rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; - }; - dependencies = []; - - }; - - sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sparkup-2012-06-10"; - src = fetchgit { - url = "git://github.com/chrisgeo/sparkup"; - rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; - sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; - }; - dependencies = []; - - }; - - surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround-2016-06-01"; - src = fetchgit { - url = "git://github.com/tpope/vim-surround"; - rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; - sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; - }; - dependencies = []; - - }; - - table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2018-03-17"; - src = fetchgit { - url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "d0a640518957417ce689411d807dff3bf9eca194"; - sha256 = "1b6mka45lhb7n06pjxg697ha63gg4vw6zgj0v037w1izj619xa33"; - }; - dependencies = []; - - }; - - tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabpagecd-2013-11-29"; - src = fetchgit { - url = "git://github.com/kana/vim-tabpagecd"; - rev = "8b71a03a037608fa5918f5096812577cec6355e4"; - sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; - }; - dependencies = []; - - }; - - taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "taglist"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=19574"; - name = "taglist_46.zip"; - sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=273"; - }; - - setSourceRoot = '' - export sourceRoot=taglist - mkdir taglist - mv doc taglist - mv plugin taglist - ''; - }; - - tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2017-08-13"; - src = fetchgit { - url = "git://github.com/tomtom/tlib_vim"; - rev = "c96db6151fde9d06a8fed71b7df05c6dbb3f14fe"; - sha256 = "1dhvf1v2mkmq8aifwq57ylm7nnk3zz3hna33q2gj6p7v70vay7v8"; - }; - dependencies = []; - - }; - - undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2017-10-26"; - src = fetchgit { - url = "git://github.com/mbbill/undotree"; - rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; - sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; - }; - dependencies = []; - - }; - - vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions-2018-01-18"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-actions"; - rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; - sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2017-03-20"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-async"; - rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; - sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; - }; - dependencies = ["vim-addon-signs"]; - - }; - - vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd-2015-12-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-background-cmd"; - rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; - sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; - }; - dependencies = ["vim-addon-mw-utils"]; - - }; - - vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting-2013-06-10"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-commenting"; - rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; - }; - dependencies = []; - - }; - - vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion-2015-02-10"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; - sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats-2014-11-05"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; - }; - dependencies = []; - - }; - - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation - 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 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc-2015-03-19"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; - }; - dependencies = []; - - }; - - vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2017-05-07"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; - sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; - }; - dependencies = []; - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; - }; - - vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru-2013-08-08"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; - }; - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - - }; - - vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils-2018-03-09"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mw-utils"; - rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; - sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; - }; - dependencies = []; - - }; - - vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix-2017-09-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; - sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; - }; - 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-2014-07-15"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-other"; - rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; - }; - dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; - - }; - - vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual-2015-01-01"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-php-manual"; - rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; - }; - dependencies = []; - - }; - - vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs-2013-04-19"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-signs"; - rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; - }; - dependencies = []; - - }; - - vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2017-02-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-sql"; - rev = "048a139af36829fce670c8ff80d3aad927557ee6"; - sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; - }; - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; - - }; - - vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker-2017-06-26"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; - sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer-2012-01-13"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug-2014-08-29"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-xdebug"; - rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; - }; - dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; - - }; - - vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-03-20"; - src = fetchgit { - url = "git://github.com/vim-airline/vim-airline"; - rev = "b9f55455fb50234b3f2ac86f5d70607efade31bd"; - sha256 = "1yqx5mabanykaqrmgnppw870k25qs59vh5wpcwghwf2qf033mfll"; - }; - dependencies = []; - - }; - - vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2018-02-27"; - src = fetchgit { - url = "git://github.com/kchmck/vim-coffee-script"; - rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; - sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; - }; - dependencies = []; - - }; - - vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-cursorword-2017-10-19"; - src = fetchgit { - url = "git://github.com/itchyny/vim-cursorword"; - rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; - sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; - }; - dependencies = []; - - }; - - vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2017-06-03"; - src = fetchgit { - url = "git://github.com/junegunn/vim-easy-align"; - rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; - sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; - }; - dependencies = []; - - }; - - vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ft-diff_fold-2013-02-10"; - src = fetchgit { - url = "git://github.com/thinca/vim-ft-diff_fold"; - rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; - sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; - }; - dependencies = []; - - }; - - vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2017-02-20"; - src = fetchgit { - url = "git://github.com/lambdalisue/vim-gista"; - rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; - sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; - }; - dependencies = []; - - }; - - vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-03-16"; - src = fetchgit { - url = "git://github.com/airblade/vim-gitgutter"; - rev = "37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"; - sha256 = "0l7sz77ymy5g6j7ads70r3xhvaymwmvlqi7hy1k40giq4dxzivv7"; - }; - dependencies = []; - - }; - - vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dashboard-2017-08-08"; - src = fetchgit { - url = "git://github.com/junegunn/vim-github-dashboard"; - rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; - sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; - }; - dependencies = []; - - }; - - vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script-2013-12-27"; - src = fetchgit { - url = "git://github.com/noc7c9/vim-iced-coffee-script"; - rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; - }; - dependencies = []; - - }; - - vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-03-04"; - src = fetchgit { - url = "git://github.com/pangloss/vim-javascript"; - rev = "3e0b1af8c2b2b613add52d782b29f325c6a414e3"; - sha256 = "1rxds6sswnm7xyy39ljwhykb3r6jd9jsm1lbhhw2r226d56pj15w"; - }; - dependencies = []; - - }; - - vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsbeautify-2018-01-31"; - src = fetchgit { - url = "git://github.com/maksimr/vim-jsbeautify"; - rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; - sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; - }; - dependencies = []; - - }; - - vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-11-09"; - src = fetchgit { - url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; - sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; - }; - dependencies = []; - - }; - - vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-logreview-2017-07-08"; - src = fetchgit { - url = "git://github.com/andreshazard/vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; - }; - dependencies = []; - - }; - - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-03-20"; - src = fetchgit { - url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "13232e4b544775cf2b039571537b0e630406f801"; - sha256 = "0ib0gj5ybmlb4lajhl1pc41kgfxaj19z22jsxc5sr0q67xwfpki4"; - }; - dependencies = []; - - }; - - vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pencil-2017-06-14"; - src = fetchgit { - url = "git://github.com/reedes/vim-pencil"; - rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; - sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; - }; - dependencies = []; - - }; - - vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2018-03-02"; - src = fetchgit { - url = "git://github.com/vim-ruby/vim-ruby"; - rev = "15e32500f58c3bb66eb6b1eb4af57d86263895c0"; - sha256 = "15lhg4wdrx7989rbawpa2jlfrfnhf5km76g8ld5b2c2gqixxy4aj"; - }; - dependencies = []; - - }; - - vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scouter-2014-08-10"; - src = fetchgit { - url = "git://github.com/thinca/vim-scouter"; - rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; - sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; - }; - dependencies = []; - - }; - - vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2018-02-28"; - src = fetchgit { - url = "git://github.com/kshenoy/vim-signature"; - rev = "21b03ff51d08775a44417db14bf6dee690723d06"; - sha256 = "1v36zkr8jkhhfsdli6rvrz3akcr8bmfqyrkxb2izb0c250b9swrg"; - }; - dependencies = []; - - }; - - vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-02-21"; - src = fetchgit { - url = "git://github.com/mhinz/vim-signify"; - rev = "26ed57e0fe7a28c8763920e946b2225ec577df3f"; - sha256 = "0xkmyzm79gay1cga9znlsdk3mwc6smavv7xg5x6gr8a17wjipmlm"; - }; - dependencies = []; - - }; - - vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-03-05"; - src = fetchgit { - url = "git://github.com/honza/vim-snippets"; - rev = "f02955d40b64c9db6f6bdeee40d0f44a00c58865"; - sha256 = "0ylbvr88xh1lw4lbiiwg617wp4r25d32wl4rsb7s2c5isy6aimki"; - }; - dependencies = []; - - }; - - vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2018-03-10"; - src = fetchgit { - url = "git://github.com/ryanoasis/vim-devicons"; - rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48"; - sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc"; - }; - dependencies = []; - - }; - - vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs-2014-04-16"; - src = fetchgit { - url = "git://github.com/dag/vim2hs"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; - }; - dependencies = []; - - }; - - vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-03-18"; - src = fetchgit { - url = "git://github.com/vimwiki/vimwiki"; - rev = "16b9e45b03baa377cee807f2bef7d97682e8bad6"; - sha256 = "1ja3rspabsva6ja4jrbl19mck5k8lvss82sl3l2wgc8cv8ya1kkq"; - }; - dependencies = []; - - }; - - vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vinegar-2017-12-28"; - src = fetchgit { - url = "git://github.com/tpope/vim-vinegar"; - rev = "44bc76a6abf6aeafa4d0808288bb4fcc9a2e98f8"; - sha256 = "1h612j0w0kz2f8575r63dzdi65fhq77dp7rhziixs3pkq54pqcsg"; - }; - dependencies = []; - - }; - - vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2018-02-02"; - src = fetchgit { - url = "git://github.com/gmarik/vundle"; - rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; - sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; - }; - dependencies = []; - - }; - - xterm-color-table = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xterm-color-table-2013-12-31"; - src = fetchgit { - url = "git://github.com/guns/xterm-color-table.vim"; - rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; - sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; - }; - dependencies = []; - - }; - - zeavim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zeavim-2017-12-20"; - src = fetchgit { - url = "git://github.com/KabbAmine/zeavim.vim"; - rev = "88f81078059d98d7637a93b90730897a3af231a4"; - sha256 = "1p43f6bbs9fcvvp1i90kzx1xj7k6c5w3ajf9wlrplpkz6hsiv2wv"; - }; - dependencies = []; - - }; - } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 577b30bf7b24..fcc4fcaa76f4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,39 +1,11 @@ -"CSApprox" -"CheckAttach" -"Cosco" -"Gist" -"Hoogle" -"Solarized" -"Supertab" -"Syntastic" -"SyntaxRange" -"Tabular" -"Tagbar" -"The_NERD_Commenter" -"The_NERD_tree" -"UltiSnips" -"VimOutliner" -"WebAPI" -"YankRing" -"caw" -"clang_complete" -"commentary" -"csv" -"ctrlp-cmatcher" -"ctrlp-py-matcher" -"ctrlp-z" -"easygit" -"extradite" -"fugitive" -"ghcmod" "github:907th/vim-auto-save" -"github:Chiel92/vim-autoformat" -"github:LnL7/vim-nix" -"github:Quramy/tsuquyomi" -"github:Shougo/deoplete.nvim" +"github:airblade/vim-gitgutter" "github:ajh17/Spacegray.vim" "github:albfan/nerdtree-git-plugin" +"github:altercation/vim-colors-solarized" "github:alvan/vim-closetag" +"github:amiorin/ctrlp-z" +"github:andreshazard/vim-logreview" "github:andsild/peskcolor.vim.git" "github:andviro/flake8-vim" "github:ap/vim-css-color" @@ -45,17 +17,26 @@ "github:cespare/vim-toml" "github:chemzqm/denite-extra" "github:chemzqm/denite-git" +"github:Chiel92/vim-autoformat" "github:chikatoike/concealedyank.vim" +"github:chikatoike/sourcemap.vim" +"github:chrisbra/CheckAttach" +"github:chrisbra/csv.vim" +"github:chrisgeo/sparkup" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" "github:ctrlpvim/ctrlp.vim" +"github:dag/vim2hs" +"github:dannyob/quickfixstatus" "github:derekelkins/agda-vim" "github:derekwyatt/vim-scala" +"github:dhruvasagar/vim-table-mode" "github:digitaltoad/vim-jade" "github:dleonard0/pony-vim-syntax" "github:dracula/vim" "github:drmingdrmer/xptemplate" +"github:eagletmt/ghcmod-vim" "github:eagletmt/neco-ghc" "github:editorconfig/editorconfig-vim" "github:ehamberg/vim-cute-python.git" @@ -66,24 +47,36 @@ "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" "github:ensime/ensime-vim" +"github:ervandew/supertab" "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" +"github:FelikZ/ctrlp-py-matcher" "github:flazz/vim-colorschemes" "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" +"github:garbas/vim-snipmate" +"github:gmarik/vundle" +"github:godlygeek/csapprox" +"github:godlygeek/tabular" "github:google/vim-codefmt" "github:google/vim-jsonnet" "github:google/vim-maktaba" "github:gregsexton/gitv" +"github:guns/xterm-color-table.vim" "github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" +"github:honza/vim-snippets" "github:idris-hackers/idris-vim" +"github:inkarkat/vim-SyntaxRange" +"github:int3/vim-extradite" "github:itchyny/calendar.vim" "github:itchyny/lightline.vim" "github:itchyny/thumbnail.vim" +"github:itchyny/vim-cursorword" "github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" "github:janko-m/vim-test.git" +"github:JazzCore/ctrlp-cmatcher" "github:jceb/vim-hier" "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" @@ -94,58 +87,108 @@ "github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" "github:joonty/vim-xdebug" +"github:JuliaEditorSupport/julia-vim" "github:junegunn/fzf.vim" +"github:junegunn/goyo.vim" "github:junegunn/limelight.vim" +"github:junegunn/vim-easy-align" +"github:junegunn/vim-github-dashboard" "github:junegunn/vim-peekaboo" "github:justincampbell/vim-eighties" +"github:KabbAmine/zeavim.vim" "github:kana/vim-niceblock" "github:kana/vim-operator-replace" "github:kana/vim-operator-user" +"github:kana/vim-tabpagecd" +"github:kchmck/vim-coffee-script" +"github:kien/rainbow_parentheses.vim" +"github:kshenoy/vim-signature" +"github:lambdalisue/vim-gista" "github:latex-box-team/latex-box" "github:leafgarland/typescript-vim" "github:lepture/vim-jinja" "github:lervag/vimtex" +"github:lfilho/cosco.vim" +"github:LnL7/vim-nix" "github:lokaltog/vim-easymotion" "github:ludovicchabant/vim-lawrencium" "github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" "github:machakann/vim-highlightedyank" +"github:majutsushi/tagbar" +"github:maksimr/vim-jsbeautify" +"github:MarcWeber/vim-addon-actions" +"github:MarcWeber/vim-addon-async" +"github:MarcWeber/vim-addon-background-cmd" +"github:MarcWeber/vim-addon-commenting" +"github:MarcWeber/vim-addon-completion" +"github:MarcWeber/vim-addon-errorformats" +"github:MarcWeber/vim-addon-goto-thing-at-cursor" +"github:MarcWeber/vim-addon-local-vimrc" +"github:MarcWeber/vim-addon-manager" +"github:MarcWeber/vim-addon-mru" +"github:MarcWeber/vim-addon-mw-utils" +"github:MarcWeber/vim-addon-nix" +"github:MarcWeber/vim-addon-other" +"github:MarcWeber/vim-addon-php-manual" +"github:MarcWeber/vim-addon-signs" +"github:MarcWeber/vim-addon-sql" +"github:MarcWeber/vim-addon-syntax-checker" +"github:MarcWeber/vim-addon-toggle-buffer" +"github:MarcWeber/vim-addon-xdebug" "github:martinda/Jenkinsfile-vim-syntax" +"github:mattn/gist-vim" +"github:mattn/webapi-vim" +"github:mbbill/undotree" "github:megaannum/forms" "github:megaannum/self" "github:mfukar/robotframework-vim" "github:mhinz/vim-grepper.git" +"github:mhinz/vim-signify" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" "github:mindriot101/vim-yapf" "github:mkasa/lushtags" +"github:morhetz/gruvbox" "github:mpickering/hlint-refactor-vim" "github:nathanaelkane/vim-indent-guides" "github:nbouscal/vim-stylish-haskell" +"github:neoclide/vim-easygit" "github:neovimhaskell/haskell-vim" "github:nixprime/cpsm" +"github:noc7c9/vim-iced-coffee-script" "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-textobj-multiblock" "github:osyo-manga/vim-watchdogs" +"github:pangloss/vim-javascript" "github:plasticboy/vim-markdown" "github:python-mode/python-mode" +"github:Quramy/tsuquyomi" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" +"github:reedes/vim-pencil" "github:reedes/vim-wordy" "github:rhysd/committia.vim.git" "github:rhysd/vim-grammarous" "github:rhysd/vim-operator-surround" +"github:Rip-Rip/clang_complete" "github:rodjek/vim-puppet" "github:roxma/nvim-cm-racer" "github:roxma/nvim-completion-manager" "github:rust-lang/rust.vim" "github:ryanoasis/vim-devicons" +"github:ryanoasis/vim-devicons" +"github:Rykka/riv.vim" "github:sbdchd/neoformat" +"github:scrooloose/nerdcommenter" +"github:scrooloose/nerdtree" +"github:scrooloose/syntastic" "github:sebastianmarkow/deoplete-rust" "github:sheerun/vim-polyglot" "github:shougo/context_filetype.vim" "github:shougo/denite.nvim" +"github:Shougo/deoplete.nvim" "github:shougo/echodoc.vim" "github:shougo/neco-syntax" "github:shougo/neco-vim" @@ -159,41 +202,65 @@ "github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" +"github:SirVer/ultisnips" "github:sjl/gundo.vim" "github:slashmili/alchemist.vim" "github:t9md/vim-smalls" "github:takac/vim-hardtime" "github:terryma/vim-expand-region" +"github:terryma/vim-multiple-cursors" "github:tex/vimpreviewpandoc" +"github:thinca/vim-ft-diff_fold" +"github:thinca/vim-prettyprint" "github:thinca/vim-quickrun" +"github:thinca/vim-scouter" "github:thinca/vim-themis" "github:tomasr/molokai" "github:tomlion/vim-solidity" +"github:tomtom/tlib_vim" +"github:tpope/vim-commentary" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" +"github:tpope/vim-fugitive" +"github:tpope/vim-pathogen" "github:tpope/vim-repeat" "github:tpope/vim-rhubarb" +"github:tpope/vim-sensible" +"github:tpope/vim-sleuth" "github:tpope/vim-speeddating" +"github:tpope/vim-surround" +"github:tpope/vim-vinegar" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" +"github:Twinside/vim-hoogle" +"github:tyru/caw.vim" "github:tyru/open-browser.vim" +"github:ujihisa/neco-look" "github:valloric/youcompleteme" +"github:vim-airline/vim-airline" "github:vim-airline/vim-airline-themes" +"github:vimoutliner/vimoutliner" "github:vim-pandoc/vim-pandoc" "github:vim-pandoc/vim-pandoc-after" "github:vim-pandoc/vim-pandoc-syntax" -"github:vim-scripts/Colour-Sampler-Pack" -"github:vim-scripts/Improved-AnsiEsc" -"github:vim-scripts/Rename" -"github:vim-scripts/ReplaceWithRegister" -"github:vim-scripts/a.vim" +"github:vim-ruby/vim-ruby" "github:vim-scripts/align" "github:vim-scripts/argtextobj.vim" +"github:vim-scripts/a.vim" +"github:vim-scripts/bats.vim" "github:vim-scripts/changeColorScheme.vim" +"github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/Improved-AnsiEsc" +"github:vim-scripts/matchit.zip" "github:vim-scripts/mayansmoke.git" "github:vim-scripts/random.vim" +"github:vim-scripts/Rename" +"github:vim-scripts/ReplaceWithRegister" "github:vim-scripts/tabmerge" +"github:vim-scripts/taglist.vim" "github:vim-scripts/wombat256.vim" +"github:vim-scripts/YankRing.vim" +"github:vimwiki/vimwiki" "github:w0rp/ale" "github:wakatime/vim-wakatime" "github:wellle/targets.vim" @@ -201,73 +268,8 @@ "github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" +"github:xuhdev/vim-latex-live-preview" "github:zah/nim.vim" "github:zchee/deoplete-go" "github:zchee/deoplete-jedi" "github:zig-lang/zig.vim" -"goyo" -"gruvbox" -"matchit.zip" -"neco-look" -"pathogen" -"prettyprint" -"quickfixstatus" -"rainbow_parentheses" -"riv" -"sensible" -"sleuth" -"snipmate" -"sourcemap" -"sparkup" -"surround" -"table-mode" -"tabpagecd" -"taglist" -"tlib" -"undotree" -"vim-addon-actions" -"vim-addon-async" -"vim-addon-background-cmd" -"vim-addon-commenting" -"vim-addon-completion" -"vim-addon-errorformats" -"vim-addon-goto-thing-at-cursor" -"vim-addon-local-vimrc" -"vim-addon-manager" -"vim-addon-mru" -"vim-addon-mw-utils" -"vim-addon-nix" -"vim-addon-other" -"vim-addon-php-manual" -"vim-addon-signs" -"vim-addon-sql" -"vim-addon-syntax-checker" -"vim-addon-toggle-buffer" -"vim-addon-xdebug" -"vim-airline" -"vim-coffee-script" -"vim-cursorword" -"vim-easy-align" -"vim-ft-diff_fold" -"vim-gista" -"vim-gitgutter" -"vim-github-dashboard" -"vim-iced-coffee-script" -"vim-javascript" -"vim-jsbeautify" -"vim-latex-live-preview" -"vim-logreview" -"vim-multiple-cursors" -"vim-pencil" -"vim-ruby" -"vim-scouter" -"vim-signature" -"vim-signify" -"vim-snippets" -"vim-webdevicons" -"vim2hs" -"vimwiki" -"vinegar" -"vundle" -"xterm-color-table" -"zeavim" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm index ea360765925b..c3a210a642d2 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm @@ -4,6 +4,7 @@ cmake boost icu + ncurses ]; buildPhase = '' patchShebangs . diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip deleted file mode 100644 index cc9d3fb72640..000000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip +++ /dev/null @@ -1,7 +0,0 @@ - unpackPhase = '' - ( - sourceRoot=d - mkdir $sourceRoot; cd $sourceRoot; - unzip $src - ) - ''; diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 87c782222fc5..c537aa8a1f92 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -120,9 +120,9 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with stdenv.lib; { license = licenses.unfree; - maintainer = [ maintainers.jraygauthier ]; + maintainers = [ maintainers.jraygauthier ]; # A 32 bit linux would also be possible with some effort (specific download of binaries + # patching of the elf files with 32 bit interpreter). platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 4e28de871b84..430ce192ed0d 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -36,6 +36,6 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with lib; { license = licenses.mit; - maintainer = [ maintainers.jraygauthier ]; + maintainers = [ maintainers.jraygauthier ]; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 83cb559dca12..4c095278f918 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -37,7 +37,7 @@ let installPhase = '' mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}" - find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" + find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" ''; }); diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix new file mode 100644 index 000000000000..aa73c7f86c40 --- /dev/null +++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -0,0 +1,19 @@ +{ fetchFromGitHub, stdenv }: + +# Reverse engineered CoreSymbolication to make dtrace buildable + +stdenv.mkDerivation rec { + name = "CoreSymbolication"; + + src = fetchFromGitHub { + repo = name; + owner = "matthewbauer"; + rev = "671fcb66c82eac1827f3f53dc4cc4e9b1b94da0a"; + sha256 = "0qpw46gwgjxiwqqjxksb8yghp2q8dwad6hzaf4zl82xpvk9n5ahj"; + }; + + installPhase = '' + mkdir -p $out/include + cp -r CoreSymbolication $out/include + ''; +} diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 5a58410ae926..7f6f0cdd0c48 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -210,6 +210,13 @@ in rec { ]; }); + CoreMIDI = stdenv.lib.overrideDerivation super.CoreMIDI (drv: { + __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ + "/System/Library/PrivateFrameworks/" + ]; + setupHook = ./private-frameworks-setup-hook.sh; + }); + Security = stdenv.lib.overrideDerivation super.Security (drv: { setupHook = ./security-setup-hook.sh; }); diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 081f713d0549..f8c424089f09 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -14,7 +14,6 @@ with frameworks; with libs; { AppKitScripting = []; AppleScriptKit = []; AppleScriptObjC = []; - AppleShareClientCore = [ CoreServices ]; AudioToolbox = [ AudioUnit CoreAudio CF CoreMIDI ]; AudioUnit = [ Carbon CoreAudio CF ]; AudioVideoBridging = [ Foundation ]; @@ -84,12 +83,10 @@ with frameworks; with libs; { PCSC = [ CoreData ]; PreferencePanes = []; PubSub = []; - Python = [ ApplicationServices ]; QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QuickLook = [ ApplicationServices CF ]; QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; Ruby = []; - RubyCocoa = []; SceneKit = []; ScreenSaver = []; Scripting = []; @@ -105,11 +102,9 @@ with frameworks; with libs; { SystemConfiguration = [ CF Security ]; TWAIN = [ Carbon ]; Tcl = []; - Tk = [ ApplicationServices Carbon X11 ]; VideoDecodeAcceleration = [ CF CoreVideo ]; VideoToolbox = [ CF CoreMedia CoreVideo ]; WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ]; - X11 = []; # used by Tk, should this exist? # Umbrellas Accelerate = [ CoreWLAN IOBluetooth ]; diff --git a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh new file mode 100644 index 000000000000..fbd977f8552d --- /dev/null +++ b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh @@ -0,0 +1,8 @@ +addPrivateFrameworks() { + flag="-F/System/Library/PrivateFrameworks" + if [[ "$NIX_CFLAGS_COMPILE" != *$flag* ]]; then + NIX_CFLAGS_COMPILE+=" $flag" + fi +} + +addEnvHooks "$hostOffset" addPrivateFrameworks diff --git a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix new file mode 100644 index 000000000000..1cb85b1e9884 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix @@ -0,0 +1,41 @@ +{ stdenv, appleDerivation, xcbuild, gnumake, Security +, libsecurity_utilities, libsecurity_cdsa_utilities }: + +appleDerivation { + buildInputs = [ xcbuild libsecurity_utilities libsecurity_cdsa_utilities ]; + + DSTROOT = "$out"; + + NIX_CFLAGS_COMPILE = "-I."; + preBuild = '' + mkdir -p Security + cp ${Security}/Library/Frameworks/Security.framework/Headers/*.h Security + ''; + + patchPhase = '' + substituteInPlace SmartCardServices.xcodeproj/project.pbxproj \ + --replace "/usr/bin/gnumake" "${gnumake}/bin/make" + substituteInPlace src/PCSC/PCSC.exp \ + --replace _PCSCVersionString "" \ + --replace _PCSCVersionNumber "" + substituteInPlace Makefile.installPhase \ + --replace chown "# chown" \ + --replace /usr/bin/ "" + ''; + + installPhase = '' + make -f Makefile.installPhase install + make -f Makefile-exec.installPhase install + mv $out/usr/* $out + rmdir $out/usr + + mkdir -p $out/Library/Frameworks + cp -r Products/Release/PCSC.bundle $out/Library/Frameworks/PCSC.framework + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index a3d4099399b3..dcfb4aefe1f5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -27,14 +27,14 @@ appleDerivation { | grep -v -e Desktop -e Embedded -e mklocale -e colldef) for i in $targets; do - xcodebuild -target $i + xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target $i done ''; # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install adv_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1 8; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 9e8b78e57d6c..b52ec3306dc4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -14,7 +14,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install basic_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index cca729016c25..3120d8ae3d10 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -7,6 +7,7 @@ let # now it's staying here. versions = { "osx-10.11.6" = { + SmartCardServices = "55111"; dtrace = "168"; xnu = "3248.60.10"; libpthread = "138.10.4"; @@ -43,6 +44,9 @@ let file_cmds = "264.1.1"; shell_cmds = "187"; system_cmds = "550.6"; + diskdev_cmds = "593"; + top = "108"; + text_cmds = "99"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -53,6 +57,7 @@ let ICU = "531.48"; libdispatch = "442.1.4"; Security = "57031.40.6"; + security_systemkeychain = "55202"; IOAudioFamily = "203.3"; IOFireWireFamily = "458"; @@ -191,6 +196,8 @@ let adv_cmds = applePackage "adv_cmds" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; packages = { + SmartCardServices = applePackage "SmartCardServices" "osx-10.11.6" "1qqjlbi6j37mw9p3qpfnwf14xh9ff8h5786bmvzwc4kblfglabkm" {}; + inherit (adv_cmds) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; @@ -201,7 +208,8 @@ let configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {}; Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; - dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; + dtrace = applePackage "dtrace" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; + dtrace-xcode = applePackage "dtrace/xcode.nix" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; @@ -238,10 +246,15 @@ let adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; + diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" {}; network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {}; + text_cmds = applePackage "text_cmds" "osx-10.11.6" "1f93m7dd0ghqb2hwh905mjhzblyfr7dwffw98xhgmv1mfdnigxg0" {}; + top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {}; + + security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index 67fbf83496ed..1f35e3008b3b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -11,7 +11,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install developer_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix new file mode 100644 index 000000000000..aba2472af602 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -0,0 +1,32 @@ +{ stdenv, appleDerivation, xcbuild, lib, hostPlatform, Libc, xnu, libutil-new }: + +appleDerivation { + buildInputs = [ xcbuild libutil-new ]; + + NIX_CFLAGS_COMPILE = "-I."; + NIX_LDFLAGS = "-lutil"; + patchPhase = '' + # ugly hacks for missing headers + # most are bsd related - probably should make this a drv + unpackFile ${Libc.src} + unpackFile ${xnu.src} + mkdir System sys machine i386 + cp xnu-*/bsd/sys/disklabel.h sys + cp xnu-*/bsd/machine/disklabel.h machine + cp xnu-*/bsd/i386/disklabel.h i386 + cp -r xnu-*/bsd/sys System + cp -r Libc-*/uuid System + ''; + installPhase = '' + install -D Products/Release/libdisk.a $out/lib/libdisk.a + rm Products/Release/libdisk.a + for bin in Products/Release/*; do + install -D $bin $out/bin/$(basename $bin) + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix new file mode 100644 index 000000000000..dd193f2c07dc --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix @@ -0,0 +1,45 @@ +{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling, stdenv }: + +appleDerivation { + buildInputs = [ xcbuild CoreSymbolication xnu bison flex darling ]; + NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers"; + NIX_LDFLAGS = "-L./Products/Release"; + xcbuildFlags = "-target dtrace"; + + patchPhase = '' + substituteInPlace dtrace.xcodeproj/project.pbxproj --replace "/usr/sbin" "" + substituteInPlace libdtrace/dt_open.c \ + --replace "/usr/bin/clang" "${stdenv.cc}/bin/cpp" \ + --replace "/usr/bin/ld" "${stdenv.cc}/bin/ld" \ + --replace "/usr/bin/dtrace" $out/lib/dtrace + ''; + + # hack to handle xcbuild's broken lex handling + preBuild = '' + cd libdtrace + yacc -d dt_grammar.y + flex -l -d dt_lex.l + cd .. + + substituteInPlace dtrace.xcodeproj/project.pbxproj \ + --replace '6EBC9800099BFBBF0001019C /* dt_grammar.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; name = dt_grammar.y; path = libdtrace/dt_grammar.y; sourceTree = "<group>"; };' '6EBC9800099BFBBF0001019C /* y.tab.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = y.tab.c; path = libdtrace/y.tab.c; sourceTree = "<group>"; };' \ + --replace '6EBC9808099BFBBF0001019C /* dt_lex.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; name = dt_lex.l; path = libdtrace/dt_lex.l; sourceTree = "<group>"; };' '6EBC9808099BFBBF0001019C /* lex.yy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lex.yy.c; path = libdtrace/lex.yy.c; sourceTree = "<group>"; };' + ''; + + # xcbuild doesn't support install + installPhase = '' + mkdir -p $out + + cp -r Products/Release/usr $out + mv $out/usr/* $out + rmdir $out/usr + + mkdir $out/lib + cp Products/Release/*.dylib $out/lib + + mkdir $out/bin + cp Products/Release/dtrace $out/bin + + mkdir -p $out/lib/dtrace + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 8346ca7a9a76..47a587966b44 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -19,7 +19,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install file_cmds-*/Build/Products/Release/* $out/bin + install Products/Release/* $out/bin for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 13b6156492bb..d9b3dfb74049 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -14,6 +14,8 @@ appleDerivation { -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib ''; + setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh; + meta = { platforms = stdenv.lib.platforms.darwin; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile index 083a8a85d17d..166b4e631c84 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile @@ -5,6 +5,7 @@ LIBRARY_NAME = security_apple_x509_tp security_apple_x509_tp_HEADER_FILES = $(notdir $(wildcard lib/*.h)) security_apple_x509_tp_HEADER_FILES_DIR = lib +security_apple_x509_tp_C_FILES = $(wildcard lib/*.c) security_apple_x509_tp_CC_FILES = $(wildcard lib/*.cpp) include $(GNUSTEP_MAKEFILES)/library.make diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix index c5ba9cc8d7ef..2a05855bd521 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix @@ -1,7 +1,33 @@ -{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }: +{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities +, Security, xnu, xar, antlr, libsecurityd, apple_sdk +, dtrace-xcode, osx_private_sdk }: appleDerivation { - buildInputs = [ - libsecurity_utilities - libsecurity_cdsa_utilities - ]; -} \ No newline at end of file + buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities dtrace-xcode + Security xar antlr libsecurityd ]; + NIX_CFLAGS_COMPILE = "-Iinclude -I${xnu}/Library/Frameworks/System.framework/Headers"; + patchPhase = '' + substituteInPlace lib/policydb.cpp \ + --replace "new MutableDictionary::MutableDictionary()" NULL + substituteInPlace lib/xpcengine.h \ + --replace "#include <xpc/private.h>" "" + substituteInPlace lib/policyengine.cpp \ + --replace "#include <OpenScriptingUtilPriv.h>" "" + + rm lib/policyengine.cpp lib/quarantine++.cpp lib/codedirectory.cpp lib/xpcengine.cpp + ''; + preBuild = '' + mkdir -p include + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/usr/include/quarantine.h include + mkdir -p include/CoreServices/ + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/CoreServices.framework/PrivateHeaders/*.h include/CoreServices/ + + unpackFile ${Security.src} + mkdir -p include/securityd_client + cp Security-*/libsecurityd/lib/*.h include/securityd_client + mkdir -p include/xpc + cp ${apple_sdk.sdk}/include/xpc/*.h include/xpc + + sed -i '1i #define bool int' lib/security_codesigning.d + dtrace -h -C -s lib/security_codesigning.d -o codesigning_dtrace.h + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index bb55fd48d8b2..e811c4c11a82 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -4,9 +4,12 @@ appleDerivation { libauto libobjc IOKit + ]; + propagatedBuildInputs = [ sqlite apple_sdk.frameworks.PCSC ]; + NIX_LDFLAGS = "-framework PCSC"; patchPhase = '' substituteInPlace lib/errors.h --replace \ '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>' \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix index 860a74f61f7f..7facea2b8936 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -4,22 +4,18 @@ appleDerivation { buildInputs = [ xcbuild ]; - dontUseXcbuild = true; - prePatch = '' substituteInPlace tzlink.c \ --replace '#include <xpc/xpc.h>' "" ''; - buildPhase = '' - xcodebuild -target util - ''; + xcbuildFlags = "-target util"; installPhase = '' mkdir -p $out/lib $out/include - cp libutil-*/Build/Products/Release/*.dylib $out/lib - cp libutil-*/Build/Products/Release/*.h $out/include + cp Products/Release/*.dylib $out/lib + cp Products/Release/*.h $out/include # TODO: figure out how to get this to be right the first time around install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index dc7edface9a0..23777c941576 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -19,7 +19,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install network_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1 5; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix new file mode 100644 index 000000000000..1a0208ef3a08 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix @@ -0,0 +1,31 @@ +{ appleDerivation, xcbuild, Security +, libsecurity_codesigning, libsecurity_utilities, libsecurity_cdsa_utilities +, xnu, osx_private_sdk, pcsclite}: + +appleDerivation { + buildInputs = [ xcbuild Security libsecurity_utilities + libsecurity_cdsa_utilities libsecurity_codesigning + pcsclite ]; + + NIX_LDFLAGS = "-lpcsclite"; + + # can't build the whole thing + xcbuildFlags = "-target codesign"; + + preBuild = '' + mkdir -p include/Security + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/PrivateHeaders/*.h include/Security + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/Headers/*.h include/Security + + unpackFile ${xnu.src} + mkdir -p include/sys + cp -r xnu-*/bsd/sys/codesign.h include/sys/codesign.h + ''; + + NIX_CFLAGS_COMPILE = "-Iinclude"; + + installPhase = '' + mkdir -p $out/bin + cp Products/Release/codesign $out/bin/codesign + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 4f527acc950c..8ce916feb38a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -29,7 +29,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/usr/bin - install shell_cmds-*/Build/Products/Release/* $out/usr/bin + install Products/Release/* $out/usr/bin export DSTROOT=$out export SRCROOT=$PWD diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 2247ef3ddd2f..2579b0b6a0a6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,37 +1,104 @@ -{ stdenv, appleDerivation, xcbuild }: +{ stdenv, appleDerivation, xcbuild, lib, hostPlatform +, Librpcsvc, apple_sdk, pam, CF, openbsm }: appleDerivation rec { # xcbuild fails with: # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + # see issue facebook/xcbuild#188 # buildInputs = [ xcbuild ]; - # # temporary install phase until xcodebuild has "install" support - # installPhase = '' - # mkdir -p $out/bin/ - # install system_cmds-*/Build/Products/Release/* $out/bin/ - - # for n in 1 5 8; do - # mkdir -p $out/share/man/man$n - # install */*.$n $out/share/man/man$n - # done - # ''; - - # For now we just build sysctl because that's all I need... Please open a - # PR if you need any other utils before we fix the xcodebuild. - buildPhase = "cc sysctl.tproj/sysctl.c -o sysctl"; - - installPhase = - '' - mkdir -p $out/bin - install sysctl $out/bin - for n in 5 8; do - mkdir -p $out/share/man/man$n - install sysctl.tproj/*.$n $out/share/man/man$n + buildInputs = [ Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF + apple_sdk.frameworks.IOKit openbsm ]; + # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" + # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" + # + lib.optionalString hostPlatform.isArm "-D__arm__"; + NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" + "-DDAEMON_GID=1" + "-DDEFAULT_AT_QUEUE=\'a\'" + "-DDEFAULT_BATCH_QUEUE=\'b\'" + "-DPERM_PATH=\"/usr/lib/cron/\"" + "-DOPEN_DIRECTORY" + "-DNO_DIRECT_RPC" + "-DAPPLE_GETCONF_UNDERSCORE" + "-DAPPLE_GETCONF_SPEC" + "-DUSE_PAM" + "-DUSE_BSM_AUDIT" + "-D_PW_NAME_LEN=MAXLOGNAME" + "-D_PW_YPTOKEN=\"__YP!\"" + "-DAHZV1=64 " + "-DAU_SESSION_FLAG_HAS_TTY=0x4000" + "-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000" + ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ "; + + patchPhase = '' + substituteInPlace login.tproj/login.c \ + --replace bsm/audit_session.h bsm/audit.h + substituteInPlace login.tproj/login_audit.c \ + --replace bsm/audit_session.h bsm/audit.h + ''; + + buildPhase = '' + for dir in *.tproj; do + name=$(basename $dir) + name=''${name%.tproj} + + CFLAGS="" + case $name in + arch) CFLAGS="-framework CoreFoundation";; + atrun) CFLAGS="-Iat.tproj";; + chkpasswd) + CFLAGS="-framework OpenDirectory -framework CoreFoundation -lpam";; + getconf) + for f in getconf.tproj/*.gperf; do + cfile=''${f%.gperf}.c + LC_ALL=C awk -f getconf.tproj/fake-gperf.awk $f > $cfile + done + ;; + iostat) CFLAGS="-framework IOKit -framework CoreFoundation";; + login) CFLAGS="-lbsm -lpam";; + nvram) CFLAGS="-framework CoreFoundation -framework IOKit";; + sadc) CFLAGS="-framework IOKit -framework CoreFoundation";; + sar) CFLAGS="-Isadc.tproj";; + esac + + echo "Building $name" + + case $name in + + # These are all broken currently. + arch) continue;; + chpass) continue;; + dirhelper) continue;; + dynamic_pager) continue;; + fs_usage) continue;; + latency) continue;; + pagesize) continue;; + passwd) continue;; + reboot) continue;; + sc_usage) continue;; + shutdown) continue;; + trace) continue;; + + *) cc $dir/*.c -I''${dir} $CFLAGS -o $name ;; + esac + done + ''; + + installPhase = '' + for dir in *.tproj; do + name=$(basename $dir) + name=''${name%.tproj} + [ -x $name ] && install -D $name $out/bin/$name + for n in 1 2 3 4 5 6 7 8 9; do + for f in $dir/*.$n; do + install -D $f $out/share/man/man$n/$(basename $f) + done done - ''; + done + ''; meta = { platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy matthewbauer ]; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix new file mode 100644 index 000000000000..196276b0b273 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -0,0 +1,25 @@ +{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, bzip2, zlib, lzma }: + +appleDerivation { + buildInputs = [ xcbuild ncurses bzip2 zlib lzma ]; + + # patches to use ncursees + # disables md5 + patchPhase = '' + substituteInPlace text_cmds.xcodeproj/project.pbxproj \ + --replace 'FC6C98FB149A94EB00DDCC47 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = /usr/lib/libcurses.dylib; sourceTree = "<absolute>"; };' 'FC6C98FB149A94EB00DDCC47 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = "<absolute>"; };' \ + --replace 'FC7A7EB5149875E00086576A /* PBXTargetDependency */,' "" + ''; + + installPhase = '' + mkdir -p $out/bin + for f in Products/Release/*; do + install -D $f $out/bin/$(basename $f) + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix new file mode 100644 index 000000000000..4ddec2a30c90 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix @@ -0,0 +1,15 @@ +{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new, lib}: + +appleDerivation { + buildInputs = [ xcbuild apple_sdk.frameworks.IOKit ncurses libutil-new ]; + NIX_LDFLAGS = "-lutil"; + installPhase = '' + install -D Products/Release/libtop.a $out/lib/libtop.a + install -D Products/Release/libtop.h $out/include/libtop.h + install -D Products/Release/top $out/bin/top + ''; + meta = { + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 1fff4915da3c..21d64979d7ea 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,13 +1,13 @@ -{ stdenv, binutils-raw, cctools +{ stdenv, binutils-unwrapped, cctools , hostPlatform, targetPlatform }: # Make sure both underlying packages claim to have prepended their binaries # with the same targetPrefix. -assert binutils-raw.targetPrefix == cctools.targetPrefix; +assert binutils-unwrapped.targetPrefix == cctools.targetPrefix; let - inherit (binutils-raw) targetPrefix; + inherit (binutils-unwrapped) targetPrefix; cmds = [ "ar" "ranlib" "as" "dsymutil" "install_name_tool" "ld" "strip" "otool" "lipo" "nm" "strings" "size" @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin $out/include - ln -s ${binutils-raw.bintools.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt + ln -s ${binutils-unwrapped.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt # We specifically need: # - ld: binutils doesn't provide it on darwin @@ -38,15 +38,15 @@ stdenv.mkDerivation { ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - ln -s ${binutils-raw.bintools.out}/share $out/share + ln -s ${binutils-unwrapped.out}/share $out/share ln -s ${cctools}/libexec $out/libexec mkdir -p "$info/nix-support" "$man/nix-support" - printWords ${binutils-raw.bintools.info} \ + printWords ${binutils-unwrapped.info} \ >> $info/nix-support/propagated-build-inputs # FIXME: cctools missing man pages - printWords ${binutils-raw.bintools.man} \ + printWords ${binutils-unwrapped.man} \ >> $man/nix-support/propagated-build-inputs ''; diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 000000000000..9aae2be1d033 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector<Token> _allowedClients; ++ std::vector<Token> _allowableClients; + std::vector<Token> _reexportedLibraries; + std::vector<Token> _symbols; + std::vector<Token> _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index bcca11d66b19..d8abdc2c6f84 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,10 +1,19 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2 +{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook , llvm, libcxx, libcxxabi, clang, libuuid , libobjc ? null, maloader ? null, xctoolchain ? null , hostPlatform, targetPlatform +, enableDumpNormalizedLibArgs ? false }: let + + # We need to use an old version of cctools-port to support linking TBD files + # in the iOS SDK. Note that this only provides support for SDK versions up to + # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the + # default version here, which can support the new TBD format via Apple's + # libtapi. + useOld = targetPlatform.isiOS; + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = stdenv.lib.optionalString @@ -12,26 +21,41 @@ let "${targetPlatform.config}-"; in -assert targetPlatform.isDarwin; - # Non-Darwin alternatives assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null); +assert enableDumpNormalizedLibArgs -> (!useOld); + let baseParams = rec { name = "${targetPrefix}cctools-port-${version}"; - version = "895"; + version = if useOld then "886" else "895"; - src = fetchFromGitHub { + src = fetchFromGitHub (if enableDumpNormalizedLibArgs then { + owner = "tpoechtrager"; + repo = "cctools-port"; + # master with https://github.com/tpoechtrager/cctools-port/pull/34 + rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df"; + sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f"; + } else if useOld then { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; + sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; + } else { owner = "tpoechtrager"; repo = "cctools-port"; rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; - }; + }); outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake libtool_2 ]; + nativeBuildInputs = [ + autoconf automake libtool_2 + ] ++ stdenv.lib.optionals useOld [ + autoreconfHook + ]; buildInputs = [ libuuid ] ++ # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++ @@ -39,9 +63,14 @@ let patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch + ] ++ stdenv.lib.optionals useOld [ + # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. + ./undo-unknown-triple.patch + ./ld-tbd-v2.patch + ./support-ios.patch ]; - __propagatedImpureHostDeps = [ + __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [ # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them "/usr/lib/libobjc.A.dylib" "/usr/lib/libobjc.dylib" @@ -81,12 +110,15 @@ let EOF '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh + '' + stdenv.lib.optionalString useOld '' + cd cctools ''; # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather # hairy to handle during bootstrap. Perhaps it could be optional? - preConfigure = '' + preConfigure = stdenv.lib.optionalString (!useOld) '' cd cctools + '' + '' sh autogen.sh ''; @@ -117,6 +149,7 @@ let }; meta = { + broken = !targetPlatform.isDarwin; # Only supports darwin targets homepage = http://www.opensource.apple.com/source/cctools/; description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch new file mode 100644 index 000000000000..f78c6b63ac80 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/support-ios.patch @@ -0,0 +1,13 @@ +diff --git a/cctools/configure.ac b/cctools/configure.ac +index 56e8f24..0b4b3ff 100644 +--- a/cctools/configure.ac ++++ b/cctools/configure.ac +@@ -39,7 +39,7 @@ EXTRACXXFLAGS="" + WARNINGS="" + + case $host_os in +- darwin* ) ++ darwin* | ios*) + isdarwin=yes + AM_CONDITIONAL([ISDARWIN], [true]) + ;; diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch new file mode 100644 index 000000000000..7df9bdd16dab --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch @@ -0,0 +1,17 @@ +diff --git a/cctools/as/driver.c b/cctools/as/driver.c +index b06d085..c03397a 100644 +--- a/cctools/as/driver.c ++++ b/cctools/as/driver.c +@@ -363,12 +363,6 @@ char **envp) + /* Add -c or clang will run ld(1). */ + new_argv[j] = "-c"; + j++; +- /* cctools-port start */ +- new_argv[j] = "-target"; +- j++; +- new_argv[j] = "unknown-apple-darwin"; +- j++; +- /* cctools-port end */ + new_argv[j] = NULL; + if(execute(new_argv, verbose)) + exit(0); diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix new file mode 100644 index 000000000000..b9d806cded23 --- /dev/null +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -0,0 +1,34 @@ +{stdenv, lib, fetchFromGitHub, cmake, bison, flex}: + +stdenv.mkDerivation rec { + pname = "darling"; + name = pname; + + src = fetchFromGitHub { + repo = pname; + owner = "darlinghq"; + rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b"; + sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg"; + }; + + # only packaging sandbox for now + buildPhase = '' + cc -c src/sandbox/sandbox.c -o src/sandbox/sandbox.o + cc -dynamiclib -flat_namespace src/sandbox/sandbox.o -o libsystem_sandbox.dylib + ''; + + installPhase = '' + mkdir -p $out/lib + cp -rL src/sandbox/include/ $out/ + cp libsystem_sandbox.dylib $out/lib/ + ''; + + # buildInputs = [ cmake bison flex ]; + + meta = with lib; { + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.gpl3; + description = "Darwin/macOS emulation layer for Linux"; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix deleted file mode 100644 index 175e9738ef9e..000000000000 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ runCommand -, lib -, llvm -, clang -, binutils -, stdenv -, coreutils -, gnugrep -, buildPackages -, hostPlatform -, targetPlatform -}: - -/* As of this writing, known-good prefix/arch/simulator triples: - * aarch64-apple-darwin14 | arm64 | false - * arm-apple-darwin10 | armv7 | false - * i386-apple-darwin11 | i386 | true - * x86_64-apple-darwin14 | x86_64 | true - */ - -# Apple uses somewhat non-standard names for this. We could fall back on -# `targetPlatform.parsed.cpu.name`, but that would be a more standard one and -# likely to fail. Better just to require something manual. -assert targetPlatform ? arch; - -let - - prefix = targetPlatform.config; - inherit (targetPlatform) arch; - simulator = targetPlatform.isiPhoneSimulator or false; - - sdkType = if simulator then "Simulator" else "OS"; - - sdkVer = "10.2"; - - sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk"; - -in (import ../../../build-support/cc-wrapper { - inherit stdenv coreutils gnugrep runCommand buildPackages; - nativeTools = false; - nativeLibc = false; - inherit binutils; - libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; - inherit (clang) cc; - inherit hostPlatform targetPlatform; - extraBuildCommands = '' - if ! [ -d ${sdk} ]; then - echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2 - exit 1 - fi - # ugh - tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp - mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags - - # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust - echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before - ''; - }) // { - inherit sdkType sdkVer sdk; - } diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix new file mode 100644 index 000000000000..5b9f30b62c39 --- /dev/null +++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix @@ -0,0 +1,68 @@ +{ lib, hostPlatform, targetPlatform +, clang-unwrapped +, binutils-unwrapped +, runCommand +, stdenv +, wrapBintoolsWith +, wrapCCWith +, buildIosSdk, targetIosSdkPkgs +}: + +let + +minSdkVersion = "9.0"; + +iosPlatformArch = { parsed, ... }: { + "arm" = "armv7"; + "aarch64" = "arm64"; + "x86_64" = "x86_64"; +}.${parsed.cpu.name}; + +in + +rec { + # TODO(kmicklas): Make a pure version of this for each supported SDK version. + sdk = rec { + name = "ios-sdk"; + type = "derivation"; + outPath = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk"; + + sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS"; + version = targetPlatform.sdkVer; + }; + + binutils = wrapBintoolsWith { + libc = targetIosSdkPkgs.libraries; + bintools = binutils-unwrapped; + extraBuildCommands = '' + echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags + ''; + }; + + clang = (wrapCCWith { + cc = clang-unwrapped; + bintools = binutils; + libc = targetIosSdkPkgs.libraries; + extraBuildCommands = '' + tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp + mv cc-cflags.tmp $out/nix-support/cc-cflags + echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags + echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags + echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags + ''; + }) // { + inherit sdk; + }; + + libraries = let sdk = buildIosSdk; in runCommand "libSystem-prebuilt" { + passthru = { + inherit sdk; + }; + } '' + if ! [ -d ${sdk} ]; then + echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2 + exit 1 + fi + ln -s ${sdk}/usr $out + ''; +} diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 5f4306ec0c12..133266ec95aa 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { description = "Mach-O loader for Linux"; homepage = https://github.com/shinh/maloader; license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 09a346e4446d..960e0677da1e 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; }; - configureFlags = [ "--with-uuid=${libuuid}" ]; + configureFlags = [ "--with-uuid=${libuuid.dev}" ]; buildInputs = [ icu tzdata.dev ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index aa97a36e691e..24eb644e96fb 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "skhd-${version}"; - version = "0.0.10"; + version = "0.0.12"; src = fetchFromGitHub { owner = "koekeishiya"; repo = "skhd"; rev = "v${version}"; - sha256 = "0a0r8z9bvb1pzqag7nqa84xm99n0xvg27cw11qcv65snr06bqc9w"; + sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h"; }; buildInputs = [ Carbon ]; @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out ''; - # See https://github.com/koekeishiya/skhd/issues/28 - hardeningDisable = [ "all" ]; - meta = with stdenv.lib; { description = "Simple hotkey daemon for macOS"; homepage = https://github.com/koekeishiya/skhd; diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 969168fa54ba..969168fa54ba 100644 --- a/pkgs/os-specific/darwin/swift-corefoundation/default.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix new file mode 100644 index 000000000000..fdc97304528d --- /dev/null +++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix @@ -0,0 +1,8 @@ +{callPackage, stdenv, darwin, xcbuild}: + +rec { + corefoundation = callPackage ./corefoundation.nix {}; + libdispatch = callPackage ./libdispatch.nix { + inherit (darwin) apple_sdk_sierra xnu; + }; +} diff --git a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix new file mode 100644 index 000000000000..bd143b6071ba --- /dev/null +++ b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchFromGitHub, cmake, apple_sdk_sierra, xnu-new }: + +stdenv.mkDerivation rec { + name = "swift-corelibs-libdispatch"; + src = fetchFromGitHub { + owner = "apple"; + repo = name; + rev = "f83b5a498bad8e9ff8916183cf6e8ccf677c346b"; + sha256 = "1czkyyc9llq2mnqfp19mzcfsxzas0y8zrk0gr5hg60acna6jkz2l"; + }; + buildInputs = [ cmake apple_sdk_sierra.sdk xnu-new ]; +} diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 5b0d404faaf0..c2c612db5422 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.5"; + name = "alsa-lib-1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "1rhacnlj0grvfagjx5qzsnbhw7m7lyccghqs4jsv0dnsqv9qmxpl"; + sha256 = "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z"; }; patches = [ diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 0d02daebe1d7..5cd937a37928 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-oss-1.0.28"; + name = "alsa-oss-1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2" "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2" ]; - sha256 = "1mbabiywxjjlvdh257j3a0v4vvy69mwwnvc3xlq7pg50i2m2rris"; + sha256 = "1sj512wyci5qv8cisps96xngh7y9r5mv18ybqnazy18zwr1zgly3"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index dc11d21ff1cb..f57f84b293b5 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.1.5"; + name = "alsa-plugins-1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "073zpgvj4pldmzqq97l40wngvbqnvrkc8yw153mgny9kypwaazbr"; + sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg"; }; # ToDo: a52, etc.? diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index d1cae06d7fff..67cae46164fc 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "alsa-tools-${version}"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2" "http://alsa.cybermirror.org/tools/${name}.tar.bz2" ]; - sha256 = "0d6m5dm5yskfr6q42cv1ihp5lfgv4a67nj39gpp26ll3vrknag5w"; + sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index a3c09c3de994..6828fbf6b1c9 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils, libGL +{ stdenv, fetchurl, elfutils , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib , fetchFromGitHub, ncurses @@ -13,8 +13,6 @@ let kernelDir = if libsOnly then null else kernel.dev; - inherit (libGL) driverLink; - bitness = if stdenv.is64bit then "64" else "32"; libArch = diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 390bab849c28..7e14983a6d2b 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.2"; + name = "audit-2.8.3"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "1fmw8whraz1q3y3z5mgdpgsa3wz6r3zq0kgsgbc9xvmgfwmrpdb7"; + sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 79e12dd0f437..859593e4b9aa 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs +{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let @@ -17,10 +17,10 @@ in stdenv.mkDerivation { export sssldir="${sssd}/lib/sssd/modules" export HAVE_SSS_AUTOFS=1 - export MOUNT=${utillinux}/bin/mount + export MOUNT=${mount}/bin/mount export MOUNT_NFS=${nfs-utils}/bin/mount.nfs - export UMOUNT=${utillinux}/bin/umount - export MODPROBE=${utillinux}/bin/modprobe + export UMOUNT=${umount}/bin/umount + export MODPROBE=${kmod}/bin/modprobe export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E4FSCK=${e2fsprogs}/bin/fsck.ext4 diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix deleted file mode 100644 index 11aee0d88f2c..000000000000 --- a/pkgs/os-specific/linux/bluez/bluez5_28.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - pythonPackages, readline, libsndfile, udev, libical, - systemd, enableWiimote ? false }: - -assert stdenv.isLinux; - -let - inherit (pythonPackages) python; -in stdenv.mkDerivation rec { - name = "bluez-5.28"; - - src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1a8qzh38wpq5c0rydpx9isf0jc6g14g2qs18j1rmi8a79f7v9fl5"; - }; - - pythonPath = with pythonPackages; - [ dbus pygobject2 pygobject3 recursivePthLoader ]; - - buildInputs = - [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython - readline libsndfile udev libical - # Disables GStreamer; not clear what it gains us other than a - # zillion extra dependencies. - # gstreamer gst-plugins-base - ]; - - preConfigure = '' - substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm - substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " - ''; - - configureFlags = [ - "--localstatedir=/var" - "--enable-library" - "--enable-cups" - "--with-dbusconfdir=$(out)/etc" - "--with-dbussystembusdir=$(out)/share/dbus-1/system-services" - "--with-dbussessionbusdir=$(out)/share/dbus-1/services" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-udevdir=$(out)/lib/udev" - ] ++ - stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; - - # Work around `make install' trying to create /var/lib/bluetooth. - installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; - - makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; - - # FIXME: Move these into a separate package to prevent Bluez from - # depending on Python etc. - postInstall = '' - mkdir $out/test - cp -a test $out - pushd $out/test - for a in \ - simple-agent \ - test-adapter \ - test-device \ - test-thermometer \ - list-devices \ - monitor-bluetooth \ - ; do - ln -s ../test/$a $out/bin/bluez-$a - done - popd - wrapPythonProgramsIn $out/test "$out/test $pythonPath" - - # for bluez4 compatibility for NixOS - mkdir $out/sbin - ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd - ln -s ../libexec/bluetooth/obexd $out/sbin/obexd - ''; - - meta = with stdenv.lib; { - homepage = http://www.bluez.org/; - repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; - description = "Bluetooth support for Linux"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 62c3986569d0..d4595d73d942 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, pythonPackages, readline, udev, libical, - systemd, enableWiimote ? false }: + systemd, enableWiimote ? false, enableMidi ? false }: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.48"; + name = "bluez-5.49"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "140fjyxa2q4y35d9n52vki649jzb094pf71hxkkvlrpgf8q75a5r"; + sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k"; }; pythonPath = with pythonPackages; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-udevdir=$(out)/lib/udev" - ] ++ - stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; + ] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ] + ++ stdenv.lib.optional enableMidi [ "--enable-midi" ]; # Work around `make install' trying to create /var/lib/bluetooth. installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index d4c4582ffb22..b844bf72d82a 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.28.1"; + name = "busybox-1.28.3"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0bk52cxxlya5hg9va87snr9caz9ppdrpdyjwrnbwamhi64y1vzlq"; + sha256 = "0via6faqj9xcyi8r39r4n0wxlk8r2292yk0slzwrdri37w1j43dd"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 8e01bb2a5c80..6ea73c9ac6c3 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,27 +2,18 @@ stdenv.mkDerivation rec { name = "checkpolicy-${version}"; - version = "2.4"; + version = "2.7"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz"; - sha256 = "1m5wjm43lzp6bld8higsvdm2dkddydihhwv9qw2w9r4dm0largcv"; + sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl"; }; - # Don't build tests - postPatch = '' - sed '/-C test/d' -i Makefile - sed '1i#include <ctype.h>' -i checkpolicy.c - ''; - nativeBuildInputs = [ bison flex ]; buildInputs = [ libsepol ]; - NIX_CFLAGS_COMPILE = "-fstack-protector-all"; - preBuild = '' - makeFlagsArray+=("LEX=flex") makeFlagsArray+=("LIBDIR=${libsepol}/lib") makeFlagsArray+=("PREFIX=$out") ''; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 1a879ba33304..1ef18f703d3f 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils }: +{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }: stdenv.mkDerivation rec { name = "checksec-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -" substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -" substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf" - substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -" + substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${sysctl}/bin/sysctl -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" ''; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 42ab0092f7d9..fc7a66dcf1b6 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "criu-${version}"; - version = "3.8"; + version = "3.8.1"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "0gmvbnb5wa3f4nzam7gssclfai8g5363dhp8qc7q32dcx4wxbgam"; + sha256 = "0csyhsc5d6wkcjyvsp6h9x8zxn3zk574s84gfmy3gjagv3nwqd51"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 5d0728b7e240..67e4df3d6f9d 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus glib linuxHeaders systemd ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; postInstall = '' install -Dm644 ../README $out/share/doc/dbus-broker/README diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 9ed691d69f0f..e3f382ababc3 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { - version = "1.5.0"; + version = "1.5.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj"; + sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 56da5b0f16f4..0adeac7115df 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.versi stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2017-06-19"; + version = "2018-04-16"; src = fetchFromGitHub { owner = "dorimanx"; repo = "exfat-nofuse"; - rev = "de4c760bc9a05ead83bc3ec6eec6cf1fb106f523"; - sha256 = "0v979d8sbcb70lakm4jal2ck3gspkdgq9108k127f7ph08vf8djm"; + rev = "01c30ad52625a7261e1b0d874553b6ca7af25966"; + sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index fd955676775a..6f6418edc3e5 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fatrace-${version}"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "0szn86rbbvmjcw192vjhhgc3v99s5lm2kg93gk1yzm6ay831grsh"; + sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx"; }; buildInputs = [ python3 which ]; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index acdba5987bbf..724498b960c0 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,51 +2,13 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2018-01-04-${src.iwlRev}"; + version = "2018-03-20"; - # The src runCommand automates the process of building a merged repository of both - # - # https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ - # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/ - # - # This gives us up to date iwlwifi firmware as well as - # the usual set of firmware. firmware/linux-firmware usually lags kernel releases - # so iwlwifi cards will fail to load on newly released kernels. - # - # To update, go to the above repositories and look for latest tags / commits, then - # update version to the more recent commit date - - src = runCommand "firmware-linux-nonfree-src-merged-${version}" { - shallowSince = "2017-10-01"; - baseRev = "65b1c68c63f974d72610db38dfae49861117cae2"; - iwlRev = "iwlwifi-fw-2017-11-15"; - - # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash - # randomly mutate the hash to break out of fixed hash, when updating - outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz"; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - - # Doing the download on a remote machine just duplicates network - # traffic, so don't do that. - preferLocalBuild = true; - - nativeBuildInputs = [ cacert git gnupg ]; - } '' - git init src && ( - cd src - git config user.email "build-daemon@nixos.org" - git config user.name "Nixos Build Daemon $name" - git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git - git fetch --shallow-since=$shallowSince base - git fetch --shallow-since=$shallowSince iwl - git checkout -b work $baseRev - git merge $iwlRev) - rm -rf src/.git - cp -a src $out - ''; + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + rev = "8c1e439c967a50f0698d61aafdba3841aff10db0"; + sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd"; + }; preInstall = '' mkdir -p $out diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index c71f1c0ea2e9..d00f1b148374 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,36 +2,25 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20171029"; + version = "1.20180328"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "12aisha8rlr28310hakps04z9p45kd2wvks0w1vxw1kwfh1ncy9s"; + sha256 = "19h4lv11idy268pyrq21c5gsff77d5xr9xjkpmzfpcq34gjh3x21"; }; - dontStrip = true; # Stripping breaks some of the binaries - installPhase = '' mkdir -p $out/share/raspberrypi/boot cp -R boot/* $out/share/raspberrypi/boot - cp -R hardfp/opt/vc/* $out - cp opt/vc/LICENCE $out/share/raspberrypi - - for f in $out/bin/*; do - if isELF "$f"; then - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" - patchelf --set-rpath "$out/lib" "$f" - fi - done ''; meta = with stdenv.lib; { description = "Firmware for the Raspberry Pi board"; - homepage = https://github.com/raspberrypi; - license = licenses.unfree; + homepage = https://github.com/raspberrypi/firmware; + license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ viric tavyc ]; + maintainers = with maintainers; [ dezgeg viric tavyc ]; }; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch new file mode 100644 index 000000000000..e12aeeb0cdb8 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch @@ -0,0 +1,20 @@ +diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt +index aed0e83..b325676 100644 +--- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt ++++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt +@@ -17,15 +17,6 @@ target_link_libraries(vcfiled + install(TARGETS vcfiled + RUNTIME DESTINATION sbin) + +-configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled) +- +-# script to start up vcfiled at start of day +-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled +- DESTINATION /etc/init.d) +-# install locally to the installation directory too +-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled +- DESTINATION ${VMCS_INSTALL_PREFIX}/share/install) +- + # test program for vcfiled_check library + add_executable(vcfiled_lock_test vcfiled_lock_test.c) + target_link_libraries(vcfiled_lock_test vcfiled_check) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix new file mode 100644 index 000000000000..7f4c9dae166a --- /dev/null +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "raspberrypi-tools-${version}"; + version = "2018-02-05"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "userland"; + rev = "a343dcad1dae4e93f4bfb99496697e207f91027e"; + sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1"; + }; + + patches = [ ./tools-dont-install-sysv-init-scripts.patch ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + preConfigure = '' + cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out") + '' + stdenv.lib.optionalString stdenv.isAarch64 '' + cmakeFlagsArray+=("-DARM64=1") + ''; + + meta = with stdenv.lib; { + description = "Userland tools for the Raspberry Pi board"; + homepage = https://github.com/raspberrypi/userland; + license = licenses.bsd3; + platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ dezgeg viric tavyc ]; + }; +} diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index a10a4f466c7c..95011653ad01 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -28,7 +28,9 @@ in stdenv.mkDerivation rec { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; }) - ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; + ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch + # TODO: Only relevant for 3.2.2 (opened an upstream issue) + ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch; nativeBuildInputs = if isFuse3 @@ -63,11 +65,11 @@ in stdenv.mkDerivation rec { postFixup = "cd $out\n" + (if isFuse3 then '' mv bin/mount.fuse3 bin/mount.fuse - install -D -m555 bin/mount.fuse $common/bin/mount.fuse - install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules + install -D -m444 etc/fuse.conf $common/etc/fuse.conf + install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz '' else '' - cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse + cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz ''); diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 97744968d7b3..ddf280bbe2f7 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -13,8 +13,8 @@ in { }; fuse_3 = mkFuse { - version = "3.2.1"; - sha256Hash = "19bsvb5lc8k1i0h5ld109kixn6mdshzvg3y7820k9mnw34kh09y0"; + version = "3.2.2"; + sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh"; maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch new file mode 100644 index 000000000000..b6351aab3c01 --- /dev/null +++ b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch @@ -0,0 +1,8 @@ +--- a/meson.build 2018-04-01 01:05:19.612723597 +0200 ++++ b/meson.build 2018-04-01 01:40:58.171109615 +0200 +@@ -1,4 +1,4 @@ +-project('libfuse3', 'c', version: '3.2.1', ++project('libfuse3', 'c', version: '3.2.2', + meson_version: '>= 0.38', + default_options: [ 'buildtype=debugoptimized' ]) + diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index f77639367acf..639dc7e07a4d 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,6 +1,6 @@ ---- a/util/install_helper.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/util/install_helper.sh 2017-09-21 23:43:50.703942577 +0200 -@@ -11,19 +11,11 @@ +--- a/util/install_helper.sh 2018-04-01 01:05:19.613723599 +0200 ++++ b/util/install_helper.sh 2018-04-01 01:06:02.952845382 +0200 +@@ -11,22 +11,14 @@ udevrulesdir="$3" prefix="${MESON_INSTALL_DESTDIR_PREFIX}" @@ -14,11 +14,15 @@ - install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}/${udevrulesdir}/99-fuse3.rules" -+ "${prefix}/${udevrulesdir}/99-fuse.rules" ++ "${prefix}/${udevrulesdir}/99-fuse3.rules" install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ - "${DESTDIR}/etc/init.d/fuse3" + "${prefix}/etc/init.d/fuse3" + install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ +- "${DESTDIR}/etc/fuse.conf" ++ "${prefix}/etc/fuse.conf" + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index c4c49515f04b..c02bfb1615c3 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.02.00"; + version = "18.03.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "0z8yvicp4qk1xi8xmbrngnc294fjdnb9qn5d9lnyls4i6mmvpr2d"; + sha256 = "1f2gdnaygsj0spd6a559bzf3wii7l59k3sk49rjbbdb9g77nkhg2"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 521b81cd690d..53895faa66cb 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, nettools, iproute, procps}: +{stdenv, fetchurl, openssl, nettools, iproute, sysctl}: let baseName = "gogoclient"; version = "1.2"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ --replace "/sbin/route" "${nettools}/bin/route" \ --replace "/sbin/ip" "${iproute}/sbin/ip" \ - --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix new file mode 100644 index 000000000000..d56253c6cedd --- /dev/null +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gpu-switch-unstable-${version}"; + version = "2017-04-28"; + src = fetchFromGitHub { + owner = "0xbb"; + repo = "gpu-switch"; + rev = "a365f56d435c8ef84c4dd2ab935ede4992359e31"; + sha256 = "1jnh43nijkqd83h7piq7225ixziggyzaalabgissyxdyz6szcn0r"; + }; + installPhase = '' + mkdir -p $out/bin + cp gpu-switch $out/bin/ + ''; + meta = with lib; { + description = "Application that allows to switch between the graphic cards of dual-GPU MacBook Pro models"; + homepage = https://github.com/0xbb/gpu-switch; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.msiedlarek ]; + }; +} diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 2c5fd70ac95c..cbdbefeb2a0e 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.55"; + name = "hdparm-9.56"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1ivdvrzimaayiq03by8mcq0mhmdljndj06h012zkdpw34irnpixm"; + sha256 = "1np42qyhb503khvacnjcl3hb1dqly68gj0a1xip3j5qhbxlyvybg"; }; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 724242c588a1..15b3903ddd1a 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.310"; + version = "0.311"; src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.310.tar.gz"; - sha256 = "08mhwwc9g9cpfyxrwwviflkdk2jnqs6hc95iv4r5d59hqrj5kida"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz"; + sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z"; }; preConfigure = "patchShebangs ./configure"; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 1f67743af0d4..eacac156c975 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "i2c-tools-${version}"; - version = "3.1.2"; + version = "4.0"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/i/i2c-tools/i2c-tools_${version}.orig.tar.bz2"; - sha256 = "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv"; + url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz"; + sha256 = "1mi8mykvl89y6liinc9jv1x8m2q093wrdc2hm86a47n524fcl06r"; }; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 269c59f5e6fe..7d412d7e15d0 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.15.0"; + version = "4.16.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0mc3g4kj7h3jhwz2b2gdf41gp6bhqn7axh4mnyvhkdnpk5m63m28"; + sha256 = "02pfalg319jpbjz273ph725br8dnkzpfvi98azi9yd6p1w128p0c"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 68692019ca96..d736caa535d4 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-6.36"; + name = "ipset-6.38"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "03fk40v0rbiv2b9ciy3zk8yix163803xvpmdlyvrfzbcvj84l8i2"; + sha256 = "0i72wcljl0nkpmzc20jcch3hpphrm0qp4v4j4ajamq0zlddn5vyf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3fc4f3b23774..d2eab02f6753 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -35,20 +35,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -p ping tracepath clockdiff arping rdisc $out/bin/ + cp -p ping tracepath clockdiff arping rdisc rarpd $out/bin/ if [ -x ninfod/ninfod ]; then cp -p ninfod/ninfod $out/bin fi mkdir -p $out/share/man/man8 cp -p \ - doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/tracepath.8 doc/ninfod.8 \ + doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/rarpd.8 doc/tracepath.8 doc/ninfod.8 \ $out/share/man/man8 ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ lheckemann ]; }; } diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index f4f870f16c3b..a1c577d2bb57 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,16 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "8192131685be0f27d6f51b14b78ef93fa7f3c692"; - sha256 = "1k74qz3w0l4zq8llrxc4p62xy0c0n33f260vy3d14wx5rhvf0544"; + rev = "0.4"; + sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv"; }; in stdenv.mkDerivation rec { - name = "iwd-unstable-2017-12-14"; + name = "iwd-${version}"; + version = "0.1"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; - rev = "cf3372235c4592ca7366b27548abc4e89a982414"; - sha256 = "0dg28j919w1v8sqr6jdj12c233rsjzd2jzkcpag1hx2h3g35hnlz"; + rev = version; + sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0"; }; nativeBuildInputs = [ @@ -24,7 +25,7 @@ in stdenv.mkDerivation rec { readline python3Packages.python ]; - + pythonPath = [ python3Packages.dbus-python python3Packages.pygobject3 @@ -33,7 +34,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - "--with-dbusconfdir=$(out)/etc/" + "--with-dbus-datadir=$(out)/etc/" + "--disable-systemd-service" ]; postUnpack = '' diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index ffdf0d678d77..6bcc548ba521 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ixgbevf-${version}-${kernel.version}"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz"; - sha256 = "0kq8y0944kaprw445wb8iswdck2jmc0xpkx0iv6idy3r5cc4hvyg"; + sha256 = "122zn9nd8f95bpidiiinc8xaizypkirqs8vlmsdy2iv3w65md9k3"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index fdec72dd09cd..dafe9069b5a8 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { name = "${package}-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { repo = "JFBView"; owner = "jichu4n"; rev = version; - sha256 = "0p12b5n07yfkmfswjdb3a4c5c50jcphl030n3i71djcq4jjvrxlw"; + sha256 = "1w844ha9lp49ik79yfislib34455nl9gcksbx22hiz30gmqwzakz"; }; hardeningDisable = [ "format" ]; @@ -64,7 +64,5 @@ stdenv.mkDerivation rec { homepage = https://seasonofcode.com/pages/jfbview.html; license = licenses.asl20; platforms = platforms.linux; - # incompatible with latest mupdf, see https://github.com/jichu4n/JFBView/issues/17 - broken = true; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5fbd9955c2a3..4d9ec389f44e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -32,7 +32,6 @@ with stdenv.lib; # Debugging. DEBUG_KERNEL y DYNAMIC_DEBUG y - BACKTRACE_SELF_TEST n DEBUG_DEVRES n DEBUG_STACK_USAGE n DEBUG_STACKOVERFLOW n @@ -116,7 +115,6 @@ with stdenv.lib; # Enable various subsystems. ACCESSIBILITY y # Accessibility support AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support HIPPI y MTD_COMPLEX_MAPPINGS y # needed for many devices SCSI_LOWLEVEL y # enable lots of SCSI devices @@ -125,6 +123,9 @@ with stdenv.lib; SPI y # needed for many devices SPI_MASTER y WAN y + ${optionalString (versionOlder version "4.17") '' + DONGLE y # Serial dongle support + ''} # Networking options. NET y @@ -135,6 +136,7 @@ with stdenv.lib; NETFILTER y NETFILTER_ADVANCED y CGROUP_BPF? y # Required by systemd per-cgroup firewalling + CGROUP_NET_PRIO y # Required by systemd IP_ROUTE_VERBOSE y IP_MROUTE_MULTIPLE_TABLES y IP_VS_PROTO_TCP y @@ -420,7 +422,9 @@ with stdenv.lib; ${optionalString (versionAtLeast version "4.3") '' IDLE_PAGE_TRACKING y ''} - IRDA_ULTRA y # Ultra (connectionless) protocol + ${optionalString (versionOlder version "4.17") '' + IRDA_ULTRA y # Ultra (connectionless) protocol + ''} JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support @@ -640,43 +644,46 @@ with stdenv.lib; # This menu disables all/most of them on >= 4.16 RUNTIME_TESTING_MENU? n # For older kernels, painstakingly disable each symbol. - ARM_KPROBES_TEST? n - ASYNC_RAID6_TEST? n - ATOMIC64_SELFTEST? n - BACKTRACE_SELF_TEST? n + ${optionalString (versionOlder version "4.16") '' + ARM_KPROBES_TEST? n + ASYNC_RAID6_TEST? n + ATOMIC64_SELFTEST? n + BACKTRACE_SELF_TEST? n + INTERVAL_TREE_TEST? n + PERCPU_TEST? n + RBTREE_TEST? n + TEST_BITMAP? n + TEST_BPF? n + TEST_FIRMWARE? n + TEST_HASH? n + TEST_HEXDUMP? n + TEST_KMOD? n + TEST_KSTRTOX? n + TEST_LIST_SORT? n + TEST_LKM? n + TEST_PARMAN? n + TEST_PRINTF? n + TEST_RHASHTABLE? n + TEST_SORT? n + TEST_STATIC_KEYS? n + TEST_STRING_HELPERS? n + TEST_UDELAY? n + TEST_USER_COPY? n + TEST_UUID? n + ''} + CRC32_SELFTEST? n CRYPTO_TEST? n DRM_DEBUG_MM_SELFTEST? n EFI_TEST? n GLOB_SELFTEST? n - INTERVAL_TREE_TEST? n LNET_SELFTEST? n LOCK_TORTURE_TEST? n MTD_TESTS? n NOTIFIER_ERROR_INJECTION? n - PERCPU_TEST? n - RBTREE_TEST? n RCU_PERF_TEST? n RCU_TORTURE_TEST? n TEST_ASYNC_DRIVER_PROBE? n - TEST_BITMAP? n - TEST_BPF? n - TEST_FIRMWARE? n - TEST_HASH? n - TEST_HEXDUMP? n - TEST_KMOD? n - TEST_KSTRTOX? n - TEST_LIST_SORT? n - TEST_LKM? n - TEST_PARMAN? n - TEST_PRINTF? n - TEST_RHASHTABLE? n - TEST_SORT? n - TEST_STATIC_KEYS? n - TEST_STRING_HELPERS? n - TEST_UDELAY? n - TEST_USER_COPY? n - TEST_UUID? n WW_MUTEX_SELFTEST? n XZ_DEC_TEST? n diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 1b8c3f76155e..2b44ff51ad0a 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -77,6 +77,7 @@ let generateConfig = ./generate-config.pl; kernelConfig = kernelConfigFun config; + passAsFile = [ "kernelConfig" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ] @@ -104,7 +105,7 @@ let # Create the config file. echo "generating kernel configuration..." - echo "$kernelConfig" > "$buildRoot/kernel-config" + ln -s "$kernelConfigPath" "$buildRoot/kernel-config" DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig ''; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4e086259036e..e064dbfd85bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.29"; + version = "4.14.35"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06a6q69jwvggns5rf473nfgfwlkfyj8zs6vrjppwf8lrrrq7pxhq"; + sha256 = "01zfbd766y8hfsd248lffaj6d4ghl4j918m3yvl892p84xsp5aq2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index 979e8fe05e13..07f408027d8e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.12"; + version = "4.15.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0j7l907m51y05cd1sqf3sn7vx4n6c07kn7q0ndnyg6wqb7h667h3"; + sha256 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix new file mode 100644 index 000000000000..343d7c9f9dac --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.16.3"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "18w1dhq5dnmcqc3d8imwm90zwfw0fhda7sy5fjwkhzm93nl72s8d"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 58abf35e92b5..b14418964da5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.123"; + version = "4.4.128"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "115mvgwcx2syjrn943k4qqyvqkysdm6rgq97dhf1gcxf671qb204"; + sha256 = "1c5nlxazn2ijfra1bn3x4fdz3fx02j76hg430jgyij61vndgi5ka"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 0b18a624167b..569f472545eb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.89"; + version = "4.9.94"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0a9l2gkyr1nhaak6vyjwgjn01ywpxwa8zp5fhw8rjnfk44bf2hql"; + sha256 = "15rd1rmvwx6wyqp857bdl77ijd233svm5wxyjyj8dy8n36yivk39"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index 94885efef900..5685e6dd904d 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.12"; + version = "4.15.18"; revision = "a"; - sha256 = "1n0sqhqvm9p6w1yh7si8rw84qxf9c5kch7pvjyrp51ir1xh7grfr"; + sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 5aae37418ce8..1366a11b573c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.15.2018.02.09"; + version = "4.15.2018.04.14"; modDirVersion = "4.15.0"; extraMeta.branch = "master"; - extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ]; + extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ]; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4"; - sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib"; + rev = "3b7c824e9330a640312fce1b04537c684c1d602c"; + sha256 = "1l5ib28qkhrxggn6zj9b2839543anbxk2ip75yizgzlv9vr5m4pk"; }; extraConfig = '' diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index bcc1ec145618..6c0f01fb8ad7 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.16-rc6"; - modDirVersion = "4.16.0-rc6"; - extraMeta.branch = "4.16"; + version = "4.17-rc1"; + modDirVersion = "4.17.0-rc1"; + extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0kwn1qj44pyb404qhwm4qr8mmfni8qfh1raf010d62i48n7pgv0d"; + sha256 = "0a3lrax6f8f98lj65aawpqkzkmxcl2x4h20kr0cr7wf0jvpnn5y3"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 60fb00645139..9833bb57bafb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -35,6 +35,8 @@ in { extraMeta ? {}, # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false, + # ignored + features ? null, hostPlatform }: diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e163459d7f4f..cedb2dfc2230 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -73,4 +73,15 @@ rec { }; }; + # https://patchwork.kernel.org/patch/9626797/ + # Should be included in 4.17, so this patch can be dropped when 4.16 becomes obsolete. + bcm2835_mmal_v4l2_camera_driver = rec { + name = "bcm2835_mmal_v4l2_camera_driver"; + patch = fetchpatch { + name = name + ".patch"; + url = https://patchwork.kernel.org/patch/9626797/raw/; + sha256 = "0iwb0yxsf95zv4qxkvlvhqfmzx0rk13g9clvxsharvwkb4w5lwa0"; + }; + }; + } diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 06552eb35799..a6f399c0fba4 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -12,7 +12,7 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src makeFlags; + inherit (kernel) src; preConfigure = '' cd tools/perf @@ -24,17 +24,21 @@ stdenv.mkDerivation { substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug done - [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion - export makeFlags="DESTDIR=$out WERROR=0 $makeFlags" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DTIPDIR=\"$out/share/doc/perf-tip\"" + if [ -f bash_completion ]; then + sed -i 's,^have perf,_have perf,' bash_completion + fi ''; + makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags; + # perf refers both to newt and slang - nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper pkgconfig python perl ]; - buildInputs = - [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl - ] ++ stdenv.lib.optional withGtk gtk2; + nativeBuildInputs = [ + asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt + flex bison libiberty libaudit makeWrapper pkgconfig python perl + ]; + buildInputs = [ + elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl + ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. @@ -50,7 +54,7 @@ stdenv.mkDerivation { ]; separateDebugInfo = true; - installFlags = "install install-man ASCIIDOC8=1"; + installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)"; preFixup = '' wrapProgram $out/bin/perf \ diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index c4c5b7cc3b91..26f3d89c6628 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://horms.net/projects/kexec/kexec-tools; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; + badPlatforms = platforms.riscv; }; } diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index 9bd7c8480c1c..7d46a13f3562 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -9,6 +9,12 @@ buildEnv { '' source ${stdenv}/setup + if ! test -d "$out/lib/modules"; then + echo "No modules found." + # To support a kernel without modules + exit 0 + fi + kernelVersion=$(cd $out/lib/modules && ls -d *) if test "$(echo $kernelVersion | wc -w)" != 1; then echo "inconsistent kernel versions: $kernelVersion" diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 2fb4fe93cc81..27ffaca61e71 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa_noglu, pkgconfig }: stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libdrm libX11 libGL ]; + buildInputs = [ libdrm libX11 libGL mesa_noglu ]; meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 541ead7258f6..59d5db52ac68 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libsepol, pcre +{ stdenv, fetchurl, pcre, pkgconfig, libsepol , enablePython ? true, swig ? null, python ? null +, musl-fts }: assert enablePython -> swig != null && python != null; @@ -8,48 +9,37 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.4"; + version = "2.7"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126"; + sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libsepol pcre ] - ++ optionals enablePython [ swig python ]; + ++ optionals enablePython [ swig python ] + ++ optional stdenv.hostPlatform.isMusl musl-fts; - # Avoid this false warning: - # avc_internal.c: In function 'avc_netlink_receive': - # avc_internal.c:105:25: error: cast increases required alignment of target type [-Werror=cast-align] - # struct nlmsghdr *nlh = (struct nlmsghdr *)buf; - # ^ + # drop fortify here since package uses it by default, leading to compile error: + # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] + hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-error=cast-align"; - - # Unreleased upstream patch that fixes Python package issue arising - # from recent SWIG changes. - patches = optional enablePython (fetchpatch { - name = "fix-python-swig.patch"; - url = "https://github.com/SELinuxProject/selinux/commit/a9604c30a5e2f71007d31aa6ba41cf7b95d94822.patch"; - sha256 = "0mjrclh0sd8m7vq0wvl6pg29ss415j3kn0266v8ixy4fprafagfp"; - stripLen = 1; - }); + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; postPatch = optionalString enablePython '' sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile - '' - + '' - sed '1i#include <sys/uio.h>' -i src/setrans_client.c ''; + # fix install locations preBuild = '' - # Build fails without this precreated - mkdir -p $out/include - makeFlagsArray+=("PREFIX=$out") makeFlagsArray+=("DESTDIR=$out") + makeFlagsArray+=("MAN3DIR=$out/share/man/man3") + makeFlagsArray+=("MAN5DIR=$out/share/man/man5") + makeFlagsArray+=("MAN8DIR=$out/share/man/man8") + makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages") ''; installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 587349e4067e..45222bee6b00 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,31 +1,33 @@ -{ stdenv, fetchurl, bison, flex, libsepol, libselinux, ustr, bzip2, libaudit }: +{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, libaudit +, enablePython ? true, swig ? null, python ? null +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "libsemanage-${version}"; - version = "2.4"; + version = "2.7"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz"; - sha256 = "1134ka4mi4387ac5yv68bpp2y7ln5xxhwp07xhqnay0nxzjaqk0s"; + sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87"; }; - nativeBuildInputs = [ bison flex ]; - buildInputs = [ libsepol libselinux ustr bzip2 libaudit ]; - - NIX_CFLAGS_COMPILE = [ - "-fstack-protector-all" - "-std=gnu89" - # these were added to fix build with gcc7. review on update - "-Wno-error=format-truncation" - "-Wno-error=implicit-fallthrough" - ]; + nativeBuildInputs = [ bison flex pkgconfig ]; + buildInputs = [ libsepol libselinux bzip2 libaudit ] + ++ optionals enablePython [ swig python ]; preBuild = '' makeFlagsArray+=("PREFIX=$out") makeFlagsArray+=("DESTDIR=$out") + makeFlagsArray+=("MAN3DIR=$out/share/man/man3") + makeFlagsArray+=("MAN5DIR=$out/share/man/man5") + makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages") ''; + installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; + meta = libsepol.meta // { description = "Policy management tools for SELinux"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f7f393afb39d..40872f7c1ac8 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libsepol-${version}"; - version = "2.4"; - se_release = "20150202"; + version = "2.7"; + se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "0ncnwhpc1gx4hrrb822fqkwy5h75zzngsrfkd5mlqh1jk7aib419"; + sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn"; }; nativeBuildInputs = [ flex ]; @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray+=("PREFIX=$out") makeFlagsArray+=("DESTDIR=$out") + makeFlagsArray+=("MAN8DIR=$out/share/man/man8") + makeFlagsArray+=("MAN3DIR=$out/share/man/man3") ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; passthru = { inherit se_release se_url; }; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index ff6db1b41ee5..7c2233714d4c 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.10.5"; src = fetchurl { - url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; + url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux kernel modules for LTTng tracing"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; license = with licenses; [ lgpl21 gpl2 mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 2e2ef610de6a..1b15edcc923c 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,29 +1,26 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, perl, docbook2x -, docbook_xml_dtd_45, python3Packages +, docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies , libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null -, cgmanager ? null, libnih ? null, dbus ? null, libcap ? null, systemd ? null +, libcap ? null, systemd ? null }: -let - enableCgmanager = cgmanager != null && libnih != null && dbus != null; -in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1xpghrinxhm2072fwmn42pxhjwh7qx6cbsipw4s6g38a8mkklrk8"; + sha256 = "12ldpkd17cy6fg7z1icr91cfs86jkkrsj61b6wdj0l7h4x624c32"; }; nativeBuildInputs = [ autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython ]; buildInputs = [ - libapparmor gnutls libselinux libseccomp cgmanager libnih dbus libcap + pam libapparmor gnutls libselinux libseccomp libcap python3Packages.python python3Packages.setuptools systemd ]; @@ -37,15 +34,8 @@ stdenv.mkDerivation rec { XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - # FIXME - # glibc 2.25 moved major()/minor() to <sys/sysmacros.h>. - # this commit should detect this: https://github.com/lxc/lxc/pull/1388/commits/af6824fce9c9536fbcabef8d5547f6c486f55fdf - # However autotools checks if mkdev is still defined in <sys/types.h> runs before - # checking if major()/minor() is defined there. The mkdev check succeeds with - # a warning and the check which should set MAJOR_IN_SYSMACROS is skipped. - NIX_CFLAGS_COMPILE = [ "-DMAJOR_IN_SYSMACROS" ]; - configureFlags = [ + "--enable-pam" "--localstatedir=/var" "--sysconfdir=/etc" "--disable-api-docs" diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 4f62b7eb128a..6f7dd2f56ff7 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse , enableDebugBuild ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-2.0.8"; + name = "lxcfs-3.0.0"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "04dzn6snqgw0znf7a7qdm64400jirip6q8amcx5fmz4705qdqahc"; + sha256 = "0fsy2h7b5dkzvfm6m8vqzhnji42cszdn0b3ndnaxiwv3402ccmvk"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; - buildInputs = [ fuse pam ]; + buildInputs = [ fuse ]; preConfigure = stdenv.lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index ac176c7d3b36..30c2b05b8e1e 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "154"; + version = "156"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0vq7r3zknr62rmi9g0zd7mmxframm79vmrdw029pc7z6wrlv40cy"; + sha256 = "0mv4sxcysl3m9wqybg6b363mawr9amzhc9v53775p4p2a47z774r"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 85a65b8f824d..7a59c2ea7573 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,10 +1,21 @@ -{ stdenv +{ stdenv, writeScript , fetchurl, groff , buildPlatform, hostPlatform }: assert stdenv.isLinux; +let + sendmail-script = writeScript "sendmail-script" '' + #!/bin/sh + + if [ -x /run/wrappers/bin/sendmail ]; then + /run/wrappers/bin/sendmail "$@" + else + /run/current-system/sw/bin/sendmail "$@" + fi + ''; +in stdenv.mkDerivation rec { name = "mdadm-4.0"; @@ -15,7 +26,7 @@ stdenv.mkDerivation rec { # This is to avoid self-references, which causes the initrd to explode # in size and in turn prevents mdraid systems from booting. - allowedReferences = [ stdenv.cc.libc.out ]; + allowedReferences = [ stdenv.cc.libc.out sendmail-script ]; patches = [ ./no-self-references.patch ]; @@ -32,7 +43,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile + -e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile ''; meta = { diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 005a12f5b94d..4d1c2cad2e33 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -50,8 +50,7 @@ stdenv.mkDerivation rec { "--enable-static" "--enable-debug" "CFLAGS=-fstack-protector-strong" - # Fix cycle between outputs - "--disable-wrapper" + "--enable-wrapper=all" ]; outputs = [ "out" "dev" ]; @@ -59,18 +58,25 @@ stdenv.mkDerivation rec { dontDisableStatic = true; separateDebugInfo = true; - postInstall = - '' + postInstall = '' # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. # Apparently glibc provides scsi itself? (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) - '' + '' + # Strip debug out of the static library $STRIP -S $out/lib/libc.a - '' + '' mkdir -p $out/bin + # Create 'ldd' symlink, builtin ln -s $out/lib/libc.so $out/bin/ldd + + # (impure) cc wrapper around musl for interactive usuage + for i in musl-gcc musl-clang ld.musl-clang; do + moveToOutput bin/$i $dev + done + moveToOutput lib/musl-gcc.specs $dev + substituteInPlace $dev/bin/musl-gcc \ + --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh new file mode 100644 index 000000000000..3962dcb19a20 --- /dev/null +++ b/pkgs/os-specific/linux/musl/fts-setup-hook.sh @@ -0,0 +1,17 @@ +ftsLdflags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -lfts" +} + +addEnvHooks "$hostOffset" ftsLdflags + diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix index 083541e5e935..0f16e8cc79bf 100644 --- a/pkgs/os-specific/linux/musl/fts.nix +++ b/pkgs/os-specific/linux/musl/fts.nix @@ -11,4 +11,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + setupHook = ./fts-setup-hook.sh; } diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix new file mode 100644 index 000000000000..ae6abeb1f56f --- /dev/null +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, ncurses }: + +stdenv.mkDerivation rec { + name = "nmon-${version}"; + version = "16g"; + + src = fetchurl { + url = "mirror://sourceforge/nmon/lmon${version}.c"; + sha256 = "127n8xvmg7byp42sm924mdr7hd3bsfsxpryzahl0cfsh7dlxv0ns"; + }; + + buildInputs = [ ncurses ]; + unpackPhase = ":"; + buildPhase = "cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D X86"; + installPhase = '' + mkdir -p $out/bin + cp nmon $out/bin + ''; + + meta = with stdenv.lib; { + description = "AIX & Linux Performance Monitoring tool"; + homepage = "http://nmon.sourceforge.net"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sveitser ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh deleted file mode 100755 index 5d47df9a87a7..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh +++ /dev/null @@ -1,99 +0,0 @@ -source $stdenv/setup - -dontPatchELF=1 # must keep libXv, $out in RPATH - - -unpackFile() { - sh $src -x -} - - -buildPhase() { - if test -z "$libsOnly"; then - echo "Building linux driver against kernel: " $kernel; - - cd usr/src/nv/ - - shopt -s nullglob - - for a in $kpatches; do - patch -p1 < $a - done - - # Workaround: get it to build on kernels that have CONFIG_XEN - # set. Disable the test, apply a patch to disable the Xen - # functionality. - - #substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord - #patch -p1 < $xenPatch - - # Create the module. - kernelVersion=$(cd $kernel/lib/modules && ls) - sysSource=$(echo $kernel/lib/modules/$kernelVersion/source) - sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) - unset src # used by the nv makefile - make SYSSRC=$sysSource SYSOUT=$sysOut module - cd ../../.. - fi -} - - -installPhase() { - - # Install libGL and friends. - mkdir -p $out/lib - cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/ - - ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so - ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1 - ln -snf libGL.so.$versionNumber $out/lib/libGL.so - ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1 - ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1 - ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1 - ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1 - ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1 - ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1 - - patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.* - set +e - # Legacy nvidia doesn't have cuda - patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - set -e - - if test -z "$libsOnly"; then - - # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc - cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc - - # Install the X driver. - mkdir -p $out/lib/xorg/modules - cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/ - - ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 - ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so - - patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* - - # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-xconfig; do - cp usr/bin/$i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i - done - - # Header files etc. - cp -prd usr/include usr/share $out - - # Patch the `nvidia-settings.desktop' file. - substituteInPlace $out/share/applications/nvidia-settings.desktop \ - --replace '__UTILS_PATH__' $out/bin \ - --replace '__PIXMAP_PATH__' $out/share/pixmaps - fi -} - - -genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d0348bd67d45..11a97d420a83 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,13 @@ in rec { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "390.25"; - sha256_32bit = "0fkbpx01l46pprrd4nlc2y6hfmkb55ddlwm1r84kr6j08qmmb0qi"; - sha256_64bit = "0whsls1mm6vkll5qmxnyz8vjgspp1rmqpsampgi83k62n514c08r"; - settingsSha256 = "1jhbr68z36s3fr9vx3ga2f6yrzlwpc0j5mw8h12g65p7wdsbk6y7"; - persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i"; + version = "390.48"; + sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai"; + sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c"; + settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl"; + persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k"; + + patches = [ ./fix_missing_symbol.patch ]; }; beta = stable; # not enough interest to maintain beta ATM @@ -46,12 +48,13 @@ rec { persistencedSha256 = null; useGLVND = false; useProfiles = false; + settings32Bit = true; prePatch = let debPatches = fetchurl { url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/" - + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz"; - sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr"; + + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz"; + sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l"; }; prefix = "debian/module/debian/patches"; applyPatches = pnames: if pnames == [] then null else @@ -63,6 +66,4 @@ rec { in applyPatches [ "fix-typos" ]; patches = maybePatch_drm_legacy; }; - - legacy_173 = callPackage ./legacy173.nix { }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch new file mode 100644 index 000000000000..ea783b4f011e --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch @@ -0,0 +1,19 @@ +https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/ +--- a/kernel/common/inc/nv-linux.h~ 2018-01-25 06:09:41.000000000 +0100 ++++ b/kernel/common/inc/nv-linux.h 2018-03-05 13:58:17.746725638 +0100 +@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags( + static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev) + { + NvBool swiotlb_in_use = NV_FALSE; ++#if 0 + #if defined(CONFIG_SWIOTLB) + #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT) + /* +@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb + swiotlb_in_use = (swiotlb == 1); + #endif + #endif +- ++#endif + return swiotlb_in_use; + } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index bde8ad361dcd..13e5d1b76ea6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -6,6 +6,7 @@ , useGLVND ? true , useProfiles ? true , preferGtk2 ? false +, settings32Bit ? false , prePatch ? "" , patches ? [] @@ -68,7 +69,7 @@ let disallowedReferences = optional (!libsOnly) [ kernel.dev ]; passthru = { - settings = callPackage (import ./settings.nix self settingsSha256) { + settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) { withGtk2 = preferGtk2; withGtk3 = !preferGtk2; }; @@ -79,7 +80,7 @@ let homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.vcunat ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" }; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix deleted file mode 100644 index 51a230974c86..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ /dev/null @@ -1,53 +0,0 @@ -{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}: - -let - - versionNumber = "173.14.39"; - -in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}-${kernel.version}"; - - builder = ./builder-legacy173.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "08xb7s7cxmj4zv4i3645kjhlhhwxiq6km9ixmsw3vv91f7rkb6d0"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "1p2ls0xj81l8v4n6dbjj3p5wlw1iyhgzyvqcv4h5fdxhhs2cb3md"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - kernel = kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - inherit versionNumber; - - dontStrip = true; - - glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - - cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - - programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ]; - - passthru = { - settings = null; - persistenced = null; - useGLVND = false; - useProfiles = false; - }; - - meta = { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 22fd12427005..21e6cb5d500b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; - platforms = platforms.linux; + platforms = nvidia_x11.meta.platforms; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index bbe3af5d0169..e2ef51da3803 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau, libXext +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus libXv ] + buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { homepage = http://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; - platforms = platforms.linux; + platforms = nvidia_x11.meta.platforms; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 3f8c3c28f317..76dbbf1e1be4 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pam, kerberos }: stdenv.mkDerivation rec { - name = "pam-krb5-4.7"; + name = "pam-krb5-4.8"; src = fetchurl { url = "http://archives.eyrie.org/software/kerberos/${name}.tar.gz"; - sha256 = "04klg9a2rhdz0a2dw4f0ybcm28vcbab6lrynwq7rm4sn0hnzakwv"; + sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs"; }; buildInputs = [ pam kerberos ]; diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 81db8a9f26d0..cc6ac64d58ad 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -6,14 +6,14 @@ assert stdenv.lib.versionAtLeast kernel.version "4.10"; let release = "0.4.0"; - revbump = "rev24"; # don't forget to change forum download id... + revbump = "rev25"; # don't forget to change forum download id... in stdenv.mkDerivation rec { name = "linux-phc-intel-${version}-${kernel.version}"; version = "${release}-${revbump}"; src = fetchurl { - sha256 = "02b4j8ap1fy09z36pmpplbw4vpwqdi16jyzw5kl0a60ydgxkmrpz"; - url = "http://www.linux-phc.org/forum/download/file.php?id=178"; + sha256 = "1w91hpphd8i0br7g5qra26jdydqar45zqwq6jq8yyz6l0vb10zlz"; + url = "http://www.linux-phc.org/forum/download/file.php?id=194"; name = "phc-intel-pack-${revbump}.tar.bz2"; }; diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 536c69ff5573..a7cac46ae6a0 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,68 +1,36 @@ -{ stdenv, fetchurl, pythonPackages, gettext -, setools, libsepol, libselinux, libcap_ng, libsemanage, sepolgen -}: +{ stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }: stdenv.mkDerivation rec { name = "policycoreutils-${version}"; - version = "2.4"; + version = "2.7"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq"; + sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa"; }; - patches = [ ./fix-printf-type.patch ]; - postPatch = '' - # Fix references to libsepol.a - find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \; - # Fix install references - substituteInPlace po/Makefile --replace /usr/bin/install install - - # Fix references to /usr/share - grep -r '/usr/share' | awk -F: '{print $1}' | xargs sed -i "s,\(\$(DESTDIR)\)*/usr/share,$out/share,g" - - # Fix sepolicy install - sed -i "s,\(setup.py install\).*,\1 --prefix=$out,g" sepolicy/Makefile - - # Fix setuid install - sed -i 's|-m 4755|-m 755|' sandbox/Makefile + substituteInPlace po/Makefile \ + --replace /usr/bin/install install --replace /usr/share /share + substituteInPlace newrole/Makefile --replace /usr/share /share ''; - nativeBuildInputs = [ pythonPackages.python gettext ]; - buildInputs = [ setools libsepol libselinux libcap_ng libsemanage ]; - pythonPath = [ libselinux sepolgen ]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ libsepol libselinux libsemanage ]; preBuild = '' makeFlagsArray+=("PREFIX=$out") makeFlagsArray+=("DESTDIR=$out") + makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") + makeFlagsArray+=("LOCALEDIR=$out/share/locale") + makeFlagsArray+=("MAN5DIR=$out/share/man/man5") ''; - # Creation of the system-config-selinux directory is broken - preInstall = '' - mkdir -p $out/share/system-config-selinux - ''; - - # Fix the python scripts to include paths to libraries - # NOTE: We are not using wrapPythonPrograms or makeWrapper as these scripts - # purge the environment as a security measure - postInstall = '' - grep -r '#!.*python' $out/bin | awk -F: '{print $1}' | xargs sed -i "1a \ - import sys; \ - sys.path.append('$(toPythonPath "$out")'); \ - ${stdenv.lib.flip stdenv.lib.concatMapStrings pythonPath (lib: '' - sys.path.append('$(toPythonPath "${lib}")'); \ - '')}" - ''; - - NIX_CFLAGS_COMPILE = "-fstack-protector-all"; - meta = with stdenv.lib; { description = "SELinux policy core utilities"; license = licenses.gpl2; inherit (libsepol.meta) homepage platforms maintainers; }; } - diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch deleted file mode 100644 index 6ab2d6dccc73..000000000000 --- a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c ---- policycoreutils-2.4/setfiles/restore.c 2015-02-02 09:38:10.000000000 -0500 -+++ policycoreutils-2.4.new/setfiles/restore.c 2015-08-29 20:44:13.693023222 -0400 -@@ -118,7 +118,7 @@ - r_opts->count++; - if (r_opts->count % STAR_COUNT == 0) { - if (r_opts->progress == 1) { -- fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT ); -+ fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT ); - } else { - if (r_opts->nfile > 0) { - progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 7679262a9899..5ec708dd69fd 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: +{ stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { name = "powertop-${version}"; @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( + fetchpatch { + name = "strerror_r.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; + sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; + } + ); + postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index cc5e3dd5190c..316f0ad1a28d 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,15 +1,38 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; - version = "3.3.12"; + version = "3.3.13"; - src = fetchurl { - url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; - sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf"; + src = fetchFromGitLab { + owner ="procps-ng"; + repo = "procps"; + rev = "v${version}"; + sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q"; }; buildInputs = [ ncurses ]; + nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ]; + + # https://gitlab.com/procps-ng/procps/issues/88 + # Patches needed for musl and glibc 2.28 + patches = [ + (fetchpatch { + url = "https://gitlab.com/procps-ng/procps/uploads/f91ff094be1e4638aeffb67bdbb751ba/numa.h.diff"; + sha256 = "16r537d2wfrvbv6dg9vyfck8n31xa58903mnssw1s4kb5ap83yd5"; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://gitlab.com/procps-ng/procps/uploads/6a7bdea4d82ba781451316fda74192ae/libio_detection.diff"; + sha256 = "0qp0j60kiycjsv213ih10imjirmxz8zja3rk9fq5lr5xf7k2lr3p"; + }) + ]; + + # autoreconfHook doesn't quite get, what procps-ng buildprocss does + # with po/Makefile.in.in and stuff. + preConfigure = '' + ./autogen.sh + ''; makeFlags = "usrbin_execdir=$(out)/bin"; @@ -22,10 +45,11 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; meta = { - homepage = https://sourceforge.net/projects/procps-ng/; + homepage = https://gitlab.com/procps-ng/procps; description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; platforms = lib.platforms.linux ++ lib.platforms.cygwin; + maintainers = [ lib.maintainers.typetetris ]; }; } diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index c87bec3a5264..504d25957858 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "radeontop-${version}"; - version = "2016-10-28"; + version = "2018-03-25"; src = fetchFromGitHub { - sha256 = "0y4rl8pm7p22s1ipyb75mlsk9qb6j4rd6nlqb3digmimnyxda1q3"; - rev = "v1.0"; + sha256 = "0s41xy9nrzxmimkdg23fr86rqcfiw6iqh99zpph0j990l8yzmv9b"; + rev = "v1.1"; repo = "radeontop"; owner = "clbr"; }; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b25ed85ce4b3..9aa938068791 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "17"; + version = "17.1"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1xql46favv8i4ni4zqkk9ra2kcqq2dyn7jyi940c869lndmjw9ni"; + sha256 = "019h5q0szjccdgfk13qy0f2dxd0n1fr407b3qqq1vcmx41w9b6vz"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 4fd716ab8db8..868dcc9a58ea 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc"; sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix"; }) + + # Fix format string errors due to -Werror=format-security + (fetchpatch { + url = "https://sources.debian.org/data/main/r/rtkit/0.11-6/debian/patches/0006-fix-format-strings.patch"; + sha256 = "09mr89lh16jvz6cqw00zmh0xk919bjfhjkvna1czwmafwy9p7kgp"; + }) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix new file mode 100644 index 000000000000..8ac207d64214 --- /dev/null +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, python3 +, libselinux, libsemanage, libsepol, setools }: + +# this is python3 only because setools only supports python3 + +with stdenv.lib; +with python3.pkgs; + +stdenv.mkDerivation rec { + name = "selinux-python-${version}"; + version = "2.7"; + se_release = "20170804"; + se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; + + src = fetchurl { + url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz"; + sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2"; + }; + + nativeBuildInputs = [ wrapPython ]; + buildInputs = [ libsepol python3 ]; + propagatedBuildInputs = [ libselinux libsemanage setools ipy ]; + + postPatch = '' + substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix" + ''; + + preBuild = '' + makeFlagsArray+=("PREFIX=$out") + makeFlagsArray+=("DESTDIR=$out") + makeFlagsArray+=("LOCALEDIR=$out/share/locale") + makeFlagsArray+=("LIBSEPOLA=${libsepol}/lib/libsepol.a") + makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") + makeFlagsArray+=("PYTHON=${python3}/bin/python") + makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages") + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = { + description = "SELinux policy core utilities written in Python"; + license = licenses.gpl2; + homepage = https://selinuxproject.org; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix new file mode 100644 index 000000000000..431f5e9ef517 --- /dev/null +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, bash, coreutils, python3 +, libcap_ng, policycoreutils, selinux-python, dbus +, xorgserver, openbox, xmodmap }: + +# this is python3 only as it depends on selinux-python + +with stdenv.lib; +with python3.pkgs; + +stdenv.mkDerivation rec { + name = "selinux-sandbox-${version}"; + version = "2.7"; + se_release = "20170804"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz"; + sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l"; + }; + + nativeBuildInputs = [ wrapPython ]; + buildInputs = [ bash coreutils libcap_ng policycoreutils python3 xorgserver openbox xmodmap dbus ]; + propagatedBuildInputs = [ pygobject3 selinux-python ]; + + postPatch = '' + # Fix setuid install + substituteInPlace Makefile --replace "-m 4755" "-m 755" + substituteInPlace sandboxX.sh \ + --replace "#!/bin/sh" "#!${bash}/bin/sh" \ + --replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \ + --replace "/usr/bin/cut" "${coreutils}/bin/cut" \ + --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \ + --replace "secon" "${policycoreutils}/bin/secon" + substituteInPlace sandbox \ + --replace "/usr/sbin/seunshare" "$out/bin/seunshare" \ + --replace "/usr/share/sandbox" "$out/share/sandbox" \ + --replace "/usr/share/locale" "${policycoreutils}/share/locale" \ + --replace "/usr/bin/openbox" "${openbox}/bin/openbox" \ + --replace "#!/bin/sh" "#!${bash}/bin/sh" \ + --replace "dbus-" "${dbus}/bin/dbus-" \ + --replace "/usr/bin/xmodmap" "${xmodmap}/bin/xmodmap" \ + --replace "/usr/bin/shred" "${coreutils}/bin/shred" \ + --replace "/usr/bin/test" "${coreutils}/bin/test" \ + ''; + + preBuild = '' + makeFlagsArray+=("PREFIX=$out") + makeFlagsArray+=("DESTDIR=$out") + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = { + description = "SELinux sandbox utility"; + license = licenses.gpl2; + homepage = https://selinuxproject.org; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 8262c03e1e52..9cb5785ca98f 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,35 +1,42 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, bison, flex -, python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }: +{ stdenv, fetchFromGitHub, bison, flex, python3 , swig +, libsepol, libselinux, checkpolicy +, withGraphics ? false +}: -stdenv.mkDerivation rec { - name = "setools-2015-02-12"; +with stdenv.lib; +with python3.pkgs; + +buildPythonApplication rec { + pname = "setools"; + version = "2017-11-10"; src = fetchFromGitHub { owner = "TresysTechnology"; - repo = "setools3"; - rev = "f1e5b208d507171968ca4d2eeefd7980f1004a3c"; - sha256 = "02gzy2kpszhr13f0d9qfiwh2hj4201g2x366j53v5n5qz481aykd"; + repo = pname; + rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7"; + sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn"; }; - configureFlags = [ - "--disable-gui" - "--with-sepol-devel=${libsepol}" - "--with-selinux-devel=${libselinux}" - "--with-tcl=${tcl}/lib" - ]; + nativeBuildInputs = [ bison flex ]; + buildInputs = [ libsepol swig ]; + propagatedBuildInputs = [ enum34 libselinux networkx ] + ++ optionals withGraphics [ pyqt5 ]; - hardeningDisable = [ "format" ]; + checkInputs = [ tox checkpolicy ]; + preCheck = '' + export CHECKPOLICY=${checkpolicy}/bin/checkpolicy + ''; - NIX_CFLAGS_COMPILE = "-fstack-protector-all"; - NIX_LDFLAGS = "-L${libsepol}/lib -L${libselinux}/lib"; + setupPyBuildFlags = [ "-i" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig python swig2 bison flex ]; - buildInputs = [ tcl libxml2 sqlite bzip2 ]; + preBuild = '' + export SEPOL="${libsepol}/lib/libsepol.a" + ''; meta = { description = "SELinux Tools"; - homepage = http://oss.tresys.com/projects/setools/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/TresysTechnology/setools/wiki; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index ca15571d1ede..3a76450a8308 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -60,8 +60,10 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog "; ''; - configureFlags = " --enable-man " - + stdenv.lib.optionalString (hostPlatform.libc != "glibc") " --disable-nscd "; + configureFlags = [ + "--enable-man" + "--with-group-name-max-length=32" + ] ++ stdenv.lib.optional (hostPlatform.libc != "glibc") "--disable-nscd"; preBuild = stdenv.lib.optionalString (hostPlatform.libc == "glibc") '' diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 46abb6ccc662..32761970d81c 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -5,7 +5,7 @@ let baseName="sinit"; version="1.0"; name="${baseName}-${version}"; - url="http://git.suckless.org/sinit/"; + url="https://git.suckless.org/sinit/"; sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc"; rev = "refs/tags/v${version}"; }; @@ -32,6 +32,6 @@ stdenv.mkDerivation { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; homepage = https://tools.suckless.org/sinit; - downloadPage = "http://git.suckless.org/sinit"; + downloadPage = "https://git.suckless.org/sinit"; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 9460ee46c0f0..7c37d18c8684 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -11,6 +11,7 @@ let , sha256 , rev ? "spl-${version}" , broken ? false + , patches ? [] } @ args : stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; @@ -20,7 +21,7 @@ let inherit rev sha256; }; - patches = [ ./install_prefix.patch ]; + inherit patches; nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; @@ -61,19 +62,22 @@ in assert kernel != null; { splStable = common { - version = "0.7.7"; - sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x"; + version = "0.7.8"; + sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi"; + patches = [ ./install_prefix-0.7.8.patch ]; }; splUnstable = common { - version = "2018-01-24"; - rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; - sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; + version = "2018-04-10"; + rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8"; + sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri"; + patches = [ ./install_prefix.patch ]; }; splLegacyCrypto = common { version = "2018-01-24"; rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; + patches = [ ./install_prefix.patch ]; }; } diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch new file mode 100644 index 000000000000..dc91392bd2fe --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch @@ -0,0 +1,174 @@ +diff --git a/Makefile.am b/Makefile.am +index 4977448..ac17217 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,10 +12,10 @@ endif + if CONFIG_KERNEL + SUBDIRS += module + +-extradir = @prefix@/src/spl-$(VERSION) ++extradir = @prefix@/libexec/spl + extra_HEADERS = spl.release.in spl_config.h.in + +-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) ++kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) + endif + +diff --git a/include/Makefile.am b/include/Makefile.am +index 3200222..4a47aaa 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -13,6 +13,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include ++kerneldir = @prefix@/libexec/spl/include + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am +index e0da4b3..d6d7af0 100644 +--- a/include/fs/Makefile.am ++++ b/include/fs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs ++kerneldir = @prefix@/libexec/spl/include/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am +index 712e94e..4af9fb7 100644 +--- a/include/linux/Makefile.am ++++ b/include/linux/Makefile.am +@@ -18,6 +18,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux ++kerneldir = @prefix@/libexec/spl/include/linux + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am +index cfc8246..4fbd33d 100644 +--- a/include/rpc/Makefile.am ++++ b/include/rpc/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc ++kerneldir = @prefix@/libexec/spl/include/rpc + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am +index 10e7093..febecdf 100644 +--- a/include/sharefs/Makefile.am ++++ b/include/sharefs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs ++kerneldir = @prefix@/libexec/spl/include/sharefs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am +index 73c4a84..31a9f50 100644 +--- a/include/sys/Makefile.am ++++ b/include/sys/Makefile.am +@@ -107,7 +107,7 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys ++kerneldir = @prefix@/libexec/spl/include/sys + kernel_HEADERS = $(KERNEL_H) + endif + +diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am +index 2821cbe..a84ce8e 100644 +--- a/include/sys/fm/Makefile.am ++++ b/include/sys/fm/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm ++kerneldir = @prefix@/libexec/spl/include/sys/fm + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am +index 581083e..0c35fb7 100644 +--- a/include/sys/fs/Makefile.am ++++ b/include/sys/fs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs ++kerneldir = @prefix@/libexec/spl/include/sys/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am +index 63d9af3..de1aa18 100644 +--- a/include/sys/sysevent/Makefile.am ++++ b/include/sys/sysevent/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent ++kerneldir = @prefix@/libexec/spl/include/sys/sysevent + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/util/Makefile.am b/include/util/Makefile.am +index e2bf09f..3f5d6ce 100644 +--- a/include/util/Makefile.am ++++ b/include/util/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/util ++kerneldir = @prefix@/libexec/spl/include/util + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am +index 7faab0a..8148b3d 100644 +--- a/include/vm/Makefile.am ++++ b/include/vm/Makefile.am +@@ -10,6 +10,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm ++kerneldir = @prefix@/libexec/spl/include/vm + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/module/Makefile.in b/module/Makefile.in +index d4e62e1..73fa01c 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -21,15 +21,15 @@ clean: + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ ++ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ + KERNELRELEASE=@LINUX_VERSION@ + @# Remove extraneous build products when packaging +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ ++ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ ++ if [ -n "@prefix@" ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ ++ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index dc91392bd2fe..114ca1231470 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644 +kerneldir = @prefix@/libexec/spl/include/sys/fs kernel_HEADERS = $(KERNEL_H) endif -diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am -index 63d9af3..de1aa18 100644 ---- a/include/sys/sysevent/Makefile.am -+++ b/include/sys/sysevent/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -+kerneldir = @prefix@/libexec/spl/include/sys/sysevent - kernel_HEADERS = $(KERNEL_H) - endif diff --git a/include/util/Makefile.am b/include/util/Makefile.am index e2bf09f..3f5d6ce 100644 --- a/include/util/Makefile.am diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 5c7b2e69edf2..6223c967619d 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0nbsfm2jh5gjy2wh79f35rqk3c3z15lymmcz3gviw0jaxdv6drzw"; + sha256 = "0dakxv2pkbsivavz09fwvav4dla7qzklnv45zb7x306gankkjgi1"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index d8e95ff74c43..db9f05f5f4d8 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-11.7.2"; + name = "sysstat-11.7.3"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "169yh9d0ags9xrn5g0k42wd1c895117zbzs257cjxqnb2vk0a38v"; + sha256 = "1sk6rhdqr8xsm456fkhkcmbnqgkymqqs3jkapcf8mrnsx36gz94f"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a792283e70e1..7c9514883093 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -10,6 +10,7 @@ , getent , hostPlatform , buildPackages +, withSelinux ? false, libselinux }: assert stdenv.isLinux; @@ -18,14 +19,16 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "237"; + version = "238"; name = "systemd-${version}"; + # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! + # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "98067cc806ae0d2759cdd2334f230cd8548e5317"; - sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q"; + rev = "02042d012c4d6c0a2854d8436dd6636d4327774f"; + sha256 = "0iv6fygzac0z6dagbmw1nf8dx7rrr6d9cxp0fr304rn3ir58g5f0"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -40,11 +43,14 @@ in stdenv.mkDerivation rec { buildInputs = [ linuxHeaders libcap kmod xz pam acl /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 - libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor + libmicrohttpd ] ++ + stdenv.lib.meta.enableIfAvailable kexectools ++ + stdenv.lib.meta.enableIfAvailable libseccomp ++ + [ libffi audit lz4 bzip2 libapparmor iptables gnu-efi # This is actually native, but we already pull it from buildPackages pythonLxmlEnv - ]; + ] ++ stdenv.lib.optionals withSelinux [ libselinux ]; #dontAddPrefix = true; @@ -73,7 +79,7 @@ in stdenv.mkDerivation rec { "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" @@ -177,13 +183,6 @@ in stdenv.mkDerivation rec { rm -rf $out/etc/systemd/system - # Install SysV compatibility commands. - mkdir -p $out/sbin - ln -s $out/lib/systemd/systemd $out/sbin/telinit - for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i - done - # Fix reference to /bin/false in the D-Bus services. for i in $out/share/dbus-1/system-services/*.service; do substituteInPlace $i --replace /bin/false ${coreutils}/bin/false diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 6ec8abdc1760..b516cfe65edd 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, withoutInitTools ? false }: -let version = "2.88dsf"; in +let version = "2.89"; in stdenv.mkDerivation { name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.bz2"; - sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0"; + sha256 = "0rdw5lgg2rpcfdmq90br388qr01w89vsqmpvrqcqjqsmxk9zw3c2"; }; prePatch = '' diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix new file mode 100644 index 000000000000..01c84a1d1faa --- /dev/null +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, kernel, ncurses }: + +stdenv.mkDerivation { + name = "tmon-${kernel.version}"; + + inherit (kernel) src; + + buildInputs = [ ncurses ]; + + configurePhase = '' + cd tools/thermal/tmon + ''; + + makeFlags = kernel.makeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Monitoring and Testing Tool for Linux kernel thermal subsystem"; + homepage = https://www.kernel.org/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 725b1cd25643..1c8e429c9455 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "udisks-2.1.6"; + name = "udisks-2.1.8"; src = fetchurl { url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2"; - sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify"; + sha256 = "1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs"; }; outputs = [ "out" "man" "dev" ]; @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { --replace "/bin/sh" "${stdenv.shell}" \ --replace "/sbin/mdadm" "${mdadm}/bin/mdadm" \ --replace " sed " " ${gnused}/bin/sed " - ''; + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace udisks/udisksclient.c \ + --replace 'defined( __GNUC_PREREQ)' 1 \ + --replace '__GNUC_PREREQ(4,6)' 1 + ''; nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 920c8c0bdee0..3db2814a0878 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, kernel, kmod }: +{ stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.9.1"; + version = "0.11.0"; - src = fetchurl { - url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz"; - sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568"; + src = fetchFromGitHub { + owner = "umlaeute"; + repo = "v4l2loopback"; + rev = "v${version}"; + sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az"; }; hardeningDisable = [ "format" "pic" ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 0650bfd36f34..b88646424be5 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180304"; + version = "0.0.20180413"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "11vp6aiqxrnwqlaslxy13cpmw2l2pdm9nhs021rv4zx61lpnbcgg"; + sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 2ebb2b1890d5..b5937dff3752 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.35.0"; + name = "xf86-input-wacom-0.36.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm"; + sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index aac1576261d4..d4b312ad6d54 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -4,6 +4,7 @@ # Userspace dependencies , zlib, libuuid, python, attr, openssl +, libtirpc # Kernel dependencies , kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null @@ -27,7 +28,7 @@ let versionAtLeast kernel.version incompatibleKernelVersion then throw '' Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. - ${stdenv.lib.optional (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} + ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' else stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; @@ -42,6 +43,9 @@ let postPatch = optionalString buildKernel '' patchShebangs scripts + '' + optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace config/user-libtirpc.m4 \ + --replace /usr/include/tirpc ${libtirpc}/include/tirpc ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] @@ -49,7 +53,8 @@ let buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] - ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ]; + ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ] + ++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; @@ -77,6 +82,7 @@ let done ./autogen.sh + configureFlagsArray+=("--libexecdir=$out/libexec") ''; configureFlags = [ @@ -86,6 +92,7 @@ let "--with-udevdir=$(out)/lib/udev" "--with-systemdunitdir=$(out)/etc/systemd/system" "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" + "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator" "--with-mounthelperdir=$(out)/bin" "--sysconfdir=/etc" "--localstatedir=/var" @@ -147,9 +154,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.7"; + version = "0.7.8"; - sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r"; + sha256 = "0m7j5cpz81lqcfbh4w3wvqjjka07wickl27klgy1zplv6vr0baix"; extraPatches = [ (fetchpatch { @@ -161,30 +168,32 @@ in { inherit spl; }; - zfsUnstable = common { + zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-02-02"; + version = "2018-04-10"; - rev = "fbd42542686af053f0d162ec4630ffd4fff1cc30"; - sha256 = "0qzkwnnk7kz1hwvcaqlpzi5yspfhhmd2alklc07k056ddzbx52qb"; + rev = "74df0c5e251a920a1966a011c16f960cd7ba562e"; + sha256 = "1x3mipj3ryznnd7kx84r3n607hv6jqs66mb61g3zcdmvk6al4yq4"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/fbd42542686af053f0d162ec4630ffd4fff1cc30...nixos-zfs-2018-02-02.patch"; - sha256 = "05wqwjm9648x60vkwxbp8l6z1q73r2a5l2ni28i2f4pla8s3ahln"; + url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch"; + sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; }) ]; spl = splUnstable; }; + # TODO: Remove this module before 18.09 + # also remove boot.zfs.enableLegacyCrypto zfsLegacyCrypto = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-02-01"; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index ea2c0325148b..a838fa3b904c 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }: +{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: -stdenv.mkDerivation rec { +let name = "qpid-cpp-${version}"; - version = "1.37.0"; src = fetchurl { @@ -10,24 +9,45 @@ stdenv.mkDerivation rec { sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb"; }; - buildInputs = [ cmake python2 boost libuuid ruby ]; - - # the subdir managementgen wants to install python stuff in ${python} and - # the installation tries to create some folders in /var - patchPhase = '' - sed -i '/managementgen/d' CMakeLists.txt - sed -i '/ENV/d' src/CMakeLists.txt - ''; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=unused-function"; - - meta = { + meta = with stdenv.lib; { homepage = http://qpid.apache.org; repositories.git = git://git.apache.org/qpid.git; repositories.svn = http://svn.apache.org/repos/asf/qpid; description = "An AMQP message broker and a C++ messaging API"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.cpages ]; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ cpages ma27 ]; + }; + + qpid-cpp = stdenv.mkDerivation { + inherit src meta name; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost libuuid ruby python2 ]; + + # the subdir managementgen wants to install python stuff in ${python} and + # the installation tries to create some folders in /var + postPatch = '' + sed -i '/managementgen/d' CMakeLists.txt + sed -i '/ENV/d' src/CMakeLists.txt + sed -i '/management/d' CMakeLists.txt + ''; + + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=unused-function" + "-Wno-error=int-in-bool-context" + ]; + }; + + python-frontend = buildPythonPackage { + inherit name meta src; + + sourceRoot = "${name}/management/python"; + + propagatedBuildInputs = [ qpid-python ]; }; +in buildEnv { + name = "${name}-env"; + paths = [ qpid-cpp python-frontend ]; } diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 3b67171a474e..bec61d460a7a 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, nettools, man +{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man , enableCgiScripts ? true, gd }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # There is no real reason for a bin/sbin split, so just use bin. preConfigure = '' export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown - export ac_cv_path_WALL=${utillinux}/bin/wall + export ac_cv_path_WALL=${wall}/bin/wall sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure export configureFlags="\ --bindir=$out/bin \ @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { postInstall = '' for file in "$out"/etc/apcupsd/*; do - sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \ - -e 's|^HOSTNAME=.*|HOSTNAME=`${nettools}/bin/hostname`|g' \ + sed -i -e 's|^WALL=.*|WALL="${wall}/bin/wall"|g' \ + -e 's|^HOSTNAME=.*|HOSTNAME=`${hostname}/bin/hostname`|g' \ "$file" done ''; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index b90e68ed3bcb..fd34c1f43859 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.7.0"; + version = "7.9.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1np1zf6yxras15ambf92g8snnvph9pp2dk4yw6w58yfil5kzp70l"; + sha256 = "1xj04a78dhjzb2ms875lfg5s3qc8rw31fws92yhmbs0k1866g33b"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index ba29bfa433a9..94bd92abb4f8 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -48,7 +48,7 @@ in }; bird2 = generic { - version = "2.0.1"; - sha256 = "0qyh2cxj7hfz90x3fnczjdm3i9g7vr0nc4l4wjkj9qm0646vc52n"; + version = "2.0.2"; + sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3"; }; } diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index ad8aeadeff06..d89e59d662e7 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.11"; + version = "0.10.12"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6"; + sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88"; }; buildFlagsArray = '' diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index fe028cf812e7..b0460f21bfaf 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.3"; + version = "17.11.5"; src = fetchurl { url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps"; + sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 8bed7f160f7b..13a78d61098b 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { the wordnet data available to dictd and by extension for lookup with the dict command. ''; - homepage = http://wordnet.princeton.edu/; + homepage = https://wordnet.princeton.edu/; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index a47d3106443f..de37aeaa590b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn -, systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty +, systemd, nettle, libedit, zlib, libiconv, libintl }: let inherit (stdenv.lib) optional optionals; in @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "33cd676706e2baeb37cf3879ccbc91a1e1cd1ee5d7a082adff4d1e753ce49d46"; + sha256 = "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci"; }; outputs = [ "bin" "out" "dev" ]; @@ -20,11 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls liburcu libidn nettle libedit - libiconv lmdb + libiconv lmdb libintl # without sphinx &al. for developer documentation ] ++ optionals stdenv.isLinux [ libcap_ng systemd ] - ++ libintlOrEmpty ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; @@ -43,4 +42,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } - diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index a222805fc459..09fda1b81b8b 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,16 +12,16 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "0b9caee03d7cd30e1dc8fa0ce5fafade31fc1785314986bbf77cad446522a1b3"; + sha256 = "1yhlwvpl81klyfb8hhvrhii99q7wvydi3vandmq9j7dvig6z1dvv"; }; outputs = [ "out" "dev" ]; - configurePhase = ":"; + configurePhase = "patchShebangs scripts/"; nativeBuildInputs = [ pkgconfig which hexdump ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 25b333a46188..76f1bd91e33d 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0srrw726qpwg69v75dwbxab9hk73x1wia4rcnmf7g5qr2k3h7swg"; + sha256 = "0xpd8k7ahwrwabz05zbjmg54dmd4hm5hkbfn8m1ws6y4f7qm4inv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index eeb3d39fa1da..964fa77c31a9 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.3.0.0"; + version = "3.3.1.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "14nnrlwx8bghiz72lspxahwadhvnf8vs3bqbffnd5nrrv4shijhm"; + sha256 = "04qq3rl3pwxnsr8z6x3dwplh6brn1nd0jpmmnvizln4ffx9wspb8"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 865b6f3faba1..38fb7d250e34 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bftpd"; - version = "4.8"; + version = "4.9"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "1zlsajj6wjd9wcijzngmafhy2gr3sm5rphsr5n44rlmx1jdkk00c"; + sha256 = "13pjil9cjggpi773m0516lszyqvwzlgcrmmj8yn9nc24rbxwvn6d"; }; buildInputs = []; preConfigure = '' diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 3728ee6c2a8f..f41bb726a28c 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = https://www.pureftpd.org; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ maintainers.lethalman ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 6096aa1ed74d..3cb0d3931db3 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "gpm-1.20.7"; src = fetchurl { - url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; + url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nico.schottelius.org/software/gpm/; + homepage = https://www.nico.schottelius.org/software/gpm/; description = "A daemon that provides mouse support on the Linux console"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.cygwin; diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index a6119e58d7cf..493131795034 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -33,11 +33,11 @@ let in python.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "3.0.0"; + version = "3.0.1"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "ed925d3cb25db2c3f57304a0bca8fd0d9072d7ffe347ac5fcf68c4a30b7f1721"; + sha256 = "ad16773da21e34e258970bf5740d1634a36c8202ac72c6925d960308ef1c58cf"; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e2fc90a22966..3a74a43d14d5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,13 +2,12 @@ # Do not edit! { - version = "0.65.5"; + version = "0.67.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; "alarm_control_panel.concord232" = ps: with ps; [ ]; - "alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.nx584" = ps: with ps; [ ]; "alarm_control_panel.simplisafe" = ps: with ps; [ ]; @@ -46,7 +45,7 @@ "climate.daikin" = ps: with ps; [ ]; "climate.econet" = ps: with ps; [ ]; "climate.ephember" = ps: with ps; [ ]; - "climate.eq3btsmart" = ps: with ps; [ ]; + "climate.eq3btsmart" = ps: with ps; [ construct ]; "climate.flexit" = ps: with ps; [ ]; "climate.heatmiser" = ps: with ps; [ ]; "climate.honeywell" = ps: with ps; [ ]; @@ -56,10 +55,11 @@ "climate.sensibo" = ps: with ps; [ ]; "climate.touchline" = ps: with ps; [ ]; "climate.venstar" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ warrant ]; "coinbase" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; "config.config_entries" = ps: with ps; [ ]; + "cover.gogogate2" = ps: with ps; [ ]; "cover.myq" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; "datadog" = ps: with ps; [ datadog ]; @@ -71,7 +71,8 @@ "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; - "device_tracker.fritz" = ps: with ps; [ ]; + "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; + "device_tracker.google_maps" = ps: with ps; [ ]; "device_tracker.icloud" = ps: with ps; [ ]; "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; "device_tracker.mikrotik" = ps: with ps; [ ]; @@ -85,6 +86,7 @@ "device_tracker.unifi" = ps: with ps; [ pyunifi ]; "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; + "device_tracker.xiaomi_miio" = ps: with ps; [ ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "discovery" = ps: with ps; [ netdisco ]; "dominos" = ps: with ps; [ ]; @@ -97,10 +99,11 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; - "fan.xiaomi_miio" = ps: with ps; [ ]; + "fan.xiaomi_miio" = ps: with ps; [ construct ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; - "frontend" = ps: with ps; [ user-agents ]; + "folder_watcher" = ps: with ps; [ watchdog ]; + "frontend" = ps: with ps; [ ]; "gc100" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client oauth2client ]; @@ -108,12 +111,13 @@ "hive" = ps: with ps; [ ]; "homekit" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; + "homematicip_cloud" = ps: with ps; [ ]; "http" = ps: with ps; [ aiohttp-cors ]; "hue" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; - "image_processing.dlib_face_detect" = ps: with ps; [ ]; - "image_processing.dlib_face_identify" = ps: with ps; [ ]; + "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; + "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ]; "image_processing.opencv" = ps: with ps; [ numpy ]; "influxdb" = ps: with ps; [ influxdb ]; "insteon_local" = ps: with ps; [ ]; @@ -123,7 +127,7 @@ "joaoapps_join" = ps: with ps; [ ]; "juicenet" = ps: with ps; [ ]; "keyboard" = ps: with ps; [ ]; - "keyboard_remote" = ps: with ps; [ ]; + "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; "lametric" = ps: with ps; [ ]; @@ -139,13 +143,14 @@ "light.lifx_legacy" = ps: with ps; [ ]; "light.limitlessled" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; + "light.nanoleaf_aurora" = ps: with ps; [ ]; "light.osramlightify" = ps: with ps; [ ]; "light.piglow" = ps: with ps; [ ]; "light.rpi_gpio_pwm" = ps: with ps; [ ]; "light.sensehat" = ps: with ps; [ ]; "light.tikteck" = ps: with ps; [ ]; "light.tplink" = ps: with ps; [ ]; - "light.xiaomi_miio" = ps: with ps; [ ]; + "light.xiaomi_miio" = ps: with ps; [ construct ]; "light.yeelight" = ps: with ps; [ ]; "light.yeelightsunflower" = ps: with ps; [ ]; "light.zengge" = ps: with ps; [ ]; @@ -172,7 +177,7 @@ "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; "media_player.frontier_silicon" = ps: with ps; [ ]; - "media_player.gpmdp" = ps: with ps; [ ]; + "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; @@ -196,7 +201,7 @@ "media_player.songpal" = ps: with ps; [ ]; "media_player.sonos" = ps: with ps; [ ]; "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; - "media_player.spotify" = ps: with ps; [ ]; + "media_player.spotify" = ps: with ps; [ spotipy ]; "media_player.vizio" = ps: with ps; [ ]; "media_player.vlc" = ps: with ps; [ ]; "media_player.webostv" = ps: with ps; [ websockets ]; @@ -205,7 +210,6 @@ "media_player.yamaha_musiccast" = ps: with ps; [ ]; "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; "melissa" = ps: with ps; [ ]; - "mercedesme" = ps: with ps; [ ]; "mochad" = ps: with ps; [ ]; "modbus" = ps: with ps; [ ]; "mqtt" = ps: with ps; [ paho-mqtt ]; @@ -230,6 +234,7 @@ "notify.kodi" = ps: with ps; [ jsonrpc-async ]; "notify.lametric" = ps: with ps; [ ]; "notify.mailgun" = ps: with ps; [ ]; + "notify.mastodon" = ps: with ps; [ ]; "notify.matrix" = ps: with ps; [ matrix-client ]; "notify.message_bird" = ps: with ps; [ ]; "notify.pushbullet" = ps: with ps; [ pushbullet ]; @@ -239,6 +244,7 @@ "notify.sendgrid" = ps: with ps; [ ]; "notify.simplepush" = ps: with ps; [ ]; "notify.slack" = ps: with ps; [ ]; + "notify.stride" = ps: with ps; [ ]; "notify.twitter" = ps: with ps; [ ]; "notify.webostv" = ps: with ps; [ ]; "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; @@ -256,7 +262,7 @@ "remember_the_milk" = ps: with ps; [ httplib2 ]; "remote.harmony" = ps: with ps; [ ]; "remote.itach" = ps: with ps; [ ]; - "remote.xiaomi_miio" = ps: with ps; [ ]; + "remote.xiaomi_miio" = ps: with ps; [ construct ]; "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; @@ -278,7 +284,7 @@ "sensor.coinmarketcap" = ps: with ps; [ ]; "sensor.cpuspeed" = ps: with ps; [ ]; "sensor.crimereports" = ps: with ps; [ ]; - "sensor.cups" = ps: with ps; [ ]; + "sensor.cups" = ps: with ps; [ pycups ]; "sensor.darksky" = ps: with ps; [ ]; "sensor.deluge" = ps: with ps; [ deluge-client ]; "sensor.deutsche_bahn" = ps: with ps; [ ]; @@ -289,7 +295,7 @@ "sensor.dsmr" = ps: with ps; [ ]; "sensor.dweet" = ps: with ps; [ ]; "sensor.ebox" = ps: with ps; [ ]; - "sensor.eddystone_temperature" = ps: with ps; [ ]; + "sensor.eddystone_temperature" = ps: with ps; [ construct ]; "sensor.eliqonline" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; @@ -298,8 +304,9 @@ "sensor.fido" = ps: with ps; [ ]; "sensor.fitbit" = ps: with ps; [ ]; "sensor.fixer" = ps: with ps; [ ]; - "sensor.fritzbox_callmonitor" = ps: with ps; [ ]; - "sensor.fritzbox_netmonitor" = ps: with ps; [ ]; + "sensor.foobot" = ps: with ps; [ ]; + "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; + "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "sensor.gearbest" = ps: with ps; [ ]; "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; @@ -357,6 +364,7 @@ "sensor.steam_online" = ps: with ps; [ ]; "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; "sensor.swiss_public_transport" = ps: with ps; [ ]; + "sensor.syncthru" = ps: with ps; [ ]; "sensor.synologydsm" = ps: with ps; [ ]; "sensor.systemmonitor" = ps: with ps; [ psutil ]; "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; @@ -372,8 +380,10 @@ "sensor.ups" = ps: with ps; [ ]; "sensor.vasttrafik" = ps: with ps; [ ]; "sensor.waqi" = ps: with ps; [ ]; + "sensor.waze_travel_time" = ps: with ps; [ ]; "sensor.whois" = ps: with ps; [ ]; "sensor.xbox_live" = ps: with ps; [ ]; + "sensor.xiaomi_miio" = ps: with ps; [ construct ]; "sensor.yahoo_finance" = ps: with ps; [ ]; "sensor.yr" = ps: with ps; [ xmltodict ]; "sensor.yweather" = ps: with ps; [ yahooweather ]; @@ -404,8 +414,9 @@ "switch.thinkingcleaner" = ps: with ps; [ ]; "switch.tplink" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; + "switch.vesync" = ps: with ps; [ ]; "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; - "switch.xiaomi_miio" = ps: with ps; [ ]; + "switch.xiaomi_miio" = ps: with ps; [ construct ]; "tado" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; "telegram_bot" = ps: with ps; [ python-telegram-bot ]; @@ -426,7 +437,7 @@ "upnp" = ps: with ps; [ miniupnpc ]; "usps" = ps: with ps; [ ]; "vacuum.roomba" = ps: with ps; [ ]; - "vacuum.xiaomi_miio" = ps: with ps; [ ]; + "vacuum.xiaomi_miio" = ps: with ps; [ construct ]; "velbus" = ps: with ps; [ ]; "velux" = ps: with ps; [ ]; "vera" = ps: with ps; [ ]; @@ -447,6 +458,6 @@ "zeroconf" = ps: with ps; [ zeroconf ]; "zha" = ps: with ps; [ ]; "zigbee" = ps: with ps; [ ]; - "zwave" = ps: with ps; [ pydispatcher ]; + "zwave" = ps: with ps; [ pydispatcher python_openzwave ]; }; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 75f8b309a406..0f15b21e4685 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -8,17 +8,17 @@ let py = python3.override { packageOverrides = self: super: { aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.0.6"; + version = "3.1.1"; src = oldAttrs.src.override { inherit version; - sha256 = "5b588d21b454aaeaf2debf3c4a37f0752fb91a5c15b621deca7e8c49316154fe"; + sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f"; }; }); pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { - version = "3.3.1"; + version = "3.4.2"; src = oldAttrs.src.override { inherit version; - sha256 = "14zbnbn53yvrpv79ch6n02myq9b4winjkaykzi356sfqb7f3d16g"; + sha256 = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5"; }; }); voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { @@ -29,10 +29,17 @@ let }; }); astral = super.astral.overridePythonAttrs (oldAttrs: rec { - version = "1.5"; + version = "1.6"; src = oldAttrs.src.override { inherit version; - sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6"; + sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083"; + }; + }); + async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { + version = "2.0.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; }; }); hass-frontend = super.callPackage ./frontend.nix { }; @@ -45,13 +52,13 @@ let getPackages = component: builtins.getAttr component componentPackages.components; - componentBuildInputs = map (component: getPackages component py.pkgs) extraComponents; + componentBuildInputs = lib.concatMap (component: getPackages component py.pkgs) extraComponents; # Ensure that we are using a consistent package set extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.65.5"; + hassVersion = "0.67.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -66,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1jd44y3f31926g08h2zykp9hnigh6yms38mqn3i5gcl01n1n368k"; + sha256 = "02czbqdsdar8rjkr0r5g6j1x9caazcir2w1hp595z4cn90c0342f"; }; propagatedBuildInputs = [ @@ -84,7 +91,8 @@ in with py.pkgs; buildPythonApplication rec { # The components' dependencies are not included, so they cannot be tested py.test --ignore tests/components # Some basic components should be tested however - py.test \ + # test_not_log_password fails because nothing is logged at all + py.test -k "not test_not_log_password" \ tests/components/{group,http} \ tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b6f8826130ff..fbafa87e622e 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180310.0"; + version = "20180404.0"; src = fetchPypi { inherit pname version; - sha256 = "5a7cca7ed461d650859df7d036ff4c579366bbcde5eb6407b1aff6a0dbbae2c2"; + sha256 = "ac36d4f5e30e93b02dadd2ecdc07218fde3d97ffc2f69a6f1acf5e601cd4e5ad"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 3aa9823dbe8b..46e7acee1782 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ setuptools ])" +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ ])" # # This script downloads https://github.com/home-assistant/home-assistant/blob/master/requirements_all.txt. # This file contains lines of the form @@ -20,9 +20,9 @@ import os import sys import json import re -from pkg_resources import Requirement, RequirementParseError -PREFIX = '# homeassistant.components.' +GENERAL_PREFIX = '# homeassistant.' +COMPONENT_PREFIX = GENERAL_PREFIX + 'components.' PKG_SET = 'python3Packages' def get_version(): @@ -37,12 +37,19 @@ def fetch_reqs(version='master'): for line in response.read().decode().splitlines(): if line == '': components = [] - elif line[:len(PREFIX)] == PREFIX: - component = line[len(PREFIX):] + elif line[:len(COMPONENT_PREFIX)] == COMPONENT_PREFIX: + component = line[len(COMPONENT_PREFIX):] components.append(component) if component not in requirements: requirements[component] = [] - elif line[0] != '#': + elif line[:len(GENERAL_PREFIX)] != GENERAL_PREFIX: # skip lines like "# homeassistant.scripts.xyz" + # Some dependencies are commented out because they don't build on all platforms + # Since they are still required for running the component, don't skip them + if line[:2] == '# ': + line = line[2:] + # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0 + # Therefore, if there's a "#" in the line, only take the part after it + line = line[line.find('#') + 1:] for component in components: requirements[component].append(line) return requirements @@ -56,9 +63,11 @@ def name_to_attr_path(req): names = [req] # E.g. python-mpd2 is actually called python3.6-mpd2 # instead of python-3.6-python-mpd2 inside Nixpkgs - if req.startswith('python-'): + if req.startswith('python-') or req.startswith('python_'): names.append(req[len('python-'):]) for name in names: + # treat "-" and "_" equally + name = re.sub('[-_]', '[-_]', name) pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I) for attr_path, package in packages.items(): if pattern.match(package['name']): @@ -78,7 +87,7 @@ for component, reqs in OrderedDict(sorted(requirements.items())).items(): attr_paths = [] for req in reqs: try: - name = Requirement.parse(req).project_name + name = req.split('==')[0] attr_path = name_to_attr_path(name) if attr_path is not None: # Add attribute path without "python3Packages." prefix diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 41e65b588e16..dd076606da5b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.29"; + version = "2.4.33"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00"; + sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 007cfc967794..0599d3affc89 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "0gviv9x4w4i8d26d8vyrr8zk4p5hdx63rxpzqw769cmhvvy8r3g2"; + sha256 = "1vi2bf2spak70qqc1c673a7pwmzq01gmli43xwhrwdw7l2ig4wj9"; }; buildInputs = [ apacheHttpd python2 ]; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 549beec674cc..19b2d01f5be8 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, libowfat, zlib, openssl }: let - version = "0.13"; + version = "0.15"; in stdenv.mkDerivation rec { name = "gatling-${version}"; src = fetchurl { - url = "http://dl.fefe.de/${name}.tar.bz2"; - sha256 = "0icjx20ws8gqxgpm77dx7p9zcwi1fv162in6igx04rmnyzyla8dl"; + url = "https://www.fefe.de/gatling/${name}.tar.xz"; + sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg"; }; buildInputs = [ libowfat zlib openssl.dev ]; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 98ca50c5bc4a..1e99aab24c60 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,19 +2,18 @@ stdenv.mkDerivation rec { name = "jetty-${version}"; - version = "9.3.10.v20160621"; - + version = "9.4.8.v20171121"; src = fetchurl { url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0xqv7bp82i95gikma70kyi91nlgsj5zabzg59ly9ga4mqf5y0zbz"; + sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mkdir -p $out - mv etc lib modules start.jar $out + mv etc lib modules start.ini start.jar $out ''; meta = { diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index ed7765b15403..aae4589ebbe8 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yaws-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://yaws.hyber.org/download/${name}.tar.gz"; - sha256 = "1ig6q4waqlb6h1hhrly7hslfnqczlbm79vvhr5j7rp5a2p1pfrns"; + sha256 = "00bnvf26xlhm3v3c6jzk5kcdk8jkwr1gbd2f4h329lyrpjsx30my"; }; # The tarball includes a symlink yaws -> yaws-1.95, which seems to be diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index b8eb21e492bc..1abe9512f589 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "oidentd-2.0.8"; + name = "oidentd-${version}"; + version = "2.2.2"; CFLAGS = [ "--std=gnu89" ]; src = fetchurl { - url = "mirror://sourceforge/ojnk/${name}.tar.gz"; - sha256 = "0vzv2086rrxcaavrm3js7aqvyc0grgaqy78x61d8s7r8hz8vwk55"; + url = "https://ftp.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; + sha256 = "1svj7ymljp4s17d7jlx6602n9081714qsj5yymmv1s9wagzjqyn9"; }; meta = { diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index a0b59d332a3f..0df055f9690f 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup, - buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +, mount, umount +, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "interlock-${version}"; @@ -23,8 +24,8 @@ buildGoPackage rec { buildFlags = [ "-tags textsecure" ]; postPatch = '' grep -lr '/s\?bin/' | xargs sed -i \ - -e 's|/bin/mount|${utillinux}/bin/mount|' \ - -e 's|/bin/umount|${utillinux}/bin/umount|' \ + -e 's|/bin/mount|${mount}/bin/mount|' \ + -e 's|/bin/umount|${umount}/bin/umount|' \ -e 's|/bin/cp|${coreutils}/bin/cp|' \ -e 's|/bin/mv|${coreutils}/bin/mv|' \ -e 's|/bin/chown|${coreutils}/bin/chown|' \ diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index c13a0ee3d89b..656f0aa02233 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "ircd-hybrid-8.2.21"; + name = "ircd-hybrid-8.2.22"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; - sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3"; + sha256 = "1i5iv5hc8gbaw74mz18zdjzv3dsvyvr8adldj8p1726h4i2xzn6p"; }; buildInputs = [ openssl zlib ]; diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index 4dd57b17fed3..bdd88db09844 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ngircd-24"; src = fetchurl { - url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz"; + url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz"; sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp"; }; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix new file mode 100644 index 000000000000..5aafe55512be --- /dev/null +++ b/pkgs/servers/isso/default.nix @@ -0,0 +1,54 @@ +{ stdenv, python2, fetchurl, fetchFromGitHub }: + +let python = python2.override { + packageOverrides = self: super: { + misaka = super.misaka.overridePythonAttrs (old: rec { + version = "1.0.2"; + src = old.src.override { + inherit version; + sha256 = "05rmjxlfhghj90m1kc55lx3z8igabw5y8wmly66p3hphdy4f95v1"; + }; + propagatedBuildInputs = [ ]; + }); + html5lib = super.html5lib.overridePythonAttrs (old: rec { + version = "0.9999999"; + src = old.src.override { + inherit version; + sha256 = "2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868"; + }; + checkInputs = with self; [ nose flake8 ]; + propagatedBuildInputs = with self; [ six ]; + checkPhase = '' + nosetests + ''; + }); + }; +}; + +in with python.pkgs; buildPythonApplication rec { + pname = "isso"; + version = "0.10.6"; + + # no tests on PyPI + src = fetchFromGitHub { + owner = "posativ"; + repo = pname; + rev = version; + sha256 = "19x9xbwd15fikhchyl4i1wrqx589hdmh279xhnxdszrq898igywb"; + }; + + propagatedBuildInputs = [ misaka werkzeug ipaddr configparser html5lib ]; + + checkInputs = [ nose ]; + + checkPhase = '' + ${python.interpreter} setup.py nosetests + ''; + + meta = with stdenv.lib; { + description = "A commenting server similar to Disqus"; + homepage = https://posativ.org/isso/; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index fc43e949269b..34d242b92a8a 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.716"; + version = "0.8.823"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0i770f4h06jf76977y3cp9l5n5csnb9wzpskndc7mgk0h02m7nrc"; + sha256 = "0hicz21dvcakqkxix70akc3rrz570j3g0a512pqrr3bdq7ay0dkk"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 0060a59d8071..c9065d041618 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.0.1"; + name = "dovecot-2.3.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb"; + sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8"; }; preConfigure = '' diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 92b404d0f653..e98c58c891a1 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.5.0.1"; + version = "0.5.1"; src = fetchurl { url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan"; + sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73"; }; buildInputs = [ dovecot openssl ]; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; maintainers = [ maintainers.rickynils ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index b386fadabd46..393ce2c5cda9 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "exim-4.90.1"; + name = "exim-4.91"; src = fetchurl { url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "09ppq8l7cah6dcqwdvpa6r12i6fdcd9lvxlfp18mggj3438xz62w"; + sha256 = "066ip7a5lqfn9rcr14j4nm0kqysw6mzvbbb0ip50lmfm0fqsqmzc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 5e87a1fb0995..6b63c317d78f 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = https://www.opensmtpd.org/; description = "Extra plugins for the OpenSMTPD mail server"; license = licenses.isc; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4c7d1649832e..3cf460539699 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,20 +26,16 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.26.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "1rm15qj743k376skjxyyfmzwajx3rb8z2inzc4309kl98jfw3cw0"; + sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3"; }; patches = [ - (fetchpatch { # Update pynacl dependency - url = "https://github.com/matrix-org/synapse/pull/2888.patch"; - sha256 = "0gr9vwv02ps17d6pzassp9xmj1qbdgxwn1z4kckx4x964zzhyn4f"; - }) ./matrix-synapse.patch ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 4668702fcee6..e326aff0d7ee 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.6"; + version = "1.5.7"; name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "00szy9d4szaixi260dcd4846zci04y0sd47ia2lzg0bxkn2ywxcn"; + sha256 = "0ijfiy1w4hk3j8hhra6kablq8kjabvcdvsl8cwd4drvszjl0ddsv"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 90bd5b614dd8..d36810b9f5c1 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.28.1"; + version = "0.28.6"; - jar = fetchurl { + src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1nv3y4pnvzd7lwyj14nmhr3k52qd8hilcjxvd7qr3hb7kzmjvbzk"; + sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq"; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,13 +14,14 @@ stdenv.mkDerivation rec { unpackPhase = "true"; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $jar" + makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" ''; meta = with stdenv.lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data."; - homepage = https://metabase.com; - license = licenses.agpl3; - maintainers = with maintainers; [ schneefux ]; + homepage = https://metabase.com; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ schneefux thoughtpolice ]; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index ea77b32a8666..786a188bbfd8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2018-02-09T22-40-05Z"; + version = "2018-03-30T00-38-44Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0qxrzmkm5hza5xbx9dkrgadwjg3hykwf79hix3s0laqyksmpj9mk"; + sha256 = "17vam9ifi632yfxakanxi2660wqgqrhrhhzywrgh2jmzljippf80"; }; goPackagePath = "github.com/minio/minio"; diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index 08c08d7d3c16..92bbc309ed3d 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -13,4 +13,5 @@ mkDerivation { executableHaskellDepends = [ base bytestring network ]; description = "accepts TCP connections and echoes the client's IP address back to it"; license = stdenv.lib.licenses.lgpl3; + broken = true; # 2018-04-10 } diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 0511c822ebe6..466c3873c600 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; + maintainers = with stdenv.lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 61ff67ed9930..d2a0d0463895 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.0.3"; + version = "5.0.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0508dvkanrfrvdnddjsaz8qm3qbgavznia5hqr8zx3qvq4789hj2"; + sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0dzb93vx72sm6iri6c96k3a15zn8mp26pd2r78m6k3nhg8rsrqmm"; + sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 98e86bf8e36f..62fc3c6f8f55 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.34"; + version = "2.0.37"; name = "munin-${version}"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "0mb5m0nc3nr9781d3s99sjdssmvkv37gxyplzr6d73i4hi31m7fr"; + sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 4989a01c9e39..deac45eadb62 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "check_ssl_cert-${version}"; - version = "1.51.0"; + version = "1.64.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05"; + sha256 = "0pq297sbz9hzcaccnnsfmra0bac81cki9xfrnb22a1hgfhqjxy5r"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 808257ca121f..a0f7341571ce 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -62,7 +62,7 @@ _EOF ''; meta = { - description = "Official monitoring plugins for Nagios/Ichinga/Sensu and others."; + description = "Official monitoring plugins for Nagios/Icinga/Sensu and others."; homepage = https://www.monitoring-plugins.org; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 86218a57284f..3287bc6f2583 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -17,7 +17,7 @@ let inherit sha256; }; - docheck = true; + doCheck = true; buildFlagsArray = let t = "${goPackagePath}/version"; in '' -ldflags= @@ -50,7 +50,7 @@ in rec { }; prometheus_2 = generic { - version = "2.1.0"; - sha256 = "01pbqfp43qrqcgyidyg2lw9jnjdrv140vnmqmm49z0vhlkxkwlvw"; + version = "2.2.1"; + sha256 = "1zwxjmj8jh02i4y3i3zrkz7ml66zyhg3ad1npjzf3319mglsp7ch"; }; } diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix index d19d595f0668..c2dea18ee815 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "c65a0412e71e8b9b3bfd22925720d23c0f054237"; - sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; + sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada"; - sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26"; + rev = "c3324c1198cf3374996e9d3098edd46a6b55afc9"; + sha256 = "19qcz5bpzj5kqyhmbq5kxr8nrqqlszazzq6w0wldis1yk1wwww00"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "89604d197083d4781071d3c65855d24ecfb0a563"; - sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn"; + rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0"; + sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "cb4147076ac75738c9a7d279075a253c0cc5acbd"; - sha256 = "0zhlrik0f9q1lj6cisgnxgbz4darbcix52hm5abi24l2ahchf5ca"; + rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349"; + sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr"; }; } { diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index e7cdfa616b46..86f43116f746 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,17 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dovecot_exporter-unstable-${version}"; - version = "2018-01-18"; - rev = "4e831356533e2321031df73ebd25dd55dbd8d385"; + name = "dovecot_exporter-${version}"; + version = "0.1.1"; goPackagePath = "github.com/kumina/dovecot_exporter"; src = fetchFromGitHub { owner = "kumina"; repo = "dovecot_exporter"; - inherit rev; - sha256 = "0iky1i7m5mlknkhlpsxpjgigssg5m02nx5y7i4biddkqilfic74n"; + rev = version; + sha256 = "0i7nfgkb5jqdbgr16i29jdsvh69dx9qgn6nazpw78k0lgy7mpidn"; }; goDeps = ./dovecot-exporter-deps.nix; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 0e2b4029e48a..bd291356b436 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.6.0"; + version = "3.7.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "0wmhfr1jlk34cimpz7gvfbi4bh8ki02acbmwdksnkal61f2dxj8q"; + sha256 = "1824rvdrs9yhjinac2vkvkxvns8bfdvy91k5ghzzk0nrdcj31pmr"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 75ba1f6a9409..9d1e62136651 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.4"; + version = "3.3.5"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0gfjmva043f9nhqjpa0qy2cdbz84z7b1c2wgcy77i3wnskicy0pc"; + sha256 = "1015fi47m0j71l6wmp7n06qk0x2h3337sjqxfyan5dnnb0himzb6"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 50b56213b308..48875b093a8d 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -10,7 +10,8 @@ let gawk which jre - ] ++ stdenv.lib.optional stdenv.isLinux procps); + procps + ]); in stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 3b875576529f..bc67e7eaf430 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala"; + sha256 = "072pk0x1iyg6kasjah8qpki2z462qp0rvgn93y6ngi6zvrpdlbyc"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 662117800219..07489b627288 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.8"; + version = "4.0.9"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1b9jqacckx4qqyz905mnclxfcpsvrwc507n6zr4r4canq6w3h37z"; + sha256 = "0465bv6yxnwmas3wzg07vmrprv2pxhnr56hn5pxrybwf66y76kyz"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index b58fc342ded7..d9919005e39d 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -1,17 +1,25 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "oauth2_proxy-${version}"; - version = "20160120-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "10f47e325b782a60b8689653fa45360dee7fbf34"; + version = "20180325-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "a94b0a8b25e553f7333f7b84aeb89d9d18ec259b"; goPackagePath = "github.com/bitly/oauth2_proxy"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/bitly/oauth2_proxy"; - sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si"; + repo = "oauth2_proxy"; + owner = "bitly"; + sha256 = "07m258s9fxjsgixggw0d1zicd7l6l2rkm5mh3zdjdaj20sqcj217"; }; goDeps = ./deps.nix; + + meta = with lib; { + description = "A reverse proxy that provides authentication with Google, Github or other provider"; + homepage = https://github.com/bitly/oauth2_proxy/; + license = licenses.mit; + maintainers = [ maintainers.yorickvp ]; + }; } diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix index 37ddbbde64e2..435c7d127821 100644 --- a/pkgs/servers/oauth2_proxy/deps.nix +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -1,20 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { - goPackagePath = "gopkg.in/fsnotify.v1"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; - sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + url = "https://code.googlesource.com/gocloud"; + rev = "d27f27d9b3cf75c9901d9981f9af50bbfd9002da"; + sha256 = "18vdhkymm4cqh5fjyz0ia0bc2mpmarjk6w6zh9ydm2d4nkj36cm5"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + url = "https://github.com/BurntSushi/toml"; + rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } { @@ -22,17 +23,26 @@ fetch = { type = "git"; url = "https://github.com/bitly/go-simplejson"; - rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; - sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + rev = "0c965951289cce37dec52ad1f34200fefc816777"; + sha256 = "0ys37wshd430dizzbg39x5mw55daih2q4qj5l9gr3qbmq9qdn0f3"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/coreos/go-oidc"; fetch = { type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + url = "https://github.com/coreos/go-oidc"; + rev = "065b426bd41667456c1a924468f507673629c46b"; + sha256 = "10xhrh70rccgydi708dc9xl4ivmjnzhh1skd1ij6xl1i3x8lk3g6"; + }; + } + { + goPackagePath = "github.com/mbland/hmacauth"; + fetch = { + type = "git"; + url = "https://github.com/mbland/hmacauth"; + rev = "44256dfd4bfa7594cfa73587a464ca890e85971a"; + sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1"; }; } { @@ -40,26 +50,35 @@ fetch = { type = "git"; url = "https://github.com/mreiferson/go-options"; - rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; - sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + rev = "77551d20752b54535462404ad9d877ebdb26e53d"; + sha256 = "02c18zrx038gbas58l90xzsz9m5q3gpjprdcwmnvxsn0zvld0vpj"; }; } { - goPackagePath = "google.golang.org/api"; + goPackagePath = "github.com/pquerna/cachecontrol"; fetch = { type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; - sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + url = "https://github.com/pquerna/cachecontrol"; + rev = "525d0eb5f91d30e3b1548de401b7ef9ea6898520"; + sha256 = "13r6qz9pghy9fapps5h9mhblggnjq2nfxysvf2jp4scanc5vw2y3"; }; } { - goPackagePath = "google.golang.org/cloud"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "6335269abf9002cf5a84613c13cda6010842b834"; - sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + url = "https://go.googlesource.com/crypto"; + rev = "88942b9c40a4c9d203b82b3731787b672d6e809b"; + sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6078986fec03a1dcc236c34816c71b0e05018fda"; + sha256 = "0qbl17mzpq7anwyzy6hdvxqk7f6q2xlm6f9dknkwlszfd4id2fwb"; }; } { @@ -67,17 +86,44 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; - sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + rev = "fdc9e635145ae97e6c2cb777c48305600cf515cb"; + sha256 = "0pznj7pb2rjar005dvppimdynarm8smj6vnqz9wvd9fxyn0q0yww"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835"; + sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "e4126357c891acdef6dcd7805daa4c6533be6544"; + sha256 = "19c874pr7vhhiyw7zn6v625g8i70gqzi3rr645kai6pnd1w7s27n"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } { - goPackagePath = "github.com/18F/hmacauth"; + goPackagePath = "gopkg.in/square/go-jose.v2"; fetch = { type = "git"; - url = "https://github.com/18F/hmacauth"; - rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd"; - sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"; + url = "https://gopkg.in/square/go-jose.v2"; + rev = "552e98edab5d620205ff1a8960bf52a5a10aad03"; + sha256 = "03w6rgxkvdv3vcfr23s6wbck431w7dwnw0jy7qnyl0qihxzn40rv"; }; } ] diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index c2ec4b9ff172..b7c85a8f9a4b 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.16.3"; + version = "5.16.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "0dmcp5s5kjnvdd7sn53sbjawfhiwjs30fr7iwi9h6ssz6188x0jp"; + sha256 = "01wghly0rqv4f9lfabmbfddjp2pclcfip45rmn0fvnj5c6x23v6v"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 6a65e8d03201..ed4a8889c67d 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -43,7 +43,11 @@ stdenv.mkDerivation rec { sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; }; - patches = [ ./caps-fix.patch ] + patches = [ ./caps-fix.patch (fetchpatch { + name = "glibc-2.27.patch"; + url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb"; + sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv"; + }) ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "padsp-fix.patch"; url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244"; diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index 30beec7b873d..28244d1b3dcd 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux }: with stdenv.lib; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ]; - buildInputs = [ makeWrapper jre ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre utillinux ]; installPhase = '' mkdir -p $out @@ -24,9 +23,7 @@ stdenv.mkDerivation rec { mv $out/bin/plugin $out/bin/elasticsearch-plugin wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" ''; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 0d27e4fefcc8..c80bbbcfde91 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }: +{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }: with stdenv.lib; @@ -8,13 +8,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0wjjvzjbdgdv9qznk1b8dx63zgs7s6jnrrbrnd5dn27lhymxiwpl"; + sha256 = "0sm99m4m4mmigj6ll22kyaw7zkp1s2i0mhzx15fzidnybdnlifb4"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; - buildInputs = [ makeWrapper jre_headless ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out @@ -24,9 +23,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 6057c2dee82c..06caf191587c 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux, getopt }: +{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }: with stdenv.lib; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "03xwd8r0l0a29wl6wrp4bh7xr1b79q2rqfmsq3d5k35pv85sw3lw"; + sha256 = "13hf00khq33yw6zv022vcrsf6vm43isx40x7ww8r1lqx3vmg3rli"; }; patches = [ ./es-home-6.x.patch ]; @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env ''; - buildInputs = [ makeWrapper jre_headless ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out @@ -27,11 +26,8 @@ stdenv.mkDerivation rec { chmod -x $out/bin/*.* wrapProgram $out/bin/elasticsearch \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ - --set JAVA_HOME "${jre_headless}" \ - --set ES_JVM_OPTIONS "$out/config/jvm.options" + --prefix PATH : "${utillinux}/bin/" \ + --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" ''; diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 16f010302902..f4780603f502 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux }: with stdenv.lib; @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home.patch ]; - buildInputs = [ makeWrapper jre ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre utillinux ]; installPhase = '' mkdir -p $out @@ -25,9 +24,7 @@ stdenv.mkDerivation rec { # set ES_CLASSPATH and JAVA_HOME wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index e3555d0076f6..063ad8c3f576 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "14il1biqpx5qs5dkmsrikw33pc8gj8scmr90y639wap87z5i3dcz"; + sha256 = "074r71dcv1l8rm6an7b8iyfpcxbk00iysmzszssknqg8mrqvsphg"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 33e2f39280ad..f9b17b947cf5 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # the build will fail without complaining about a reference to /tmp - preFixup = '' + preFixup = stdenv.lib.optionalString stdenv.isLinux '' patchelf \ --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$out/lib" \ $out/bin/shairplay diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 79f2012c7a9f..f7a9fc658352 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.1.7"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1lpfl591lhk66a5jfp86j669iswjzj503x02hg9h3211vxv3h9pa"; + sha256 = "1ip8vlyly190fhcd55am5xvqisvch8mnw50xwbm663dapdb1f8ys"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 559af3bdbef0..a952dbada66f 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -3,11 +3,11 @@ , ldns, libedit, yasm, which, lua, libopus, libsndfile }: stdenv.mkDerivation rec { - name = "freeswitch-1.6.19"; + name = "freeswitch-1.6.20"; src = fetchurl { url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "019n16yyzk9yp6h7iwsg30h62zj5vqvigr5cl8pjik4106xzcjyr"; + sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 04e6e97c54e2..e7114b957dcb 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5153"; + version = "2.0.0.5163"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1zdsba5bpi87dhsa62qbpj55wbakl6w380pijs8qxn80bvapv3xy"; + sha256 = "037rs0cb7dfiblfy02x2l4amv9dmx1wiz5pa97vpczfgk5gq99y3"; }; buildInputs = [ diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index f40a5df0f5c0..aba997d75f13 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,16 +1,17 @@ -{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf }: +{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf, ncurses6, libedit }: buildGoPackage rec { name = "cockroach-${version}"; - version = "1.1.5"; + version = "2.0.0"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0i2lg60424i1yg9dhapfsy3majnlbad2wlf93d9l161jf5lp9a2d"; + sha256 = "0x8hf5qwvgb2w6dcnvy20v77nf19f0l1pb40jf31rm72xhk3bwvy"; }; + buildInputs = [ (if stdenv.isDarwin then libedit else ncurses6) ]; nativeBuildInputs = [ cmake xz which autoconf ]; buildPhase = '' diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 25fee035cd5d..60462f83d108 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.13"; + version = "10.2.14"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0ly7dxc7rk327liya4kalgsw8irlxl0pl8gq0agdl18a63cpwbi7"; + sha256 = "0zizf3q0hdkmsn6rpwdbfm5xkj21cwpnnzq9knjfpwcadqnyqhrl"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 0c04f910e5bb..15e8569fd09e 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -60,7 +60,7 @@ self = stdenv.mkDerivation rec { install -vD $out/lib/*.a -t $static/lib rm -r $out/mysql-test rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a - ln -s libmysqlclient.so $out/lib/libmysqlclient_r.so + ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary} ''; passthru = { @@ -71,7 +71,7 @@ self = stdenv.mkDerivation rec { }; meta = { - homepage = http://www.mysql.com/; + homepage = https://www.mysql.com/; description = "The world's most popular open source database"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 7125f9ef8e96..66e62b823d9a 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { - name = "mysql-connector-java-5.1.45"; + name = "mysql-connector-java-5.1.46"; builder = ./builder.sh; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; - sha256 = "1x3dygygj15p7zk825mqr0g80wlm3rfsqgbqnb11l133rk4s1ylw"; + sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index fc6c54f82c91..e440f11b2e44 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ grahamc ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix new file mode 100644 index 000000000000..70b8abf2502d --- /dev/null +++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, protobufc }: + +stdenv.mkDerivation rec { + name = "cstore_fdw-${version}"; + version = "1.6.0"; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "cstore_fdw"; + rev = "refs/tags/v${version}"; + sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Columnar storage for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 39b574ae96d1..62ebf6b44533 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, ant, jdk }: - -let version = "9.3-1100"; in +{ stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { name = "postgresql-jdbc-${version}"; + version = "42.2.2"; - src = fetchurl { - url = "http://jdbc.postgresql.org/download/postgresql-jdbc-${version}.src.tar.gz"; - sha256 = "0mbdzhzg4ws0i7ps98rg0q5n68lsrdm2klj7y7skaix0rpa57gp6"; + src = fetchMavenArtifact { + artifactId = "postgresql"; + groupId = "org.postgresql"; + sha256 = "0w7sfi1gmzqhyhr4iq9znv8hff41xwwqcblkyd9ph0m34r0555hr"; + inherit version; }; - buildInputs = [ ant jdk ]; - - buildPhase = "ant"; + phases = [ "installPhase" ]; - installPhase = - '' - mkdir -p $out/share/java - cp jars/*.jar $out/share/java - ''; + installPhase = '' + install -D $src/share/java/*_postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar + ''; meta = with stdenv.lib; { homepage = https://jdbc.postgresql.org/; diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/pg_cron/default.nix new file mode 100644 index 000000000000..c5a7a40546ef --- /dev/null +++ b/pkgs/servers/sql/postgresql/pg_cron/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "pg_cron-${version}"; + version = "1.0.2"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "pg_cron"; + rev = "refs/tags/v${version}"; + sha256 = "0z743bbal9j0pvqskznfj0zvjsqvdl7p90d4fdrl0sc0crc3nvyx"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Run Cron jobs through PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/pg_hll/default.nix new file mode 100644 index 000000000000..6c453f6a40c3 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pg_hll/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "pg_hll-${version}"; + version = "2.10.2-${builtins.substring 0 7 src.rev}"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "postgresql-hll"; + rev = "9af41684d479a3097bab87d04936702c9e6baf5c"; + sha256 = "044x9v9kjhxb0idqb9f5i7c3yygxxsqliswl4kspqy9f9qcblckl"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "HyperLogLog for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index 0a25b314506b..50c9c68bb5f7 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { - name = "pg_repack-${version}.1"; - version = "1.4.0"; - rev = "ver_${version}.1"; + name = "pg_repack-${version}"; + version = "1.4.2"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - inherit rev; - sha256 = "1ym2dlhgcizyy4p5dcfw7kadrq6g34pv3liyfx604irprzhw9k74"; + owner = "reorg"; + repo = "pg_repack"; + rev = "refs/tags/ver_${version}"; + sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 24f0610cba3d..1f612116ae3a 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0jlaxkj33dgr2hgh0f861ja1z53kqw0g1syinl2sacsna2i9pdxy"; + sha256 = "0hx7bzxmjv0rsvv6b77gpmwhw4ajy8sgjbmrg7hj3dc51kiyiai0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index 223bd6e470b9..e1a4aed3b7e4 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ stdenv, fetchFromGitHub, cmake, postgresql }: # # To enable on NixOS: # config.services.postgresql = { @@ -8,29 +8,37 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.6.0"; + version = "0.9.1"; + nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql ]; src = fetchFromGitHub { - owner = "timescale"; - repo = "timescaledb"; - rev = version; - sha256 = "061z1ll3x7ca7fj12rl2difkdvmqykksqhpsql552qkkylg7iq4d"; + owner = "timescale"; + repo = "timescaledb"; + rev = "refs/tags/${version}"; + sha256 = "00k8fk5a1xpv9nxlmafnngk31wh80h6m72vsl1hnyq7nhby7ylic"; }; - installPhase = '' - mkdir -p $out/bin - install -D timescaledb.so -t $out/lib - install -D timescaledb.control -t $out/share/extension - cp -dpR sql/* $out/share/extension/ + # Fix the install phase which tries to install into the pgsql extension dir, + # and cannot be manually overridden. This is rather fragile but works OK. + patchPhase = '' + for x in CMakeLists.txt sql/CMakeLists.txt; do + substituteInPlace "$x" \ + --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\"" + done + + for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do + substituteInPlace "$x" \ + --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" + done ''; meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; - homepage = https://www.timescale.com/; + homepage = https://www.timescale.com/; maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; - license = licenses.postgresql; + platforms = platforms.linux; + license = licenses.postgresql; }; } diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/topn/default.nix new file mode 100644 index 000000000000..6886c80cf50d --- /dev/null +++ b/pkgs/servers/sql/postgresql/topn/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, protobufc }: + +stdenv.mkDerivation rec { + name = "pg_topn-${version}"; + version = "2.0.2"; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "postgresql-topn"; + rev = "refs/tags/v${version}"; + sha256 = "00hc3hgnqv9xaalizbcvprb7s55sydj2qgk3rhgrdlwg2g025h62"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Efficient querying of 'top values' for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.agpl3; + }; +} diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index bdc37b700e5d..a3c505646214 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,65 +1,26 @@ -{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp -, libusb1, libmicrohttpd -}: +{ stdenv, buildGoPackage, fetchFromGitHub }: -let - version = "1.2.1"; -in +buildGoPackage rec { + name = "trezord-go-${version}"; + version = "2.0.12"; -stdenv.mkDerivation rec { - name = "trezord-${version}"; + # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) + hardeningDisable = [ "fortify" ]; - src = fetchgit { - url = "https://github.com/trezor/trezord"; - rev = "refs/tags/v${version}"; - sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4"; - }; + goPackagePath = "github.com/trezor/trezord-go"; - common = fetchFromGitHub { - owner = "trezor"; - repo = "trezor-common"; - rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e"; - sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg"; + src = fetchFromGitHub { + owner = "trezor"; + repo = "trezord-go"; + rev = "v${version}"; + sha256 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6"; }; meta = with stdenv.lib; { - description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet"; + description = "TREZOR Communication Daemon aka TREZOR Bridge"; homepage = https://mytrezor.com; license = licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ]; platforms = platforms.linux; }; - - patches = [ ./dynamic-link.patch ]; - - nativeBuildInputs = [ - cmake - gcc - pkgconfig - ]; - - buildInputs = [ - curl - boost - protobuf - libusb1 - libmicrohttpd - jsoncpp - ]; - - preConfigure = '' - ( cd src/config - ln -s $common/protob/config.proto - protoc -I . --cpp_out=. config.proto - ) - ''; - - LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}"; - cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ]; - - installPhase = '' - mkdir -p $out/bin - cp trezord $out/bin - ''; } - diff --git a/pkgs/servers/trezord/dynamic-link.patch b/pkgs/servers/trezord/dynamic-link.patch deleted file mode 100644 index 0f1f448a3f79..000000000000 --- a/pkgs/servers/trezord/dynamic-link.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c0e2cf..0e3f4ac 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,13 +59,6 @@ target_link_libraries(trezord ${OS_LIBRARIES}) - find_package(CURL REQUIRED) - find_package(libmicrohttpd REQUIRED) - --# add static libs --if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -- set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") -- set(BUILD_SHARED_LIBS off) -- set(Boost_USE_STATIC_LIBS on) -- set(CMAKE_FIND_STATIC FIRST) --endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - find_package(Boost 1.53.0 REQUIRED - regex thread system unit_test_framework program_options chrono) - find_package(Protobuf 2.5.0 REQUIRED) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index a6c75439ca9c..6f584bfabd3d 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tt-rss-${version}"; - version = "2018-01-05"; - rev = "c30f5e18119d1935e8fe6d422053b127e8f4f1b3"; + version = "2018-04-05"; + rev = "963c22646b3e1bd544bd957bf34175b996bd6e53"; src = fetchurl { url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz"; - sha256 = "18pc1l0dbjr7d5grcrb70y6j7cr2zb9575yqmy6zfwzrlvw0pa0l"; + sha256 = "02vjw5cag5x0rpiqalfrqf7iz21rp8ml5wnfd8pdkxbr8182bw3h"; }; installPhase = '' diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index c5e2b45fe96d..c0a3b5a28c31 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.5"; + version = "4.2.6"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "199b0xm4lfdspmrirvzzg511yh358awciz23zmccvlvq86b548pz"; + sha256 = "0rnhk0r34mfmz3cnf735nzkkyal7pnv16hfyrs0g4v5rk99rlab3"; }; buildInputs = [ diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 1adb3a70ccf1..d0be4f575dd6 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1n9hrls3l9gf8wfz6m9bylma1b1hdvdqsksv2dlp1zdgjdzv200b"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libzip boost wt3 libconfig ]; diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/servers/web-apps/klaus/default.nix index bb953ecc03ab..81d1e57e7a04 100644 --- a/pkgs/servers/web-apps/klaus/default.nix +++ b/pkgs/servers/web-apps/klaus/default.nix @@ -35,6 +35,6 @@ python.pkgs.buildPythonApplication rec { description = "The first Git web viewer that Just Works"; homepage = https://github.com/jonashaag/klaus; license = licenses.isc; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index c99b20a46bd5..c8a918c2bd22 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # url = "https://builds.matomo.org/${name}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f"; + sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 4c4cd21cddf4..8f6722ed86ec 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "133ffxyw9bf61rky01d3rkkm34np5z4kwmgwx6ygshl83y0ylnwf"; + sha256 = "0vi59988bjxb1cyifh0fynpxa7l6cl0v57hrxima5c9iid10pw54"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 9831d7dabce1..939976b0a269 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.9.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "0x8d9425n3jrwzsyxclbxfspvi91v1klq8r3m6wcj81kys7vmzgh"; + sha256 = "1bxw74ksvfv46995iwc7jhvl78hd84lcq3h9iyxvs8gpkhkapv55"; }; patchPhase = '' for f in material/*.html do substituteInPlace $f \ - --replace '.min.css"' '.min.css#"' \ - --replace '.min.js"' '.min.js#"' \ + --replace '.min.css?v={$version_hash}"' '.min.css#"' \ + --replace '.min.js?v={$version_hash}"' '.min.js#"' \ --replace '.png"' '.png#"' done ''; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 74e2b301e70f..07faa8d3cc7e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,6 +1,6 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol +, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; @@ -848,11 +848,11 @@ let }) // {inherit libX11 xextproto xproto ;}; libXfixes = (mkDerivation "libXfixes" { - name = "libXfixes-5.0.2"; + name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2; - sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv"; + url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2; + sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 xextproto xproto ]; @@ -1364,11 +1364,11 @@ let }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; utilmacros = (mkDerivation "utilmacros" { - name = "util-macros-1.19.1"; + name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2; - sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q"; + url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2; + sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; @@ -1839,9 +1839,9 @@ let sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoark = (mkDerivation "xf86videoark" { name = "xf86-video-ark-0.7.5"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index acf234a1683e..9f21d3c2024b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#! /usr/bin/env perl # Typical command to generate the list of tarballs: @@ -11,6 +11,7 @@ use strict; +use warnings; my $tmpDir = "/tmp/xorg-unpack"; @@ -25,7 +26,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -33,7 +34,7 @@ $pcMap{"libpng"} = "libpng"; $pcMap{"dbus-1"} = "dbus"; $pcMap{"uuid"} = "libuuid"; $pcMap{"libudev"} = "udev"; -$pcMap{"gl"} = "mesa"; +$pcMap{"gl"} = "libGL"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; $pcMap{"\$DRI3PROTO"} = "dri3proto"; @@ -230,7 +231,7 @@ print OUT ""; print OUT <<EOF; # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol +, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 13fbf7b6791f..55eb54622d51 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -271,6 +271,11 @@ in }; libxshmfence = attrs: attrs // { + name = "libxshmfence-1.3"; + src = args.fetchurl { + url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; + }; outputs = [ "out" "dev" ]; # mainly to avoid propagation }; @@ -400,7 +405,7 @@ in }; xdriinfo = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [args.mesa]; + buildInputs = attrs.buildInputs ++ [args.libGL]; }; xvinfo = attrs: attrs // { @@ -460,7 +465,7 @@ in version = (builtins.parseDrvName attrs.name).version; commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ - args.zlib args.mesa args.dbus + args.zlib args.libGL args.mesa_noglu args.dbus xf86bigfontproto glproto xf86driproto compositeproto scrnsaverproto resourceproto xf86dgaproto @@ -489,7 +494,7 @@ in if (!isDarwin) then { outputs = [ "out" "dev" ]; - buildInputs = [ makeWrapper ] ++ commonBuildInputs; + buildInputs = [ makeWrapper args.libdrm ] ++ commonBuildInputs; propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ args.udev ]; @@ -510,8 +515,6 @@ in ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it - wrapProgram $out/bin/Xvfb \ - --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others cd "$dev" for f in include/xorg/*.h; do diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index f46b3189edfe..7ef6242d2b25 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkgconfig, udns, pandoc, procps } : + libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : stdenv.mkDerivation rec { name = "biboumi-${version}"; @@ -20,12 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig pandoc ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd - udns procps ]; + udns ]; - inherit procps; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - substituteInPlace unit/biboumi.service.cmake --replace /bin/kill $procps/bin/kill + substituteInPlace unit/biboumi.service.cmake --replace /bin/kill ${coreutils}/bin/kill cp $louiz_catch/single_include/catch.hpp tests/ # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg # TODO include conf/biboumi.cfg as example somewhere diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index cd27f69e5f4b..f95b5efe3d38 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,5 +1,6 @@ { stdenv, writeScriptBin, lib, fetchurl, git, cacert , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd +, flock , withMysql ? false , withPgsql ? false , withSqlite ? false, sqlite @@ -101,7 +102,7 @@ in stdenv.mkDerivation rec { postInstall = '' sed -i \ -e '2iexport PATH=${ctlpath}:$PATH' \ - -e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \ + -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \ -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index b5f600da8f7e..b5f600da8f7e 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index c8582366d1a3..739dbd538a6e 100644 --- a/pkgs/shells/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.4"; + version = "0.6.5"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "1kdysrfc8dx24q438wj3aisn64g2w5yb6mx91qa385p5hz7b1yz2"; + sha256 = "10f70jw81vky52s3fidf7vzl725fihiypsw39825wnkpynayhmrg"; }; # To enable lazy loading via. bash-completion we need a symlink to the script diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix index 445e961c6499..445e961c6499 100644 --- a/pkgs/shells/fish-foreign-env/default.nix +++ b/pkgs/shells/fish/fish-foreign-env/default.nix diff --git a/pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch index 5e4569f0a15c..5e4569f0a15c 100644 --- a/pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch +++ b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch diff --git a/pkgs/shells/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index cf22207ef09c..cf22207ef09c 100644 --- a/pkgs/shells/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 43b766fdaf2e..3259dbbd9bc6 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre }: let - version = "5.4.2"; + version = "5.5.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "1703g6vfz2vpb866wgl71nvg0ynjq0zvrjwkqbv7v6q3606jbmn3"; + sha256 = "0bm9n7lycdzvw5hmgi4a920pqbb5yxvmyhfxx8jbign2hzgf7g01"; }; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm"; + sha256 = "10705qnnr3p416bwfjaip9r7yw187vczzjrk60yg79dfwy4slk3p"; }; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index d49e13e1eb35..e516393a23ca 100644 --- a/pkgs/shells/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,17 +5,17 @@ with lib; stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm"; + sha256 = "1akx6lwxnbcccddzw41rci8rb9n5vb6q2vpn5qr07f0grchyiifk"; }; - buildInputs = [ zsh coreutils txt2tags ] - ++ optional stdenv.isLinux [ inetutils procps ]; + buildInputs = [ zsh coreutils txt2tags procps ] + ++ optional stdenv.isLinux [ inetutils ]; buildPhase = '' cd doc diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 6dea51a487e9..6dea51a487e9 100644 --- a/pkgs/shells/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 2bcff6b809dc..2bcff6b809dc 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8cfcb9ecbbea..5412f4ce8967 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-01-22"; + version = "2018-04-06"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "37c2d0ddd751e15d0c87a51e2d9f9849093571dc"; - sha256 = "0x2r7205ps5v5bl1f9vdnry9gxflypaahz49cnhq5f5klb49bakn"; + rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f"; + sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 906301110e96..906301110e96 100644 --- a/pkgs/shells/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix diff --git a/pkgs/shells/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 453a57744071..453a57744071 100644 --- a/pkgs/shells/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 92a9d293e84f..92a9d293e84f 100644 --- a/pkgs/shells/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix index 735d6a2b7619..735d6a2b7619 100644 --- a/pkgs/shells/zsh-deer/default.nix +++ b/pkgs/shells/zsh/zsh-deer/default.nix diff --git a/pkgs/shells/zsh-deer/realpath.patch b/pkgs/shells/zsh/zsh-deer/realpath.patch index 03850d7e5c12..03850d7e5c12 100644 --- a/pkgs/shells/zsh-deer/realpath.patch +++ b/pkgs/shells/zsh/zsh-deer/realpath.patch diff --git a/pkgs/shells/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 7318da83d176..7318da83d176 100644 --- a/pkgs/shells/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix diff --git a/pkgs/shells/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 2babf35f2b68..2babf35f2b68 100644 --- a/pkgs/shells/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 7bef904081e0..7bef904081e0 100644 --- a/pkgs/shells/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index b7b44098fd7a..b7b44098fd7a 100644 --- a/pkgs/shells/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 6e3065718532..973be9831861 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -39,8 +39,8 @@ in lib.init bootStages ++ [ buildPlatform = localSystem; hostPlatform = crossSystem; targetPlatform = crossSystem; - cc = if crossSystem.useiOSCross or false - then buildPackages.darwin.ios-cross + cc = if crossSystem.useiOSPrebuilt or false + then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh index 77adc52d53b6..4c8f8ebd7eb2 100644 --- a/pkgs/stdenv/cygwin/rebase-x86_64.sh +++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh @@ -8,7 +8,7 @@ _cygwinFixAutoImageBase() { if [ -f /etc/rebasenix.nextbase ]; then NEXTBASE="$(</etc/rebasenix.nextbase)" fi - NEXTBASE=${NEXTBASE:-0x200000000} + NEXTBASE=${NEXTBASE:-0x200000001} REBASE=(`/bin/rebase -i $DLL`) BASE=${REBASE[2]} diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index dfa190ee984e..9563f52ea263 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -321,11 +321,11 @@ in rec { darwin = super.darwin // { inherit (darwin) dyld ICU Libsystem libiconv; } // lib.optionalAttrs (super.targetPlatform == localSystem) { - inherit (darwin) cctools; + inherit (darwin) binutils cctools; }; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. - inherit binutils binutils-raw; + inherit binutils binutils-unwrapped; }; in import ../generic rec { name = "stdenv-darwin"; @@ -380,7 +380,7 @@ in rec { bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext - binutils-raw.bintools binutils binutils.bintools + binutils.bintools darwin.binutils darwin.binutils.bintools cc.expand-response-params ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools ICU libiconv locale diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 113b95f3ab00..1350e7d37301 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -8,7 +8,8 @@ let # for why this defaults to false, but I (@copumpkin) want to default it to true soon. shouldCheckMeta = config.checkMeta or false; - allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; + allowUnfree = config.allowUnfree or false + || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; whitelist = config.whitelistedLicenses or []; blacklist = config.blacklistedLicenses or []; @@ -35,9 +36,11 @@ let hasBlacklistedLicense = assert areLicenseListsValid; attrs: hasLicense attrs && builtins.elem attrs.meta.license blacklist; - allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + allowBroken = config.allowBroken or false + || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; - allowUnsupportedSystem = config.allowUnsupportedSystem or false; + allowUnsupportedSystem = config.allowUnsupportedSystem or false + || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; isUnfree = licenses: lib.lists.any (l: !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; @@ -75,6 +78,7 @@ let remediation = { unfree = remediate_whitelist "Unfree"; broken = remediate_whitelist "Broken"; + unsupported = remediate_whitelist "UnsupportedSystem"; blacklisted = x: ""; insecure = remediate_insecure; unknown-meta = x: ""; @@ -144,7 +148,7 @@ let license = either (listOf lib.types.attrs) (either lib.types.attrs str); maintainers = listOf (attrsOf str); priority = int; - platforms = listOf (either str lib.systems.parsed.types.system); + platforms = listOf (either str lib.systems.parsedPlatform.types.system); hydraPlatforms = listOf str; broken = bool; @@ -165,6 +169,7 @@ let isFcitxEngine = bool; isIbusEngine = bool; isGutenprint = bool; + badPlatforms = platforms; }; checkMetaAttr = k: v: @@ -173,8 +178,10 @@ let else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; - checkPlatform = attrs: - lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms; + checkPlatform = attrs: let + anyMatch = lib.any (lib.meta.platformMatch hostPlatform); + in anyMatch (attrs.meta.platforms or lib.platforms.all) && + ! anyMatch (attrs.meta.badPlatforms or []); # Check if a derivation is valid, that is whether it passes checks for # e.g brokenness or license. @@ -189,8 +196,8 @@ let { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !(checkPlatform attrs) then - { valid = false; reason = "broken"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } + else if !allowUnsupportedSystem && !(checkPlatform attrs) then + { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } else let res = checkMeta (attrs.meta or {}); in if res != [] then diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d61675aed927..2eb55ae439b5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -374,7 +374,7 @@ in ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. - inherit (prevStage) binutils binutils-raw; + inherit (prevStage) binutils binutils-unwrapped; gcc = cc; }; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 19efac3700a6..78f7a82d2952 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -119,14 +119,23 @@ in }; stdenvNoCC = stdenv; - cc = import ../../build-support/cc-wrapper { - name = "cc-native"; - nativeTools = true; - nativeLibc = true; + cc = let nativePrefix = { # switch "i686-solaris" = "/usr/gnu"; "x86_64-solaris" = "/opt/local/gcc47"; }.${system} or "/usr"; + in + import ../../build-support/cc-wrapper { + name = "cc-native"; + nativeTools = true; + nativeLibc = true; + inherit nativePrefix; + bintools = import ../../build-support/bintools-wrapper { + name = "bintools"; + inherit stdenvNoCC nativePrefix; + nativeTools = true; + nativeLibc = true; + }; inherit stdenvNoCC; }; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 7868c2726ece..8ad1b6f6455e 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -39,7 +39,7 @@ let primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; - primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); + primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686); nvidia_x11s = [ nvidia_x11 ] ++ lib.optional nvidia_x11.useGLVND libglvnd @@ -49,7 +49,6 @@ let nvidiaLibs = lib.makeLibraryPath nvidia_x11s; bbdPath = lib.makeBinPath [ kmod xorgserver ]; - bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); @@ -133,8 +132,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --prefix PATH : "${bbdPath}" \ - --prefix LD_LIBRARY_PATH : "${bbdLibs}" + --prefix PATH : "${bbdPath}" wrapProgram "$out/bin/optirun" \ --prefix PATH : "${virtualgl}/bin" diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index dcd50ee9158c..5c4c65bc17a2 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, libX11, libGL +, libX11, libGL, mesa_noglu , nvidia_x11 ? null , libglvnd }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { makeFlags = [ "LIBDIR=$(out)/lib" "PRIMUS_libGLa=${aPackage}/lib/libGL.so" "PRIMUS_libGLd=${libGL}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${libGL}/lib/libglapi.so" + "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" ]; installPhase = '' diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 10b0dfff9bf8..2b58dd6c9115 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "sselp-${version}"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; }; diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 93bbe1ce0bc5..50d0ac4f2b9a 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -1,13 +1,13 @@ { stdenv, xorg, fetchFromGitHub }: stdenv.mkDerivation rec { name = "xpointerbarrier-${version}"; - version = "17.10"; + version = "17.11"; src = fetchFromGitHub { owner = "vain"; repo = "xpointerbarrier"; rev = "v${version}"; - sha256 = "0p4qc7ggndf74d2xdf38659prx3r3lfi5jc8nmqx52c9fqdshcrk"; + sha256 = "0s6bd58xjyc2nqzjq6aglx6z64x9xavda3i6p8vrmxqmcpik54nm"; }; buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 805e5c03816c..b931f270dee2 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0v8yflvisk94bfj0zg4ggdfwrig0f3ss9kjnws3zflsr33cb2hxy"; + sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 629c10f867fa..7e620e0c2c81 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { name = "xpra-${version}"; - version = "2.1.3"; + version = "2.2.5"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"; + sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; }; patchPhase = '' diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index e36808db0b8c..b6b87fffb47b 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, gtk2, cmake, pkgconfig }: +{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ gtk2 ]; + buildInputs = [ gtk2 libXdamage ]; meta = { inherit version; diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix new file mode 100644 index 000000000000..00d8bdd3ef4c --- /dev/null +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute }: +stdenv.mkDerivation rec { + name = "acme.sh-${version}"; + version = "2.7.8"; + + src = fetchFromGitHub { + owner = "Neilpang"; + repo = "acme.sh"; + rev = version; + sha256 = "0zm64z7av63xi7yjhljab2i8q1vx4q1mpcmcm58jm6k4babalxrf"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out $out/bin $out/libexec + cp -R $src/* $_ + makeWrapper $out/libexec/acme.sh $out/bin/acme.sh \ + --prefix PATH : "${lib.makeBinPath [ socat openssl curl iproute ]}" + ''; + + meta = with stdenv.lib; { + description = "A pure Unix shell script implementing ACME client protocol"; + homepage = https://acme.sh/; + license = licenses.gpl3; + maintainers = [ maintainers.yorickvp ]; + }; +} diff --git a/pkgs/tools/admin/ansible/2.5.nix b/pkgs/tools/admin/ansible/2.5.nix new file mode 100644 index 000000000000..32d83861cd8c --- /dev/null +++ b/pkgs/tools/admin/ansible/2.5.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchurl +, pythonPackages +, windowsSupport ? false +}: + +pythonPackages.buildPythonPackage rec { + pname = "ansible"; + version = "2.5.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "06h0cmz0cgj1xszzn6rsypfc8lkazgh5g1yxyss1yx242d0wkw2i"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = false; + + propagatedBuildInputs = with pythonPackages; [ + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython + ] ++ stdenv.lib.optional windowsSupport pywinrm; + + meta = with stdenv.lib; { + homepage = http://www.ansible.com; + description = "A simple automation tool"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ + jgeerds + joamaki + ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index 6eee98269481..c319c47ea7e4 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-shell"; - version = "0.1.1"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; + sha256 = "b46a673b81254e5e014297e08c9ecab535773aa651ca33dc3786a1fd612f9810"; }; # Why does it propagate packages that are used for testing? diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 4ccdbc204f0a..a5e0186fa2dc 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bubblewrap-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "0ahw30ngpclk3ssa81cb7ydc6a4xc5dpqn6kmxfpc9xr30vimdnc"; + sha256 = "1qhzwgpfsw66hcv5kqc7i4dbzhxr8drrqn3md4grcp7dn02wif2l"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index bf2b4ac6799d..3106552a6610 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { name = "certbot-${version}"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; - sha256 = "08x80x9d71j84mwjm5wzd0x5gcw6gwyvkvadi2js39js6hfnc6jg"; + sha256 = "0dv9d1byppnvx54rhi2w3gqjk01444m5hbr9553n9gin4ribviii"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index a578bb4bca27..9cb80eb131c0 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) + CFPropertyList (3.0.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) atomos (0.1.2) @@ -9,14 +9,15 @@ GEM claide (1.0.2) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.5) + commander-fastlane (4.4.6) highline (~> 1.7.2) declarative (0.0.10) declarative-option (0.1.0) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - dotenv (2.2.1) - excon (0.60.0) + dotenv (2.2.2) + emoji_regex (0.1.1) + excon (0.62.0) faraday (0.14.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -25,20 +26,21 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.1) - fastlane (2.80.0) + fastlane (2.91.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 2.0.0) colored - commander-fastlane (>= 4.4.5, < 5.0.0) + commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (~> 0.1) excon (>= 0.45.0, < 1.0.0) faraday (~> 0.9) faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 0.9) fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.0.1, < 2.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) google-api-client (>= 0.13.1, < 0.14.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) @@ -50,16 +52,17 @@ GEM public_suffix (~> 2.0.0) rubyzip (>= 1.1.0, < 2.0.0) security (= 0.1.3) + simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 1.6.2, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.5.2, < 2.0.0) + xcodeproj (>= 1.5.7, < 2.0.0) xcpretty (>= 0.2.4, < 1.0.0) xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.1.1) + gh_inspector (1.1.3) google-api-client (0.13.6) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.5) @@ -93,7 +96,8 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nanaimo (0.2.3) + nanaimo (0.2.5) + naturally (2.1.0) os (0.9.6) plist (3.4.0) public_suffix (2.0.5) @@ -110,6 +114,9 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) + simctl (1.6.3) + CFPropertyList + naturally slack-notifier (2.3.2) terminal-notifier (1.8.0) terminal-table (1.8.0) @@ -121,15 +128,15 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.5) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.6) - CFPropertyList (~> 2.3.3) + xcodeproj (1.5.7) + CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.2) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.3) + nanaimo (~> 0.2.4) xcpretty (0.2.8) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index c9ddb7b77c04..4a0d0467d804 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -27,10 +27,10 @@ CFPropertyList = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; + sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; type = "gem"; }; - version = "2.3.6"; + version = "3.0.0"; }; claide = { source = { @@ -60,10 +60,10 @@ dependencies = ["highline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04gpg733wv878acvrzp4kc3k934v10l3v8bcz3fjq5imjsrjdnbp"; + sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; type = "gem"; }; - version = "4.4.5"; + version = "4.4.6"; }; declarative = { source = { @@ -93,18 +93,26 @@ dotenv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + sha256 = "1f9s04xwa9gcsql734nwxvacgsl1si7xka4g4w3r6d3ab8a274y9"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; + }; + emoji_regex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pcw3axgcmsgihp0xlsdqrqmavz0lw8g396b048fg21033kssxjn"; + type = "gem"; + }; + version = "0.1.1"; }; excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc"; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; type = "gem"; }; - version = "0.60.0"; + version = "0.62.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -142,21 +150,21 @@ version = "2.1.1"; }; fastlane = { - dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0saas50qdfipkms66snyg7imvzn1vfngd87dfygj9x8v18bqwvis"; + sha256 = "04k6pn95qbpvbmqxrs4pngvfyk4pifcv8is3819b33p754pkiqrp"; type = "gem"; }; - version = "2.80.0"; + version = "2.91.0"; }; gh_inspector = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mpfl279k8yff2ia601b37zw31blwh2plkr501iz6qj8drx3mq3c"; + sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.3"; }; google-api-client = { dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; @@ -294,10 +302,18 @@ nanaimo = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi"; type = "gem"; }; - version = "0.2.3"; + version = "0.2.5"; + }; + naturally = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0avn8b2qbfm22afln2p7rky73zns8c444mdhdh4ki8hbjsn0f8cx"; + type = "gem"; + }; + version = "2.1.0"; }; os = { source = { @@ -373,6 +389,15 @@ }; version = "0.8.1"; }; + simctl = { + dependencies = ["CFPropertyList" "naturally"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l1hwxkbpgfhla6dbf0f6nhj794c0k6ilxlh07zcm8by3vdrsvib"; + type = "gem"; + }; + version = "1.6.3"; + }; slack-notifier = { source = { remotes = ["https://rubygems.org"]; @@ -443,10 +468,10 @@ unf_ext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.5"; }; unicode-display_width = { source = { @@ -468,10 +493,10 @@ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zqx24qhax7p91rs1114da0v86cy9m7an1bjwxq6dyccp8g6kb50"; + sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz"; type = "gem"; }; - version = "1.5.6"; + version = "1.5.7"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix new file mode 100644 index 000000000000..cfe336a7e830 --- /dev/null +++ b/pkgs/tools/admin/iamy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "iamy-${version}"; + version = "2.1.1"; + + goPackagePath = "github.com/99designs/iamy"; + + src = fetchFromGitHub { + owner = "99designs"; + repo = "iamy"; + rev = "v${version}"; + sha256 = "0b55hxcvgil8rl6zh2kyndfi7s5nzclawjb0sby14wpys3v08bjf"; + }; + + meta = with stdenv.lib; { + description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; + homepage = https://github.com/99designs/iamy; + license = licenses.mit; + maintainers = with maintainers; [ suvash ]; + }; +} diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 64ec5e9b418e..cfbb90fdc308 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,23 +1,37 @@ -{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables +}: buildGoPackage rec { - name = "lxd-${version}"; - version = "2.16"; - rev = "lxd-${version}"; + name = "lxd-3.0.0"; goPackagePath = "github.com/lxc/lxd"; - src = fetchFromGitHub { - inherit rev; - owner = "lxc"; - repo = "lxd"; - sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn"; + src = fetchurl { + url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; + sha256 = "0m5prdf9sk8k5bws1zva4n9ycggmy76wnjr6wb423066pszz24ww"; }; - goDeps = ./deps.nix; + preBuild = '' + # unpack vendor + pushd go/src/github.com/lxc/lxd + rm dist/src/github.com/lxc/lxd + cp -r dist/src/* ../../.. + rm -r dist + popd + ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lxc ]; + postInstall = '' + # binaries from test/ + rm $bin/bin/{deps,macaroon-identity} + + wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables + ]} + ''; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ lxc acl ]; meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix deleted file mode 100644 index e0f591a23d1e..000000000000 --- a/pkgs/tools/admin/lxd/deps.nix +++ /dev/null @@ -1,165 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/dustinkirkland/golang-petname"; - fetch = { - type = "git"; - url = "https://github.com/dustinkirkland/golang-petname"; - rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14"; - sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef"; - sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "599cba5e7b6137d46ddf58fb1765f5d928e69604"; - sha256 = "0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; - sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "ded68f7a9561c023e790de24279db7ebf473ea80"; - sha256 = "0q019h59jq815jfl9rgk4yrpkn5rpcx9s6dksdm48rp1abafwvfc"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "cf7286f069c3ef596efcc87781a4653a2e7607bd"; - sha256 = "19ipf6bf1xd7w2fm8dnv5my4jp3lhwhlrhfwhwq559amp1h4nwyq"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "1b00554d822231195d1babd97ff4a781231955c9"; - sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan"; - }; - } - { - goPackagePath = "github.com/syndtr/gocapability"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/gocapability"; - rev = "e7cb7fa329f456b3855136a2642b197bad7366ba"; - sha256 = "1i65kyjhbaya45zj9zqkb17plbqf92sfvl9fcz9s9qslg0qab2i1"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "3543873453996aaab2fc6b3928a35fc5ca2b5afb"; - sha256 = "1d7pjqzh5893mzkz60bv5ypmr9zgyvb9z2gvcjrsqniwcqlhbk2c"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344"; - sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv"; - }; - } - { - goPackagePath = "gopkg.in/flosch/pongo2.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/flosch/pongo2.v3"; - rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; - sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; - }; - } - { - goPackagePath = "gopkg.in/inconshreveable/log15.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/inconshreveable/log15.v2"; - rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; - sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; - }; - } - { - goPackagePath = "gopkg.in/lxc/go-lxc.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/lxc/go-lxc.v2"; - rev = "8304875cc3423823032ec93556beee076c6ba687"; - sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v2"; - rev = "d5d1b5820637886def9eef33e03a27a9f166942c"; - sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; - }; - } - { - goPackagePath = "github.com/gosexy/gettext"; - fetch = { - type = "git"; - url = "https://github.com/gosexy/gettext"; - rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; - sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb"; - sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; - sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; - }; - } -] diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 608a9e5a65b0..c39c378d2216 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, autoreconfHook, libxcomp }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxcomp }: stdenv.mkDerivation rec { name = "nxproxy-${version}"; - version = "3.5.0.33"; + version = "3.5.99.16"; src = fetchurl { - sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74"; + sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libxcomp ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; preAutoreconf = '' cd nxproxy/ + sed -i 's|-L\$(top_srcdir)/../nxcomp/src/.libs ||' src/Makefile.am ''; makeFlags = [ "exec_prefix=$(out)" ]; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index b50564602256..4077c4fb9ecb 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,19 +8,18 @@ python2Packages.buildPythonApplication rec { pname = "salt"; - version = "2017.7.2"; - name = "${pname}-${version}"; + version = "2017.7.4"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz"; + sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx"; }; propagatedBuildInputs = with python2Packages; [ futures jinja2 markupsafe - msgpack + msgpack-python pycrypto pyyaml pyzmq diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 0f6814d53c99..546e9a7aad98 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}: +{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python +, boost, lzma +, withGog ? false, unar ? null }: stdenv.mkDerivation rec { name = "innoextract-1.6"; @@ -8,14 +10,23 @@ stdenv.mkDerivation rec { sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6"; }; - buildInputs = [ python doxygen lzma boost ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ python lzma boost ]; + + nativeBuildInputs = [ cmake makeWrapper ]; + + enableParallelBuilding = true; + + # we need unar to for multi-archive extraction + postFixup = stdenv.lib.optionalString withGog '' + wrapProgram $out/bin/innoextract \ + --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]} + ''; meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; homepage = http://constexpr.org/innoextract/; - platforms = platforms.linux; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 520742a1b3c7..1104548f77f8 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let pname = "unar"; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; version = "1.10.1"; src = fetchurl { @@ -10,23 +12,20 @@ stdenv.mkDerivation rec { sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0"; }; - buildInputs = [ - gnustep.make unzip gnustep.base bzip2.dev - zlib.dev icu.dev openssl.dev - ]; + buildInputs = [ gnustep.base bzip2 icu openssl zlib ]; + + nativeBuildInputs = [ gnustep.make unzip ]; + + enableParallelBuilding = true; postPatch = '' - substituteInPlace Makefile.linux \ - --replace "CC = gcc" "CC=cc" \ - --replace "CXX = g++" "CXX=c++" \ - --replace "OBJCC = gcc" "OBJCC=cc" \ - --replace "OBJCXX = g++" "OBJCXX=c++" - - substituteInPlace ../UniversalDetector/Makefile.linux \ - --replace "CC = gcc" "CC=cc" \ - --replace "CXX = g++" "CXX=c++" \ - --replace "OBJCC = gcc" "OBJCC=c" \ - --replace "OBJCXX = g++" "OBJCXX=c++" + for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do + substituteInPlace $f \ + --replace "CC = gcc" "CC=cc" \ + --replace "CXX = g++" "CXX=c++" \ + --replace "OBJCC = gcc" "OBJCC=cc" \ + --replace "OBJCXX = g++" "OBJCXX=c++" + done ''; makefile = "Makefile.linux"; @@ -34,17 +33,16 @@ stdenv.mkDerivation rec { sourceRoot = "./The Unarchiver/XADMaster"; installPhase = '' - mkdir -p $out/bin - cp lsar $out/bin - cp unar $out/bin + runHook preInstall - mkdir -p $out/share/man/man1 - cp ../Extra/lsar.1 $out/share/man/man1 - cp ../Extra/unar.1 $out/share/man/man1 + install -Dm755 -t $out/bin lsar unar + install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1 mkdir -p $out/etc/bash_completion.d cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar + + runHook postInstall ''; meta = with stdenv.lib; { @@ -55,7 +53,7 @@ stdenv.mkDerivation rec { zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, \ and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, \ Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ - ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. + ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; license = with licenses; [ lgpl21Plus ]; platforms = with platforms; linux; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 7af507c35bec..dc5a010ec741 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.03.08"; + version = "2018.04.18"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0pdia3n23l4nhc4lmyphgh6swq35nnzqk2z4ykif1xajbkbddxm3"; + sha256 = "0kbval5ckan8vvrlpyz1mkb1ifvr149gxpb7ljbcm890p8hpaxff"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index e98667b8c04a..23a33122c9fb 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -15,16 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ sqlite glib curl ]; - configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out - ''; - meta = with stdenv.lib; { license = licenses.lgpl3; description = "A music related metadata searchengine"; homepage = https://github.com/sahib/glyr; maintainers = [ maintainers.sternenseemann ]; - platforms = platforms.linux; # TODO macOS would be possible + platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4f0d24a27d90..43f45a1783f5 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }: +{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: python3Packages.buildPythonApplication rec { - name = "borgbackup-${version}"; - version = "1.1.4"; - namePrefix = ""; - - src = fetchurl { - url = "https://github.com/borgbackup/borg/releases/download/" - + "${version}/${name}.tar.gz"; - sha256 = "1cicqwh85wfp65y00qaq6q4i4jcyy9b66qz5gpl80qc880wab912"; + pname = "borgbackup"; + version = "1.1.5"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "4356e6c712871f389e3cb1d6382e341ea635f9e5c65de1cd8fcd103d0fb66d3d"; }; + postPatch = '' + # loosen constraint on msgpack version, only 0.5.0 had problems + sed -i "s/'msgpack-python.*'/'msgpack-python'/g" setup.py + ''; + nativeBuildInputs = with python3Packages; [ # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - lz4 openssl python3Packages.setuptools_scm + libb2 lz4 zstd openssl python3Packages.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ cython msgpack-python @@ -25,6 +28,8 @@ python3Packages.buildPythonApplication rec { preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4.dev}" + export BORG_LIBB2_PREFIX="${libb2}" + export BORG_LIBZSTD_PREFIX="${zstd}" ''; makeWrapperArgs = [ diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 24065f7308b7..c079d8272b12 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.1.30"; + version = "2.1.32"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "0l9zcw50zr081ddspl6vnh6d6cwyzgqzg7n5pq92dwbmd64qpz9p"; + sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index b04a1dab40f5..2e86ad0deda8 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv }: +{ buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }: buildGoPackage rec { @@ -16,6 +16,12 @@ buildGoPackage rec { goPackagePath = "github.com/dop251/diskrsync"; goDeps = ./deps.nix; + buildInputs = [ makeWrapper ]; + + preFixup = '' + wrapProgram "$bin/bin/diskrsync" --prefix PATH : ${openssh}/bin + ''; + meta = with stdenv.lib; { description = "Rsync for block devices and disk images"; homepage = https://github.com/dop251/diskrsync; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix new file mode 100644 index 000000000000..d36ef7ea64fb --- /dev/null +++ b/pkgs/tools/backup/duplicati/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, mono, sqlite, makeWrapper }: + +stdenv.mkDerivation rec { + name = "duplicati-${version}"; + version = "2.0.3.3"; + channel = "beta"; + build_date = "2018-04-02"; + + src = fetchzip { + url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; + sha256 = "0hwdpsgrvm3gq648mg9g0z0rk49g71dd8r5i1a8w83pwdqv0hn9c"; + stripRoot = false; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/${name}} + cp -r * $out/share/${name} + makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ + --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + sqlite ]} + makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ + --add-flags "$out/share/${name}/Duplicati.Server.exe" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + sqlite ]} + ''; + + meta = with stdenv.lib; { + description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; + homepage = https://www.duplicati.com/; + license = licenses.lgpl21; + maintainers = with maintainers; [ nyanloutre ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/tools/backup/lvmsync/Gemfile new file mode 100644 index 000000000000..a87462e2b8a2 --- /dev/null +++ b/pkgs/tools/backup/lvmsync/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org/' +gem 'lvmsync' diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/tools/backup/lvmsync/Gemfile.lock new file mode 100644 index 000000000000..1fe903f15088 --- /dev/null +++ b/pkgs/tools/backup/lvmsync/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + git-version-bump (0.15.1) + lvmsync (3.3.2) + git-version-bump (~> 0.10) + treetop + polyglot (0.3.5) + treetop (1.6.9) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + lvmsync + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix new file mode 100644 index 000000000000..dc589316a585 --- /dev/null +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -0,0 +1,37 @@ +{ stdenv, bundlerEnv, ruby, makeWrapper }: + +let + + pname = "lvmsync"; + version = (import ./gemset.nix)."${pname}".version; + +in stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + env = bundlerEnv { + name = "${pname}-${version}-gems"; + ruby = ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + buildInputs = [ makeWrapper ]; + + phases = ["installPhase"]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync + ''; + + meta = with stdenv.lib; { + description = "Optimised synchronisation of LVM snapshots over a network"; + homepage = http://theshed.hezmatt.org/lvmsync/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/tools/backup/lvmsync/gemset.nix new file mode 100644 index 000000000000..7f80e928660b --- /dev/null +++ b/pkgs/tools/backup/lvmsync/gemset.nix @@ -0,0 +1,36 @@ +{ + git-version-bump = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xcj20gmbpqn2gcpid4pxpnimfdg2ip9jnl1572naz0magcrwl2s"; + type = "gem"; + }; + version = "0.15.1"; + }; + lvmsync = { + dependencies = ["git-version-bump" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02mdrvfibvab4p4yrdzxvndhy8drss3ri7izybcwgpbyc7isk8mv"; + type = "gem"; + }; + version = "3.3.2"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd"; + type = "gem"; + }; + version = "1.6.9"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index bc1f584f1c02..46f213a6ef4c 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/mtx/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index d95716864c88..279652b0cd0b 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://ori.scs.stanford.edu/; license = licenses.mit; platforms = platforms.unix; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 681999e35d07..758146fcc00b 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, libuuid, e2fsprogs +, pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g }: stdenv.mkDerivation rec { @@ -15,10 +15,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - e2fsprogs libuuid stdenv.cc.libc + e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g (stdenv.lib.getOutput "static" stdenv.cc.libc) ]; + configureFlags = [ + "--enable-xfs" + "--enable-extfs" + "--enable-hfsp" + "--enable-fat" + "--enable-exfat" + "--enable-ntfs" + "--enable-btrfs" + "--enable-minix" + "--enable-f2fs" + "--enable-nilfs2" + ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix new file mode 100644 index 000000000000..d9f889897aa2 --- /dev/null +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -0,0 +1,32 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "restic-rest-server-${version}"; + version = "0.9.7"; + + goPackagePath = "github.com/restic/rest-server"; + + src = fetchFromGitHub { + owner = "restic"; + repo = "rest-server"; + rev = "v${version}"; + sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj"; + }; + + buildPhase = '' + cd go/src/${goPackagePath} + go run build.go + ''; + + installPhase = '' + install -Dt $bin/bin rest-server + ''; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A high performance HTTP server that implements restic's REST backend API"; + platforms = platforms.unix; + license = licenses.bsd2; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index da39b2360bd6..3210e777889e 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -1,11 +1,20 @@ -{ stdenv, buildGoPackage, fetchurl }: +{ stdenv, buildGoPackage, fetchFromGitHub }: + +let + rev = "966f3c5f45ba18b2225c5b06918e41f56e223e73"; + revCount = "240"; + sha256 = "1m70a5rpycrfwrrc83745mamgpg54pc0n75qpzr9jbvicbp8g66p"; +in buildGoPackage rec { name = "wal-g-${version}"; - version = "0.1.2"; - src = fetchurl { - url = https://github.com/wal-g/wal-g/archive/v0.1.2.tar.gz; - sha256 = "0zkjs72gq7sc9cqqzxr6ms1ibk8466zpwmrziq9p4jv9r4iq3bfb"; + version = "0.1.8pre${revCount}_${builtins.substring 0 9 rev}"; + + src = fetchFromGitHub { + owner = "wal-g"; + repo = "wal-g"; + inherit rev sha256; }; + goPackagePath = "github.com/wal-g/wal-g"; meta = { homepage = https://github.com/wal-g/wal-g; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index cacfb8287a33..796a34c253a9 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let - version = "0.17.0"; - checksum = "0cncwkiw0w2am7gwi01p6ln87zgg1x6blfyxx7n7x8m1mv6704hl"; + version = "0.18.0"; + checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in stdenv.mkDerivation rec { name = "znapzend-${version}"; diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix new file mode 100644 index 000000000000..bbba21f2b34d --- /dev/null +++ b/pkgs/tools/compression/pbzx/default.nix @@ -0,0 +1,27 @@ +{stdenv, lib, fetchFromGitHub, lzma, xar}: + +stdenv.mkDerivation rec { + pname = "pbzx"; + version = "1.0.2"; + name = "${pname}-${version}"; + src = fetchFromGitHub { + owner = "NiklasRosenstein"; + repo = "pbzx"; + rev = "v${version}"; + sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; + }; + buildInputs = [ lzma xar ]; + buildPhase = '' + cc pbzx.c -llzma -lxar -o pbzx + ''; + installPhase = '' + mkdir -p $out/bin + cp pbzx $out/bin + ''; + meta = with lib; { + description = "Stream parser of Apple's pbzx compression format."; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = [ maintainers.matthewbauer ]; + }; +} diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 76704c254bdb..732aa691d4a9 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, zlib, utillinux }: let name = "pigz"; - version = "2.3.4"; + version = "2.4"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg"; + sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; }; enableParallelBuilding = true; buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux; + makeFlags = [ "CC=cc" ]; + doCheck = stdenv.isLinux; checkTarget = "tests"; installPhase = diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index c62eead3cb73..01d18fe6ad7d 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }: +{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, musl-fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 ]; + buildInputs = [ libxml2 openssl zlib bzip2 ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts; meta = { homepage = https://mackyle.github.io/xar/; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 8d02e926e57f..da3a537da283 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = '' + # Tests have a /bin/sh dependency... + patchShebangs tests + ''; + # In stdenv-linux, prevent a dependency on bootstrap-tools. preConfigure = "CONFIG_SHELL=/bin/sh"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 6617a4346e5e..8fa2d181de5e 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { - sha256 = "15h9i9ygry0znlmvll5r21lzwgyqzynaw9q2wbj4bcn7zjy4c1pn"; + sha256 = "090ba7dnv5z2v4vlb8b275b0n7cqsdzjqvr3b6a0w65z13mgy2nw"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { speed is preserved and remain roughly the same at all settings, a property shared by most LZ compression algorithms, such as zlib. ''; - homepage = http://www.zstd.net/; + homepage = https://facebook.github.io/zstd/; # The licence of the CLI programme is GPLv2+, that of the library BSD-2. license = with licenses; [ gpl2Plus bsd2 ]; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index b7ade4c5abc2..e720634ca44a 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.8.9"; + name = "archivemount-0.8.12"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg"; + sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch new file mode 100644 index 000000000000..812f9954cf20 --- /dev/null +++ b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index af7a206..553ac70 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr) + INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools + else + ROOT_SBINDIR=$(PREFIX)/sbin +- INITRAMFS_DIR=/etc/initramfs-tools ++ INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools + endif + + .PHONY: all diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 0a5017de53c4..c2e13b75daa9 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,19 @@ { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium -, keyutils, liburcu, zlib, libaio }: +, keyutils, liburcu, zlib, libaio, zstd }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-02-08"; + name = "bcachefs-tools-unstable-2018-04-10"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "fc96071b58c28ea492103e7649c0efd5bab50ead"; - sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy"; + rev = "c598d91dcb0c7e95abdacb2711898ae14ab52ca1"; + sha256 = "1mglw6p1145nryn8babkg2hj778kqa0vrzjbdp9kxjlyb3fksmff"; }; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; + buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ]; + patches = [ ./Makefile.patch ]; installFlags = [ "PREFIX=$(out)" ]; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { description = "Tool for managing bcachefs filesystems"; homepage = https://bcachefs.org/; license = licenses.gpl2; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ davidak chiiruno]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index c558c9e8a320..a83ee771d699 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "bindfs-${version}"; src = fetchurl { - url = "http://bindfs.org/downloads/${name}.tar.gz"; + url = "https://bindfs.org/downloads/${name}.tar.gz"; sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc"; }; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 09f004f28440..e84260052a41 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd }: -let version = "4.15.1"; in - stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; + version = "4.15.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"; }; + patches = [ + # Fix build with e2fsprogs 1.44.0 + (fetchpatch { + url = "https://patchwork.kernel.org/patch/10281327/raw/"; + sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf"; + }) + ]; + nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; @@ -20,12 +27,14 @@ stdenv.mkDerivation rec { # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally - patchPhase = "sed -i s/-O1/-O2/ configure"; + postPatch = "sed -i s/-O1/-O2/ configure"; postInstall = '' install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs ''; + configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; + meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 3d35a10f3b3b..4325a9355366 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -5,7 +5,7 @@ , openldap, lttngUst , babeltrace, gperf , cunit, snappy -, rocksdb +, rocksdb, makeWrapper # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -96,6 +96,7 @@ let ps.pecan ps.prettytable ps.webob + ps.cherrypy ]); in @@ -113,7 +114,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig which git python2Packages.wrapPython + pkgconfig which git python2Packages.wrapPython makeWrapper (ensureNewerSourcesHook { year = "1980"; }) ]; @@ -158,6 +159,7 @@ stdenv.mkDerivation { postFixup = '' wrapPythonPrograms + wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages} ''; enableParallelBuilding = true; @@ -165,7 +167,7 @@ stdenv.mkDerivation { outputs = [ "dev" "lib" "out" "doc" ]; meta = { - homepage = http://ceph.com/; + homepage = https://ceph.com/; description = "Distributed storage system"; license = licenses.lgpl21; maintainers = with maintainers; [ adev ak wkennington ]; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 62eab06c387c..1c8835a2ed4c 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.43.9"; + name = "e2fsprogs-1.44.1"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "15rqvkzylqqckshfy7vmk15k7wds2rh3k1pwrkrs684p3g0gzq2v"; + sha256 = "1rn1nvp8kcvjmbh2bxrjfbrz7zz519d52rrxqvc50l0hzs6hda55"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig texinfo ]; - buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + buildInputs = [ libuuid gettext ]; configureFlags = if stdenv.isLinux then [ diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index a30709d4c920..e0c5ea3def4e 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ e2fsprogs ]; + # inode field i_dir_acl was repurposed as i_size_high in e2fsprogs 1.44, + # breaking the build + patchPhase = '' + substituteInPlace src/insertionops.cc \ + --replace "Directory ACL:" "High 32 bits of size:" \ + --replace "inode.i_dir_acl" "inode.i_size_high" + ''; + meta = with stdenv.lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = http://extundelete.sourceforge.net/; diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 4af076e8f2cd..61c6ab253cce 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,27 +1,26 @@ { stdenv, fetchFromGitHub , parted, udev }: -let - version = "6.0-2016.11.16-unstable"; -in + stdenv.mkDerivation rec { - name = "f3-${version}"; + name = "${pname}-${version}"; + pname = "f3"; + version = "7.0"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "AltraMayor"; - repo = "f3"; - rev = "eabf001f69a788e64912bc9e812c118a324077d5"; - sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; + repo = pname; + rev = "v${version}"; + sha256 = "195j2zd747ffbsl8p5rf7dyn1j5n05zfqy1s9fm4y6lz8yc1nr17"; }; buildInputs = [ parted udev ]; patchPhase = "sed -i 's/-oroot -groot//' Makefile"; - buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 - "all" # f3read, f3write + buildFlags = [ "all" # f3read, f3write "extra" # f3brew, f3fix, f3probe ]; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 3e4425847fa0..75a94400627d 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.3.365"; + version = "1.4.2.439"; name = "fatsort-${version}"; src = fetchurl { - url = "mirror://sourceforge/fatsort/${name}.tar.gz"; - sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; + url = "mirror://sourceforge/fatsort/${name}.tar.xz"; + sha256 = "1q51qq69854kr12knhyqjv7skj95qld6j04pv5v3xvxs0y9zkg5x"; }; patches = [ ./fatsort-Makefiles.patch ]; diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix deleted file mode 100644 index 25ec31ea698a..000000000000 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, openssl, libbsd }: - -let version = "332.25"; - package_name = "hfsprogs"; in -stdenv.mkDerivation rec { - name = "${package_name}-${version}"; - srcs = [ - (fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz"; - sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; - }) - (fetchurl { - url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; - sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; - }) - ]; - - sourceRoot = "diskdev_cmds-" + version; - patches = [ "../debian/patches/*.patch" ]; - - buildInputs = [ openssl libbsd ]; - makefile = "Makefile.lnx"; - - # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/ - installPhase = '' - # Create required package directories - install -m 755 -d "$out/bin" - install -m 755 -d "$out/share/${package_name}" - install -m 755 -d "$out/share/man/man8/" - # Copy executables - install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" - install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" - # Copy shared data - install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata" - # Copy man pages - install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" - install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" - ''; - - meta = { - description = "HFS/HFS+ user space utils"; - license = stdenv.lib.licenses.apsl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 6f239bfa1279..16e6db8e4f75 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }: +{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.24.0"; + version = "2.24.2"; - # not using fetchFromGitHub because of changelog being built with git log - src = fetchgit { - url = "https://github.com/trapexit/mergerfs"; - rev = "refs/tags/${version}"; - sha256 = "12ci1i5zkarl1rz0pq1ldw0fpp4yfj8vz36jij63am7w7gp7qly2"; - deepClone = true; - leaveDotGit = true; + src = fetchFromGitHub { + owner = "trapexit"; + repo = "mergerfs"; + rev = version; + sha256 = "0i65v7900s7c9jkj3a4v44vf3r5mvjkbcic3df940nmk0clahhcs"; }; - nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ]; + nativeBuildInputs = [ + automake autoconf pkgconfig gettext libtool pandoc which + ]; buildInputs = [ attr libiconv ]; + preConfigure = '' + cat > src/version.hpp <<EOF + #pragma once + static const char MERGERFS_VERSION[] = "${version}"; + EOF + ''; + makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; meta = { diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 977add39b94b..5bce33065192 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libuuid, libselinux }: +{ stdenv, fetchurl, fetchpatch, libuuid, libselinux }: let sourceInfo = rec { version = "2.2.7"; @@ -23,6 +23,18 @@ stdenv.mkDerivation rec { sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./lib/cleaner*.c ''; + patches = [ + # Fix w/musl + (fetchpatch { + url = "https://github.com/nilfs-dev/nilfs-utils/commit/115fe4b976858c487cf83065f513d8626089579a.patch"; + sha256 = "0h89jz9l5d4rqj647ljbnv451l4ncqpsvzj0v70mn5391hfwsjlv"; + }) + (fetchpatch { + url = "https://github.com/nilfs-dev/nilfs-utils/commit/51b32c614be9e98c32de7f531ee600ca0740946f.patch"; + sha256 = "1ycq83c6jjy74aif47v075k5y2szzwhq6mbcrpd1z4b4i1x6yhpn"; + }) + ]; + # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv # still doesn't use it # diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 5321fd8a830f..cc2bbad1680a 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { (gentooPatch "xfsprogs-4.12.0-sharedlibs.patch" "1i081749x91jvlrw84l4a3r081vqcvn6myqhnqbnfcfhd64h12bq") (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s") (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7") + ./glibc-2.27.patch ]; preConfigure = '' diff --git a/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch b/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch new file mode 100644 index 000000000000..1f398b1daa85 --- /dev/null +++ b/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch @@ -0,0 +1,53 @@ +From 8041435de7ed028a27ecca64302945ad455c69a6 Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" <darrick.wong@oracle.com> +Date: Mon, 5 Feb 2018 14:38:02 -0600 +Subject: xfs_io: fix copy_file_range symbol name collision + +glibc 2.27 has a copy_file_range wrapper, so we need to change our +internal function out of the way to avoid compiler warnings. + +Reported-by: fredrik@crux.nu +Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> +Reviewed-by: Eric Sandeen <sandeen@redhat.com> +Signed-off-by: Eric Sandeen <sandeen@sandeen.net> +--- + io/copy_file_range.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/io/copy_file_range.c b/io/copy_file_range.c +index d1dfc5a..99fba20 100644 +--- a/io/copy_file_range.c ++++ b/io/copy_file_range.c +@@ -42,13 +42,18 @@ copy_range_help(void) + ")); + } + ++/* ++ * Issue a raw copy_file_range syscall; for our test program we don't want the ++ * glibc buffered copy fallback. ++ */ + static loff_t +-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len) ++copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len) + { + loff_t ret; + + do { +- ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0); ++ ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, ++ len, 0); + if (ret == -1) { + perror("copy_range"); + return errno; +@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv) + copy_dst_truncate(); + } + +- ret = copy_file_range(fd, &src, &dst, len); ++ ret = copy_file_range_cmd(fd, &src, &dst, len); + close(fd); + return ret; + } +-- +cgit v1.1 + diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 04863d6ce625..ce66402d09fc 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.41"; + version="2.42"; name="${baseName}-${version}"; - hash="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; - url="https://freefr.dl.sourceforge.net/project/asymptote/2.41/asymptote-2.41.src.tgz"; - sha256="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; + hash="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; + url="https://freefr.dl.sourceforge.net/project/asymptote/2.42/asymptote-2.42.src.tgz"; + sha256="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; }; buildInputs = [ ghostscriptX imagemagick fftw diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 30546865bcc1..0223375a0884 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.26.0"; + name = "dcraw-9.27.0"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "18zvzaxjq1yaj90xm8bwb30lqbjyjyp002bp175dayh3kr91syc5"; + sha256 = "16bhk3pl5kb9ikv367szl8m92nx85rqypz5im8x3sakm357wrn61"; }; buildInputs = [ libjpeg lcms2 gettext jasper ]; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 537d1a8c7db9..d6ec68ba3cc5 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libexif, popt, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, libexif, popt, libintl }: stdenv.mkDerivation rec { name = "exif-0.6.21"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libexif popt ] ++ libintlOrEmpty; + buildInputs = [ libexif popt libintl ]; meta = { homepage = http://libexif.sourceforge.net/; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 8a75fea33ce8..43da52634e68 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGLU_combined, libdrm, - python27, wayland, libudev }: +{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, + python27, wayland, libudev, mesa_noglu }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGLU_combined libdrm python27 wayland libudev + libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu ]; buildPhase = '' diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index b4b881e6c500..a3a9a4d8eda4 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, xlibsWrapper, libGL }: +{ stdenv, fetchurl, libGL, libX11 }: -let version = "8.3.0"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "glxinfo-${version}"; + version = "8.3.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/libGLU_combined/demos/${version}/mesa-demos-${version}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [ xlibsWrapper libGL ]; + buildInputs = [ libX11 libGL ]; configurePhase = "true"; buildPhase = " cd src/xdemos - gcc glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 - gcc glxgears.c -o glxgears -lGL -lX11 + $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 + $CC glxgears.c -o glxgears -lGL -lX11 -lm "; installPhase = " @@ -25,7 +24,11 @@ stdenv.mkDerivation { cp glxinfo glxgears $out/bin/ "; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Test utilities for OpenGL"; + homepage = https://www.mesa3d.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index cbfdd56cca10..a8c491b049ff 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0yvb9iwwmjxvck2in3ymqszaddz502v2ryk50qs0wskhbhdh96c7"; + sha256 = "0iac1zaix2zv1dfp45ca0wk9pj6k02gf8l1vmg820z8jd12pa19w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index f61c7923d794..b360f9a34503 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + gettext ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) - ++ optionals (stdenv.isDarwin) [ ApplicationServices gettext ]; + ++ optionals (stdenv.isDarwin) [ ApplicationServices ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 0941b3eabf95..3ab2232e26c6 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.32.2"; + name = "icoutils-0.32.3"; src = fetchurl { url = "mirror://savannah/icoutils/${name}.tar.bz2"; - sha256 = "1g8ihxw24gbiy189h36w16lbyfq7fn260qkbc85n9jqrvkxsz4p8"; + sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; buildInputs = [ makeWrapper libpng perl ]; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 9fdf0ad0465a..a31a9848c101 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pstoedit-3.70"; + name = "pstoedit-3.71"; src = fetchurl { url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; - sha256 = "130kz0ghsrggdn70kygrmsy3n533hwd948q69vyvqz44yw9n3f06"; + sha256 = "15dwrwjbixjqph2jmdqzi9fihwpqc1kz5jcv5phxw8wwrlicv285"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix new file mode 100644 index 000000000000..95f7c547b559 --- /dev/null +++ b/pkgs/tools/graphics/pywal/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }: + +python3Packages.buildPythonApplication rec { + pname = "pywal"; + version = "2.0.5"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e"; + }; + + # necessary for imagemagick to be found during tests + buildInputs = [ imagemagick ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ]; + + preCheck = '' + mkdir tmp + HOME=$PWD/tmp + ''; + + meta = with lib; { + description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; + homepage = https://github.com/dylanaraps/pywal; + license = licenses.mit; + maintainers = with maintainers; [ Fresheyeball ]; + }; +} diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix new file mode 100644 index 000000000000..1c3c0f3b4515 --- /dev/null +++ b/pkgs/tools/graphics/swfdec/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl +, cairo, pango, glib, liboil, zlib, gstreamer, gst-plugins-base +, gst-plugins-good , gtk2, libsoup, alsaLib, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "swfdec"; + version = "0.8.4"; + + src = fetchurl { + url = "http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-${version}.tar.gz"; + sha256 = "00nqrd0fzf0g76rn80d7h56n6hxv7x1x6k89zj45bj564lzwc3vs"; + }; + + buildInputs = [ + cairo glib liboil pango zlib gstreamer gst-plugins-base gst-plugins-good + gtk2 libsoup alsaLib pkgconfig + ]; + + postInstall = '' + mkdir "$out/bin" + cp tools/.libs/swfdec-extract "$out/bin" + cp tools/.libs/dump "$out/bin/swfdec-dump" + cp player/.libs/swfplay "$out/bin/swfplay" + ''; + + enableParallelBuilding = true; + + meta = { + inherit version; + description = "Decoder/renderer for Macromedia Flash animations"; + license = stdenv.lib.licenses.lgpl21 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = https://swfdec.freedesktop.org/wiki/; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 7617d544d296..1a3352676b15 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/fcitx/fcitx-qt5; + homepage = https://github.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 27eb35ce6ae5..c7d0eecb763c 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/fcitx/fcitx; + homepage = https://github.com/fcitx/fcitx; description = "A Flexible Input Method Framework"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 85399bffd3fe..bd22aefe2a95 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-libpinyin-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "067w926gcf0kwwn71yshhjmyzkad0qsdm1dsi2xwz1j633qd4xlb"; + sha256 = "02rwddv1lxzk70946v3rjsx1p7hx1d9bnwb7cx406cbws73yb2r9"; }; buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 944d6de1084a..dd8e96f8a6f8 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "m17n-db-1.7.0"; + name = "m17n-db-1.8.0"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; - sha256 = "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2"; + sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"; }; buildInputs = [ gettext ]; diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 982f35a9fe68..12b669c87777 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { - name = "m17n-lib-1.7.0"; + name = "m17n-lib-1.8.0"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; - sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f"; + sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; buildInputs = [ m17n_db ]; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index d11392599220..d1125d572ee9 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = https://www.aescrypt.com/; diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index ee0accac2d9b..62d46bba5b0d 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -22,5 +22,6 @@ mkDerivation rec { maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; platforms = with platforms; linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix index 76f42b1976ae..6b1512e854b0 100644 --- a/pkgs/tools/misc/argtable/default.nix +++ b/pkgs/tools/misc/argtable/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.argtable.org/; + homepage = https://www.argtable.org/; description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library"; license = licenses.bsd3; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index db2e1fc622fa..9a51553ae43a 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "08i71r221ilc8k1c59w89g3iq5m7zwhnjjzapavhqxlr8y9dcpf5"; + sha256 = "01pij2r73f190qk7q3cgf5cmk0w59g9l9v4vah5vf4ddn7nnk7yq"; }; meta = { diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index ee2680da0066..f69f654cda3d 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -4,7 +4,10 @@ with python.pkgs; -buildPythonApplication rec { +#We need to use buildPythonPackage here to get the PYTHONPATH build correctly. +#This is needed for services.bepasty +#https://github.com/NixOS/nixpkgs/pull/38300 +buildPythonPackage rec { pname = "bepasty"; version = "0.4.0"; name = "${pname}-${version}"; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 0d6e93118d82..9355f3e54076 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -19,8 +19,8 @@ buildPythonApplication rec { postPatch = '' # https://github.com/blue-yonder/bonfire/pull/24 substituteInPlace requirements.txt \ - --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.13" \ - --replace "keyring>=9,<10" "keyring>=9,<=11" + --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4" \ + --replace "keyring>=9,<10" "keyring>=9" # pip fails when encountering the git hash for the package version substituteInPlace setup.py \ --replace "version=version," "version='${version}'," diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 8f3c067018df..c5ebe7cf32ee 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.124"; + version = "5.125"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "08pipvh2iwy5d4b1bnrh0vwlmm884cqzgsz6jx3ar4shp63i5jjf"; + sha256 = "1nx9vpyfn9zs8iyqnqdlskr8lqh4zlciijwd9qfpzmd50lkwh8jh"; }; doCheck = true; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index d4ee1661801f..f66cc60c9267 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.1.10"; + version = "3.1.12"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "12phmirx0fgvykvkl8frv5agxqi7n04sxf5bpwjwq12mydq2x7kc"; + sha256 = "0k59wnch2gmbsr5dh5swbjp4rkf5c1ml0n4sxf196wdasraismc6"; }; buildInputs = [ diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 043ea44bb8c8..9b6330140097 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { glib-compile-schemas $out/share/glib-2.0/schemas ''; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d"; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; + PKG_CONFIG_SYSTEMD_TMPFILESDIR = "lib/tmpfiles.d"; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "share/bash-completion/completions"; + PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; postFixup = '' wrapProgram "$out/libexec/colord-session" \ diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index d146cd93343e..47a74e84b55a 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ./contacts-*/Build/Products/Default/contacts $out/bin + cp Products/Default/contacts $out/bin ''; ## FIXME: the framework setup hook isn't adding these correctly diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index e6ff7e99353b..253e6a50b361 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-2.04"; + name = "convmv-2.05"; src = fetchurl { url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; - sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy"; + sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; preBuild='' diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix new file mode 100644 index 000000000000..673e5c4c321f --- /dev/null +++ b/pkgs/tools/misc/dashing/default.nix @@ -0,0 +1,26 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "dashing-unstable-${version}"; + version = "2018-02-15"; + rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49"; + + goPackagePath = "github.com/technosophos/dashing"; + + src = fetchgit { + inherit rev; + url = "https://github.com/technosophos/dashing"; + sha256 = "066njyk3c1fqqr0v6aa6knp3dnksmh6hnl9d84fgd4wzyw3ma2an"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "A Dash Generator Script for Any HTML"; + homepage = https://github.com/technosophos/dashing; + license = licenses.mit; + maintainers = [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/dashing/deps.nix b/pkgs/tools/misc/dashing/deps.nix new file mode 100644 index 000000000000..4ad5a10149ec --- /dev/null +++ b/pkgs/tools/misc/dashing/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "901648c87902174f774fac311d7f176f8647bdaa"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; + sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "d896508f87298565da02ed92730e7065c3de10b8"; + sha256 = "19q0rv171wx73rwdp81rkj9ys3r5jaav94b3j06gprg59phb98bs"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; + sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; + }; + } +] diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 810bf06527b0..a08f465d6cd7 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -54,7 +54,8 @@ in stdenv.mkDerivation rec { wrapProgram "$i" \ --prefix PERL5LIB : "$PERL5LIB" \ --prefix PERL5LIB : "$out/share/devscripts" \ - --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" + --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" \ + --prefix PATH : "${dpkg}/bin" done ''; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index bd5678c651fb..9e3abaaedfca 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.93"; + version = "1.0.95"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1nyp9fwb7xrk1vin81dmgx2g9rb52yg4gwz4rcx97gamw4mlvbfd"; + sha256 = "1xpd1yblcgwhri64hzgxhalpf5j8gqbmkrsm1fs0pbwiy0wdz0ry"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 6e2f6548722e..e89222af74b4 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, libintl }: with stdenv.lib; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libintlOrEmpty ]; - - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; + buildInputs = [ glib libintl ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index e4968b12e6cc..246898a72317 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { meta = { description = "EDID decoder and conformance tester"; - homepage = http://cgit.freedesktop.org/xorg/app/edid-decode/; + homepage = https://cgit.freedesktop.org/xorg/app/edid-decode/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.chiiruno ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 3c8262068693..889f9d56d93c 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "6.3.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1q666k7rssjd2cbkm8bm2gsn5shlkh756qpam53kibi5ahrwa7dc"; + sha256 = "0qykzkwrj4w3i5h1a328kadd7fgd91w0z2n4xr6i3csyaiwwgd1x"; }; - cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r"; + cargoSha256 = "1qicgfaqzjm7sjzgxkci6bg495n227pyicj4ycds5z6mfy15hi4q"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index e7e40bc851e2..e334a2a8813e 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ]; - # segfaults on darwin without - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-F/System/Library/Frameworks"; - meta = with stdenv.lib; { description = "Configurable embedded Linux firmware update creator and runner"; homepage = https://github.com/fhunleth/fwup; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index adad66c9bfa4..eb029d32f73e 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnokii.org; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 5b9130bbe0e8..96ce38ea9e85 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont +, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig , zfs ? null , efiSupport ? false , zfsSupport ? true @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"; }; - nativeBuildInputs = [ bison flex python ]; + nativeBuildInputs = [ bison flex python pkgconfig ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -123,6 +123,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; }) diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index d4322f051d0a..f7cdf5ca608b 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,18 +1,28 @@ -{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }: +{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: stdenv.mkDerivation rec { - version="0.8.7"; + version="1.1.3"; name = "gsmartcontrol-${version}"; src = fetchurl { - url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; - sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; + url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; + sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ smartmontools gtkmm2 libglademm pcre ]; + patches = [ + ./fix-paths.patch + ]; - #installTargets = "install datainstall"; + nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ]; + buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; + + enableParallelBuilding = true; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}" + ) + ''; meta = { description = "Hard disk drive health inspection tool"; @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = http://gsmartcontrol.sourceforge.net/; + homepage = https://gsmartcontrol.sourceforge.io/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch new file mode 100644 index 000000000000..905b63bee0c4 --- /dev/null +++ b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch @@ -0,0 +1,58 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -475,6 +475,7 @@ + + + AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \ ++ data/org.gsmartcontrol.policy \ + data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \ + debian.dist/changelog \ + src/gsc_winres.rc src/gsmartcontrol.exe.manifest \ +diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in +--- a/data/gsmartcontrol-root.in ++++ b/data/gsmartcontrol-root.in +@@ -8,7 +8,7 @@ + # Run gsmartcontrol with root, asking for root password first. + # export GSMARTCONTROL_SU to override a su command (e.g. "kdesu -c"). + +-EXEC_BIN="@prefix@/sbin/gsmartcontrol"; ++EXEC_BIN="@prefix@/bin/gsmartcontrol"; + prog_name="gsmartcontrol" + + +@@ -118,7 +118,7 @@ + # Add @prefix@/sbin as well (freebsd seems to require it). + # Note that beesu won't show a GUI login box if /usr/sbin is before /usr/bin, + # so add it first as well. +-EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/sbin"; ++EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/bin"; + export PATH="$EXTRA_PATHS:$PATH" + + +diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in +rename from data/org.gsmartcontrol.policy +rename to data/org.gsmartcontrol.policy.in +--- a/data/org.gsmartcontrol.policy ++++ b/data/org.gsmartcontrol.policy.in +@@ -12,7 +12,7 @@ + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> +- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gsmartcontrol</annotate> ++ <annotate key="org.freedesktop.policykit.exec.path">@prefix@/bin/gsmartcontrol</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> + +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,7 +24,7 @@ + # endif + + +-sbin_PROGRAMS = gsmartcontrol ++bin_PROGRAMS = gsmartcontrol + + gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \ + $(top_builddir)/src/libdebug/libdebug.a \ diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index bc8ea769e8be..1946cbeb3f01 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { name = "hdf-${version}"; - version = "4.2.12"; + version = "4.2.13"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; - sha256 = "020jh563sjyxsgml8l809d2i1d4ms9shivwj3gbm7n0ilxbll8id"; + sha256 = "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm"; }; buildInputs = [ diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 2c1ba43a5587..494616d2b485 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -17,11 +17,11 @@ assert !cpp || mpi == null; let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.1"; + version = "1.10.2"; name = "hdf5-${version}"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; - sha256 = "1wpbi15za7kbsvih88kfcxblw412pjndl16x88dgnqr47piy2p4w"; + sha256 = "0wfb3w6dzi6zr2g1sdswqy9lxbp7yr4blvyi7k2xya7izmxmpb8w"; }; passthru = { diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 322151739843..0b04ee1e2811 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "hyperfine-${version}"; - version = "0.4.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hyperfine"; rev = "refs/tags/v${version}"; - sha256 = "1ynqyacbx0x971lyd1k406asms58bc7vzl8gca3sg34rx0hx3wzi"; + sha256 = "0prmnhyp20w71l3mjqgdr38q94cqr1xayzgj7ibbq2hdick4w5nn"; }; - cargoSha256 = "109yv1618bi19vh1jjv2ki06mafhcrv35a3a1zsr34kg3gsjv0rb"; + cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s"; meta = with stdenv.lib; { description = "Command-line benchmarking tool"; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 7fd9897a71bb..133a461964bd 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, perl, procps, gnugrep, gawk, findutils, gnused -, withProcps ? stdenv.isLinux }: +, perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { name = "keychain-${version}"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${gnused}/bin" \ --prefix PATH ":" "${findutils}/bin" \ --prefix PATH ":" "${gawk}/bin" \ - ${if withProcps then ("--prefix PATH \":\" ${procps}/bin") else ""} + --prefix PATH ":" "${procps}/bin" ''; meta = { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 0a7073f4d489..8ef5bd1c07cf 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0mq83m7mvavd0dzhk8g6ffldy57i22n0846yzqnlz733chiy3anz"; + sha256 = "0g9fy6x3wc5hda886ci79wj7rnjwvaidbwhsrckqgiqymbzvrdb8"; }; goPackagePath = "github.com/gokcehan/lf"; @@ -24,7 +24,7 @@ buildGoPackage rec { runHook preBuild runHook renameImports cd go/src/${goPackagePath} - go install -ldflags="-s -w -X main.gVersion=${version}" + go install -ldflags="-s -w -X main.gVersion=r${version}" runHook postBuild ''; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index 11657c03615d..c17c99980a88 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin-network"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1zlhyh5z0fla1yc6kwkx65ycwgmrcrkvzj8119wbkxy3xhzpwxpv"; + sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index dfcefe092008..dfcefe092008 100644 --- a/pkgs/tools/misc/quota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index e528e3e0285f..058a8472bf26 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "0cpim121ydxdjr251by9jw6pidh5b52jl5ldcm7gp015q49x1nl7"; + sha256 = "0qcq4c4nysdscbjrikhw653xwbi4dwscynjzyndsp8l21vl81x7p"; }; dontBuild = true; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 3eb2648a4412..6aa3fd836965 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "18680qpdvhr16dx66jfia1zrg52005sgdy9yhl7vdhm4gcr7pxwc"; + sha256 = "07j3jjg5ik4gjgvcx15qqqas9p1m3815jml82a5r1ip9l6vc4h20"; }; dontBuild = true; @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { mkdir -p $out cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin + wrapProgram $out/bin/logstash \ --set JAVA_HOME "${jre}" diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index a97f1eb9c871..1ef7e5527961 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,9 +1,11 @@ GEM remote: http://rubygems.org/ specs: - lolcat (90.8.8) + lolcat (99.9.10) + manpages (~> 0.6.1) paint (~> 2.0.0) trollop (~> 2.1.2) + manpages (0.6.1) paint (2.0.1) trollop (2.1.2) diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 6d0962780f4c..78677edcc34b 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -1,12 +1,20 @@ { lolcat = { - dependencies = ["paint" "trollop"]; + dependencies = ["manpages" "paint" "trollop"]; source = { remotes = ["http://rubygems.org"]; - sha256 = "1q031wq8wvp09llb39w0ql5k1zkblvkbmhlvrkc3ym832pibk06f"; + sha256 = "0fidwmgywkklxf2a4f4dl82b8mx4w4n73vqm6jqgyqd3nfmgysnl"; type = "gem"; }; - version = "90.8.8"; + version = "99.9.10"; + }; + manpages = { + source = { + remotes = ["http://rubygems.org"]; + sha256 = "11p6ilnfda6af15ks3xiz2pr0hkvdvadnk1xm4ahqlf84dld3fnd"; + type = "gem"; + }; + version = "0.6.1"; }; paint = { source = { diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index eadb736aeeb2..8d0728b7556e 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */ meta = with stdenv.lib; { homepage = http://man-db.nongnu.org; diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index ed6c08d55545..664c5cc8e78e 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20171011"; + version = "20180318"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1z6is359dnlf61n6ida9ivghafzz5m8cf4hzdhma8nxv12brfbzb"; + sha256 = "1sh0ipf77aav1k17dgl9dcjlb17zygs07x01g0nn0cg7yw5y5hfk"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix index 930fd1e5d3ec..4f6c4bad97c7 100644 --- a/pkgs/tools/misc/mht2htm/default.nix +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -39,5 +39,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 56684848ebaa..47eec54e127e 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 9706e3f02882..748c0917defb 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index bd446395bc78..82155eb51c7f 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.vanheusden.com/multitail/; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 3163b78437ec..3163b78437ec 100644 --- a/pkgs/tools/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index de4a22ee9e47..097eb2408f85 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "1f1hvd635wv81qg802jdi0yggi4631w9nlznipaxkvk4y1zpdq5j"; + sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx"; }; dontBuild = true; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 3b220153f173..a437eba49574 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -7,8 +7,8 @@ let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08"; - sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr"; + rev = "0c82203cd459a35cc3f471e3205355e9fb79160f"; + sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc"; }; bsdiff-src = fetchFromGitHub { @@ -18,7 +18,7 @@ let sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - version = "2017.12"; + version = "2018.4"; in stdenv.mkDerivation { name = "ostree-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68"; + sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 7287da2079a1..093633e21142 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180222"; + name = "parallel-20180322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1bwx1rcrqz04d8fajlllhrfkjqxg0mfvsd86wf6p067gmgdrf6g8"; + sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3"; }; nativeBuildInputs = [ makeWrapper perl ]; postInstall = '' wrapProgram $out/bin/parallel \ - ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ + --prefix PATH : "${procps}/bin" \ --prefix PATH : "${perl}/bin" \ ''; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 68240210e746..3a05a1927dbc 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python2 +{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2 , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; }; - patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch; + patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; + sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; + }); postPatch = stdenv.lib.optionalString doCheck '' patchShebangs tests @@ -31,7 +36,7 @@ stdenv.mkDerivation rec { # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. - doCheck = true; + doCheck = !stdenv.hostPlatform.isMusl; /* translation test */ preCheck = stdenv.lib.optionalString doCheck diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix new file mode 100644 index 000000000000..d362bccb993e --- /dev/null +++ b/pkgs/tools/misc/pdd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication, dateutil }: + +buildPythonApplication rec { + pname = "pdd"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = "pdd"; + rev = "v${version}"; + sha256 = "1nb64vdlym4najjyfxq1nprqcwgrwnqj1mml0fcg20hrgbjm4bf2"; + }; + + format = "other"; + + propagatedBuildInputs = [ dateutil ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jarun/pdd"; + description = "Tiny date, time diff calculator"; + longDescription = '' + There are times you want to check how old you are (in years, months, days) + or how long you need to wait for the next flash sale or the number of days + left of your notice period in your current job. pdd (Python3 Date Diff) is + a small cmdline utility to calculate date and time difference. If no + program arguments are specified it shows the current date, time and + timezone. + ''; + maintainers = [ maintainers.infinisil ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index a3fdca001d94..38cab5cf8623 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,37 +1,30 @@ { mkDerivation, fetchFromGitHub, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework + baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework }: let pname = "peruse"; - version = "1.2"; - unarr = fetchFromGitHub { - owner = "zeniko"; - repo = "unarr"; - rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7"; - sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr"; - }; + version = "1.2.20180219"; + in mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq"; + # The last formal release from 2016 uses kirigami1 which is deprecated + src = fetchFromGitHub { + owner = "KDE"; + repo = pname; + rev = "4125d3149c45d196600258686610de701130113d"; + sha256 = "1x8in7z17gzgiibshw7xfs6m6bhr3n5fys3nlpab77nm0dl3f4r5"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami knewstuff plasma-framework ]; + propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami2 knewstuff plasma-framework ]; pathsToLink = [ "/etc/xdg/peruse.knsrc"]; - preConfigure = '' - rm -rf src/qtquick/karchive-rar/external/unarr - ln -s ${unarr} src/qtquick/karchive-rar/external/unarr - ''; - meta = with lib; { license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 0afd28b3c91b..45b0da6f8db0 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "calleerlandsson"; repo = "pick"; rev = "v${version}"; - sha256 = "0ypawbzpw188rxgv8x044iib3a517j5grgqnxy035ax5zzjavsrr"; + sha256 = "0wm3220gqrwldiq0rjdraq5mw3i7d58zwzls8234sx9maf59h0k0"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 447ef9dd5ec5..2eb6f1aa8e6d 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { # "java -jar plantuml.jar -license" says GPLv3 or later license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix new file mode 100644 index 000000000000..b9543dc143cf --- /dev/null +++ b/pkgs/tools/misc/pspg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig }: + +stdenv.mkDerivation rec { + name = "pspg-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "okbob"; + repo = "pspg"; + rev = "${version}"; + sha256 = "1swrg4bg7i4xpdrsg8dsfldbxaffni04x8i1s0g6h691qcin675v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnugrep ncurses ]; + + preBuild = '' + makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/okbob/pspg; + description = "Postgres Pager"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.jlesquembre ]; + }; +} diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index aa8c43b7cdd7..c9ab32035de4 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -1,7 +1,24 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, python3 }: -python3Packages.buildPythonApplication rec { - name = "pubs-${version}"; +let + python3Packages = (python3.override { + packageOverrides = self: super: { + # https://github.com/pubs/pubs/issues/131 + pyfakefs = super.pyfakefs.overridePythonAttrs (oldAttrs: rec { + version = "3.3"; + src = self.fetchPypi { + pname = "pyfakefs"; + inherit version; + sha256 = "e3e198dea5e0d5627b73ba113fd0b139bb417da6bc15d920b2c873143d2f12a6"; + }; + postPatch = ""; + doCheck = false; + }); + }; + }).pkgs; + +in python3Packages.buildPythonApplication rec { + pname = "pubs"; version = "0.7.0"; src = fetchFromGitHub { @@ -13,9 +30,10 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ dateutil configobj bibtexparser pyyaml requests beautifulsoup4 - pyfakefs ddt ]; + checkInputs = with python3Packages; [ pyfakefs ddt ]; + preCheck = '' # API tests require networking rm tests/test_apis.py @@ -29,6 +47,5 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/pubs/pubs; license = licenses.lgpl3; maintainers = with maintainers; [ gebner ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index e0fefe85b9fd..72ea7f2ea0b0 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "recoverjpeg-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; - sha256 = "00zi23l4nq9nfjg1zzbpsfxf1s47r5w713aws90w13fd19jqn0rj"; + sha256 = "01vayn2b3mqmyqz2ka2j3k4a93bjdvkhv5ry9207v04r83r7iwfp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix new file mode 100644 index 000000000000..345f26852dcb --- /dev/null +++ b/pkgs/tools/misc/rw/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "rw-${version}"; + version = "1.0"; + + src = fetchurl { + url = "https://sortix.org/rw/release/rw-portable-${version}.tar.gz"; + # Use hash provided by upstream + sha256 = "50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://sortix.org/rw; + description = "Block device and byte copying program similar to dd"; + longDescription = '' + rw is a command line program which copies information between files + or byte streams. The rw command is designed to be a replacement for + dd with standard style command line flags. + ''; + license = licenses.isc; + maintainers = with maintainers; [ dtzWill ]; + + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index 83c384e5ec0a..e0d1ff208353 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "smc-6.6.0"; + name = "smc-6.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/smc/smc/6_6_0/smc_6_6_0.tgz"; - sha256 = "14lf286dslm7ymkr4my1xgjvwvqc9181mwkfr65ab49cxl0q85wz"; + url = "mirror://sourceforge/project/smc/smc/6_6_3/smc_6_6_3.tgz"; + sha256 = "1gv0hrgdl4wp562virpf9sib6pdhapwv4zvwbl0d5f5xyx04il11"; }; # Prebuilt Java package. diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 061a6c58d237..3db0ee9af267 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { your selection will be sent to standard output. ''; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix new file mode 100644 index 000000000000..c1f3fbea8e5c --- /dev/null +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, makeWrapper, fetchurl, + alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, + gnome2, gtk2-x11, nspr, nss, + libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, + libXi, libXrandr, libXrender, libXScrnSaver, libXtst, + libudev0-shim +}: + stdenv.mkDerivation rec { + name = "sweep-visualizer-${version}"; + version = "0.15.0"; + + src = fetchurl { + url = "https://s3.amazonaws.com/scanse/Visualizer/v${version}/sweepvisualizer_${version}_amd64.deb"; + sha256 = "1k6rdjw2340qrzafv6hjxvbvyh3s1wad6d3629nchdcrpyx9xy1c"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + sourceRoot = "."; + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out/lib $out/bin $out/share/sweep-visualizer + mv usr/share/* $out/share + mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ + mv $out/share/sweep-visualizer/*.so $out/lib/ + ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype + gdk_pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib + libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXScrnSaver libXtst + ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + in '' + for lib in $out/lib/*.so; do + patchelf --set-rpath "$out/lib:${libPath}" $lib + done + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out/lib:${libPath}" \ + $out/share/sweep-visualizer/sweep_visualizer + wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + ''; + + meta = with stdenv.lib; { + homepage = https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview; + description = "A minimal desktop application for interfacing with the Sweep device"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mt-caret ]; + }; + } diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 29bd3235dfb9..f37892a231a5 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { - name = "txt2man-1.5.6"; + name = "txt2man-${version}"; + version = "1.6.0"; src = fetchurl { - url = "http://mvertes.free.fr/download/${name}.tar.gz"; - sha256 = "0ammlb4pwc4ya1kc9791vjl830074zrpfcmzc18lkcqczp2jaj4q"; + url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz"; + sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; }; preConfigure = '' diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index ad5b259eb77a..9d1e4096776a 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index a655aa9502e5..7ccc6e9dc271 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in an existing instance of GVim or MacVim. ''; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 436a252e678d..197eea17d886 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.1.4"; + version = "3.1.5"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "0hvxsm6k6s29wnr3i5b9drf6ml0i32is2l50l3cxvf1f499w4bpc"; + sha256 = "0jbyrd49ikwkfpnka884y3p600bm3nfil2zinrgbac7vyhxxqjmw"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index c64ae609bcbb..6b63e2f55a27 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { "--enable-firmware CROSS_COMPILE=${crossPrefix}-" else ""; + hardeningDisable = [ "pic" "stackprotector" ]; + # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 31b8d673a988..2c5a2b808a57 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -2,11 +2,11 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "yad-0.37.0"; + name = "yad-0.40.0"; src = fetchurl { url = "http://sourceforge.net/projects/yad-dialog/files/${name}.tar.xz"; - sha256 = "0fhqsgml1axaa9avd0hbam5wm77c2c7q1bz4hs7fvyvdnljazvwi"; + sha256 = "1x0fsv8nfkm8lchdawnf3zw79jaqbnvhv87sk5r8g86knv8vgl62"; }; configureFlags = [ diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 795c2ab191d1..f0a8eda00285 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1040"; + version = "0.4.1060"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "fdc9021e8b1cf936aad4bd6c74b80ea8fa3573b807c41242ba781e247f8c8ca8"; + sha256 = "1c4drn6khqrjvyzzsiaracnpcvahbiya6v5p18h2lyl7xia8gk51"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 316d3f181fef..cbfbf77739ba 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { pname = "youtube-dl"; - version = "2018.03.14"; + version = "2018.03.26.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0j8j797gqc29fd5ra3cjvwkp8dgvigdydsj0zzjs05zccfqrj9lh"; + sha256 = "1sbapwx2zdhprvmljqs6rzxnhiyfpxgin7qyjdrg6h25hhq63vss"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 9ff0376c8bcf..452837ef2e4f 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation rec { - name = "autossh-1.4e"; + name = "autossh-1.4f"; src = fetchurl { url = "http://www.harding.motd.ca/autossh/${name}.tgz"; - sha256 = "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly"; + sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1"; }; buildInputs = [ openssh ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index c9d689b8b2c1..2155d3c1b3d8 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Console downloading program with some features for parallel connections for faster downloading"; homepage = http://axel.alioth.debian.org/; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 69d36d363205..801863fb95a1 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.0"; + name = "babeld-1.8.1"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "0v2jkav2sb0rpx3fmi5chhii08lc92pxf306nyha2amq9wib3a0i"; + sha256 = "1gq6q1zly40ngs9wl3qa3yjvyb6zbqck82fp3n6w2bi9ymrrq94w"; }; preBuild = '' diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index d4a279bcc424..408fd0f8c8fe 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: stdenv.mkDerivation rec { - version = "6.1.0"; - seafileVersion = "6.1.0"; + version = "6.1.7"; + seafileVersion = "6.1.7"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; - sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; + sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 5ddb663a4ae5..1299c5eea5f3 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "05j17i1zlg19v8jkzlp710kbdgnb4541zgkqxqzcwglcvlc6g7rj"; + sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd"; }; buildInputs = [ readline texinfo nss nspr ] diff --git a/pkgs/tools/networking/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix index d5688354a76d..d5688354a76d 100644 --- a/pkgs/tools/networking/connman-gtk/default.nix +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix diff --git a/pkgs/tools/networking/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 8c4d4fa84865..8c4d4fa84865 100644 --- a/pkgs/tools/networking/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index 42b0c37411c8..42b0c37411c8 100644 --- a/pkgs/tools/networking/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index c39c82df634c..c39c82df634c 100644 --- a/pkgs/tools/networking/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix index 7c42cc965a00..7c42cc965a00 100644 --- a/pkgs/tools/networking/connmanui/default.nix +++ b/pkgs/tools/networking/connman/connmanui/default.nix diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index dbe2a6639352..32a8a7888484 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkgconfig, perl , http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null @@ -24,11 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.58.0"; + name = "curl-7.59.0"; src = fetchurl { - url = "https://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0cg7klhf1ksnbw5wvwa802qir877zv4y3dj7swz1xh07g3wq3c0w"; + urls = [ + "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" + "https://curl.haxx.se/download/${name}.tar.bz2" + ]; + sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 6d3ca27df1d6..93828c10d135 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -9,6 +9,7 @@ buildPerlPackage rec { sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy"; }; + # perl packages by default get devdoc which isn't present outputs = [ "out" ]; buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ]; @@ -25,7 +26,12 @@ buildPerlPackage rec { ''; installPhase = '' + runHook preInstall + install -Dm755 ddclient $out/bin/ddclient + install -Dm644 -t $out/share/doc/ddclient COP* ChangeLog README.* RELEASENOTE + + runHook postInstall ''; # there are no tests distributed with ddclient diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 02d5a3073f4b..93529fe4ce53 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ]; + preConfigure = "patchShebangs ./configure"; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 4a358255b10c..224c7a4ab484 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "5.5"; + version = "5.6"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0l43lbnrnyyrq8mlnw37saq6v0mh3nkirdq1dwnsrihykzjjwf70"; + sha256 = "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6"; }; doCheck = false; diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index f0bb4ab46fae..c8e14ad7f697 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; homepage = http://www.vervest.org/htp/; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index b1f83c8b2161..37f4f96a3172 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index ec268d5d77f6..58533f683e71 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: +{ stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: let wrapper = stdenv.mkDerivation rec { name = "wrapper-${version}"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { -e "s#uname#${coreutils}/bin/uname#" \ -e "s#which#${which}/bin/which#" \ -e "s#%gettext%#${gettext}/bin/gettext#" \ - -e "s#/usr/ucb/ps#${procps}/bin/ps#" \ + -e "s#/usr/ucb/ps#${ps}/bin/ps#" \ -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ -e "s#%INSTALL_PATH#$out#" \ -e 's#%USER_HOME#$HOME#' \ diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 3e4f1eaeeefe..36eced808569 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ]; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 20e65c5ea3ca..02e4672a1aee 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lldpd-${version}"; - version = "0.9.9"; + version = "1.0.1"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; - sha256 = "1nq2z03hbs5qc3kdk3rdxcwcsrxilhcqx7xw3iipc4yj03shi7jy"; + sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5"; }; configureFlags = [ diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 6f47b4b55766..26bfd27bf9a6 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, mysql }: +, python, gss, mysql, sendmailPath ? "/run/wrappers/bin/sendmail" }: let p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files"; @@ -34,13 +34,14 @@ in stdenv.mkDerivation rec { ]; doCheck = true; - enableParallelBuilding = true; + enableParallelBuilding = false; hardeningDisable = [ "format" ]; configureFlags = [ "--with-gssapi" "--with-gsasl" "--with-mysql" + "--with-path-sendmail=${sendmailPath}" ]; readmsg-tests = stdenv.lib.optionals doCheck [ diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 7538c08249c0..bfe7dfc2dc0d 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-client-${version}"; - version = "2018-02-09T23-07-36Z"; + version = "2018-03-25T01-22-22Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1mzjqcvl8740jkkrsyycwqminnd0vdl1m2mvq8hnywj8hs816bfd"; + sha256 = "1x71va37jaqsi99d0i0mccybrs9kjgmpfsm0dchmc58mmhyagh3k"; }; goPackagePath = "github.com/minio/mc"; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index a9e67701eb03..129db56dc554 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180222"; + name = "miniupnpd-2.0.20180410"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1hdpyvz1z6crpa7as3srmbl64fx0k4wjra57jw7qaysdsb1b2kqr"; + sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index c969119e1d76..5f7537eda18d 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonPackage rec { pname = "mitmproxy"; - version = "3.0.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw"; + sha256 = "10l761ds46r1p2kjxlgby9vdxbjjlgq72s6adjypghi41s3qf034"; }; postPatch = '' @@ -29,13 +29,13 @@ buildPythonPackage rec { blinker click certifi cryptography h2 hyperframe kaitaistruct passlib pyasn1 pyopenssl pyparsing pyperclip - requests ruamel_yaml tornado urwid - brotlipy sortedcontainers ldap3 + ruamel_yaml tornado urwid brotlipy + sortedcontainers ldap3 wsproto ]; - buildInputs = [ + checkInputs = [ beautifulsoup4 flask pytest - pytestrunner glibcLocales + requests glibcLocales ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index d0fd7af12902..f8c3d7541008 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -5,28 +5,32 @@ stdenv.mkDerivation rec { name = "mu-${version}"; - version = "0.9.18"; + version = "1.0"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = version; - sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y"; + rev = "v${version}"; + sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc"; }; - # as of 0.9.18 2 tests are failing but previously we had no tests + # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests patches = [ ./failing_tests.patch ]; - # pmccabe should be a checkInput instead, but configure looks for it + # test-utils coredumps so don't run those + postPatch = '' + sed -i -e '/test-utils/d' lib/parser/Makefile.am + ''; + buildInputs = [ sqlite xapian glib gmime texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - checkInputs = [ pmccabe ]; - doCheck = true; + nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; + + enableParallelBuilding = true; preBuild = '' # Fix mu4e-builddir (set it to $out) @@ -45,6 +49,8 @@ stdenv.mkDerivation rec { done ''; + doCheck = true; + meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 4c632899ac2e..0a0eadbfcba4 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, ncurses, coreutils }: -let version = "3.2.6"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ncftp-${version}"; + version = "3.2.6"; src = fetchurl { url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz"; @@ -11,24 +11,29 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; + enableParallelBuilding = true; + preConfigure = '' - find . -name "*.sh" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i - find . -name "*.in" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i - find . -name "*.c" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i - sed 's@/bin/ls@${coreutils}/bin/ls@g' -i configure - - find . -name "*.sh" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i - find . -name "*.in" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i - find . -name "*.c" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i - sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure + find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \ + -e 's@/bin/ls@${coreutils}/bin/ls@g' \ + -e 's@/bin/rm@${coreutils}/bin/rm@g' + ''; + + postInstall = '' + rmdir $out/etc + mkdir -p $out/share/doc + cp -r doc $out/share/doc/ncftp ''; - configureFlags = [ "--mandir=$out/share/man/" ]; + configureFlags = [ + "--enable-ssp" + "--mandir=$(out)/share/man/" + ]; meta = with stdenv.lib; { description = "Command line FTP (File Transfer Protocol) client"; - homepage = http://www.ncftp.com/ncftp/; + homepage = https://www.ncftp.com/ncftp/; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 8c9247013778..2d9776abfcfc 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libbsd}: +{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: stdenv.mkDerivation rec { version = "1.187"; @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { done ''; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; + sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; + }) + ]; + installPhase = '' runHook preInstall install -Dm0755 nc $out/bin/nc diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager/applet.nix index dd32cebea111..ecd10a139766 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -32,7 +32,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; - propagatedUserEnvPkgs = [ hicolor-icon-theme ]; + propagatedUserEnvPkgs = [ + hicolor-icon-theme + gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967 + ]; NIX_CFLAGS = [ ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu.nix index 82810e714d52..82810e714d52 100644 --- a/pkgs/tools/networking/networkmanager_dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu.nix diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index efaa146c72f3..27fd4c4adc30 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, kmod }: +, withGnome ? true, gnome3, sysctl, kmod }: let pname = "NetworkManager-openconnect"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \ --replace "/sbin/modprobe" "${kmod}/bin/modprobe" @@ -42,4 +42,3 @@ in stdenv.mkDerivation rec { inherit (networkmanager.meta) maintainers platforms; }; } - diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 4fc9c904f5f9..fb3ba2bbdf5a 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl , gnome3, libgnome-keyring, libsecret }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "NetworkManager-strongswan"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; - sha256 = "0r5j8cr4x01d2cdy970990292n7p9v617cw103kdczw646xwcxs8"; + sha256 = "0jzl52wmh2q2djb1s546kxliy7s6akhi5bx6rp2ppjfk3wbi2a2l"; }; postPatch = '' @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" ''; configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 031161da4d57..23725fb2d874 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -1,31 +1,38 @@ { stdenv, fetchurl, unzip }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "ngrok-${version}"; version = "2.2.8"; - src = if stdenv.system == "i686-linux" then fetchurl { + src = if stdenv.isLinux && stdenv.isi686 then fetchurl { url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-i386.tgz"; sha256 = "0s5ymlaxrvm13q3mlvfirh74sx60qh56c5sgdma2r7q5qlsq41xg"; - } else if stdenv.system == "x86_64-linux" then fetchurl { + } else if stdenv.isLinux && stdenv.isx86_64 then fetchurl { url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.tgz"; sha256 = "1mn9iwgy6xzrjihikwc2k2j59igqmph0cwx17qp0ziap9lp5xxad"; + } else if stdenv.isDarwin then fetchurl { + url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-386.zip"; + sha256 = "0yfd250b55wcpgqd00rqfaa7a82f35fmybb31q5xwdbgc2i47pbh"; } else throw "platform ${stdenv.system} not supported!"; sourceRoot = "."; + nativeBuildInputs = optional stdenv.isDarwin unzip; + installPhase = '' install -D ngrok $out/bin/ngrok ''; - meta = with stdenv.lib; { + meta = { description = "ngrok"; longDescription = '' Allows you to expose a web server running on your local machine to the internet. ''; homepage = https://ngrok.com/; - license = stdenv.lib.licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bobvanderlinden ]; }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index d72ee844c0ec..ef65444ae331 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "19.0"; + version = "19.1"; src = fetchurl { url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "08kgi4zmh4h1pvxh8x4c3ydf9xl2s6ncm579f0wdm2zknvpf0j16"; + sha256 = "1rjwv555zc2hiagf00k8l1pzav91qglsnqbqkyy3pmn2d8sl5pq6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 86a029bcb3de..c1d00dba2b46 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.5"; + version = "7.2.0"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0qm5vhzm8hkab2zs2l8ffg754wkws2nyd4pwb332v3zckf11flzd"; + sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb"; }; postPatch = '' diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c135cd36f48..42fcc842ad55 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -21,12 +21,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "openssh-${version}"; - version = if hpnSupport then "7.5p1" else "7.6p1"; + version = if hpnSupport then "7.6p1" else "7.6p1"; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz"; - sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_6_P1.tar.gz"; + sha256 = "15b1zjk9f3jlxji1vpqfla40cnzy8hv2clk925cvpgz7lqgv4a1d"; } else fetchurl { diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 87785f50e6fa..87cf6d172c0c 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "http://rtorrent.net/downloads/"; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index cddfb9621dc5..f11c0a63b07e 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation { stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice + broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 4bdc630efd79..8c0c4a6c5664 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, unzip, nettools, pythonPackages }: +{ fetchurl, lib, unzip, nettools, pythonPackages, texinfo }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) @@ -15,7 +15,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; }; - patchPhase = '' + outputs = [ "out" "doc" "info" ]; + + postPatch = '' sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -30,6 +32,24 @@ pythonPackages.buildPythonApplication rec { sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py ''; + # Remove broken and expensive tests. + preConfigure = '' + ( + cd src/allmydata/test + + # Buggy? + rm cli/test_create.py test_backupdb.py + + # These require Tor and I2P. + rm test_connections.py test_iputil.py test_hung_server.py test_i2p_provider.py test_tor_provider.py + + # Expensive + rm test_system.py + ) + ''; + + nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; + buildInputs = with pythonPackages; [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. @@ -39,16 +59,23 @@ pythonPackages.buildPythonApplication rec { service-identity pyyaml ]; + # Install the documentation. postInstall = '' - # Install the documentation. - mkdir -p "$out/share/doc/${name}" - cp -rv "docs/"* "$out/share/doc/${name}" - find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; + ( + cd docs + + make singlehtml + mkdir -p "$doc/share/doc/${name}" + cp -rv _build/singlehtml/* "$doc/share/doc/${name}" + + make info + mkdir -p "$info/share/info" + cp -rv _build/texinfo/*.info "$info/share/info" + ) ''; checkPhase = '' - # Still broken. ~ C. - # trial allmydata + trial --rterrors allmydata ''; meta = { diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 570e85c32815..96016ee7b4f3 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -23,15 +23,30 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4"; sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh"; }) + (fetchurl { + url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; + sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; + }) ./musl-fix-headers.patch ]; buildInputs = [ libpcap ]; + postPatch = '' + # strip is not found when cross compiling with seemingly no way to point + # make to the right place, fixup phase will correctly strip + # everything anyway so we remove it from the Makefiles + for file in $(find -name Makefile.linux); do + substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)' + done + ''; + installPhase = '' + runHook preInstall mkdir -p $out/bin make install install -D -m 755 scripts/{pon,poff,plog} $out/bin + runHook postInstall ''; postFixup = '' diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch index d24f62896840..030cc97d157f 100644 --- a/pkgs/tools/networking/ppp/musl-fix-headers.patch +++ b/pkgs/tools/networking/ppp/musl-fix-headers.patch @@ -89,12 +89,12 @@ index 3d3bf4e..b5f82d3 100644 use different frame types... sigh... */ diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..4d68147 100644 +index c4aaa6e..70aef85 100644 --- a/pppd/plugins/rp-pppoe/pppoe.h +++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t; - - #include <netinet/in.h> +@@ -88,18 +88,6 @@ typedef unsigned long UINT32_t; + #include <linux/if_ether.h> + #endif -#ifdef HAVE_NETINET_IF_ETHER_H -#include <sys/types.h> @@ -108,9 +108,9 @@ index 9ab2eee..4d68147 100644 -#endif - - - /* Ethernet frame types according to RFC 2516 */ #define ETH_PPPOE_DISCOVERY 0x8863 + #define ETH_PPPOE_SESSION 0x8864 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 6d71530..86d224e 100644 --- a/pppd/sys-linux.c diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 46fd9e54950a..cbbc36b383bf 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,47 +1,32 @@ -{ withMbedTLS ? true -, enableSystemSharedLib ? true -, stdenv, fetchurl, zlib -, openssl ? null -, mbedtls ? null -, libev ? null -, libsodium ? null -, udns ? null -, asciidoc -, xmlto -, docbook_xml_dtd_45 -, docbook_xsl -, libxslt -, pcre +{ stdenv, fetchurl, fetchgit, cmake +, libsodium, mbedtls, libev, c-ares, pcre +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let - - version = "2.5.5"; - sha256 = "46a72367b7301145906185f1e4136e39d6792d27643826e409ab708351b6d0dd"; - -in - -with stdenv.lib; - stdenv.mkDerivation rec { name = "shadowsocks-libev-${version}"; - src = fetchurl { - url = "https://github.com/shadowsocks/shadowsocks-libev/archive/v${version}.tar.gz"; - inherit sha256; + version = "3.1.3"; + + # Git tag includes CMake build files which are much more convenient. + # fetchgit because submodules. + src = fetchgit { + url = "https://github.com/shadowsocks/shadowsocks-libev"; + rev = "refs/tags/v${version}"; + sha256 = "16q91xh6ixfv7b5rl31an11101irv08119klfx5qgj4i6h7c41s7"; }; - buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt pcre ] - ++ optional (!withMbedTLS) openssl - ++ optional withMbedTLS mbedtls - ++ optionals enableSystemSharedLib [libev libsodium udns]; + buildInputs = [ libsodium mbedtls libev c-ares pcre ]; + nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; + + cmakeFlags = [ "-DWITH_STATIC=OFF" ]; - configureFlags = optional withMbedTLS - [ "--with-crypto-library=mbedtls" - "--with-mbedtls=${mbedtls}" - ] - ++ optional enableSystemSharedLib "--enable-system-shared-lib"; + postInstall = '' + cp lib/* $out/lib + chmod +x $out/bin/* + mv $out/pkgconfig $out/lib + ''; - meta = { + meta = with stdenv.lib; { description = "A lightweight secured SOCKS5 proxy"; longDescription = '' Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. @@ -50,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/shadowsocks/shadowsocks-libev; license = licenses.gpl3Plus; maintainers = [ maintainers.nfjinjing ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/tlspool/configvar-fix.patch b/pkgs/tools/networking/tlspool/configvar-fix.patch deleted file mode 100644 index 424fef20dcfd..000000000000 --- a/pkgs/tools/networking/tlspool/configvar-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8561789ba70ae5d741992b143ee288b8e11a5e2b Mon Sep 17 00:00:00 2001 -From: joachim schiele <js@lastlog.de> -Date: Wed, 1 Mar 2017 15:15:22 +0100 -Subject: [PATCH] fix to - https://github.com/arpa2/tlspool/issues/58#issuecomment-283333738 - ---- - tool/Makefile | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/tool/Makefile b/tool/Makefile -index 9a15012..0f655e9 100644 ---- a/tool/Makefile -+++ b/tool/Makefile -@@ -38,7 +38,6 @@ pgp11genkey_LIBS = $(P11KIT_LIBS) -lcrypto - - configvar_CFLAGS = $(tlspool_CFLAGS) - configvar_LDFLAGS = $(tlspool_LDFLAGS) --configvar_LIBS = $(tlspool_LIBS) - - P11KIT_CFLAGS = $(shell pkg-config --cflags p11-kit-1) - P11KIT_LIBS = $(shell pkg-config --libs p11-kit-1) -@@ -96,8 +95,8 @@ have_db: have_db.c - pgp11_genkey: pgp11_genkey.c - gcc -std=gnu11 $(CFLAGS) $(pgp11genkey_CFLAGS) -o "$@" "$<" $(pgp11genkey_LIBS) - --configvar: configvar.c $(configvar_LIBS) -- gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" $(configvar_LIBS) -+configvar: configvar.c -+ gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" - - $(tlspool_LIBS): - $(MAKE) -C ../lib `basename $(tlspool_LIBS)` --- -2.12.0 - diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 02d3f2c29488..b992fef2253f 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -1,56 +1,51 @@ -{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11-kit, - libtasn1, db, openldap, libmemcached, cyrus_sasl, openssl, softhsm, bash, - python, libkrb5, quickder, unbound, ldns, gnupg, gnutls-kdh, - useSystemd ? true, systemd, swig +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, arpa2cm +, openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh +, softhsm }: let pname = "tlspool"; - version = "20170123"; + version = "20180227"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "arpa2"; repo = "tlspool"; - rev = "90cfa0758b02849114ba6373f280a4f2d3e534bf"; - sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370"; + rev = "b4459637d71c7602e94d455e23c74f3973b9cf30"; + sha256 = "0x78f2bdsiglwicwn3injm5ysfjlfa0yzdpnc0r3iw4z0n89rj2r"; }; - propagatedBuildInputs = [ python softhsm openldap p11-kit.dev p11-kit.out gnupg ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder - libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] - ++ stdenv.lib.optional useSystemd systemd; + nativeBuildInputs = [ + cmake pkgconfig arpa2cm + ]; - patches = [ ./fixing-rpath.patch ./configvar-fix.patch ]; + buildInputs = [ + openldap p11-kit unbound libtasn1 db openssl quickder libkrb5 ldns gnutls-kdh + ]; postPatch = '' + # CMake is probably confused because the current version isn't 1.2.6, but 1.2-6 + substituteInPlace CMakeLists.txt \ + --replace "Quick-DER 1.2.4" "Quick-DER 1.2" substituteInPlace etc/tlspool.conf \ --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \ --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so" - substituteInPlace lib/Makefile \ - --replace "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX)" "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX) SWIG=${swig}/bin/swig" ''; - buildPhase = '' - make clean - make DESTDIR=$out PREFIX=/ all - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib $out/sbin $out/etc/tlspool/ $out/include/${pname}/pulleyback - make DESTDIR=$out PREFIX=/ install - cp -R etc/* $out/etc/tlspool/ - cp include/tlspool/*.h $out/include/${pname} - cp pulleyback/*.h $out/include/${pname}/pulleyback/ - cp src/*.h $out/include/${pname} + postInstall = '' + mkdir -p $out/include/${pname}/pulleyback $out/etc/tlspool + cp -R $src/etc/* $out/etc/tlspool/ + cp $src/include/tlspool/*.h $out/include/${pname} + cp $src/pulleyback/*.h $out/include/${pname}/pulleyback/ + cp $src/src/*.h $out/include/${pname} ''; meta = with stdenv.lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; - license = licenses.bsd2; + license = licenses.gpl3; homepage = http://www.tlspool.org; maintainers = with maintainers; [ leenaars qknight ]; }; diff --git a/pkgs/tools/networking/tlspool/fixing-rpath.patch b/pkgs/tools/networking/tlspool/fixing-rpath.patch deleted file mode 100644 index 6a434f3e4008..000000000000 --- a/pkgs/tools/networking/tlspool/fixing-rpath.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8082f050794f771d1afb8e5c3d08862fc633922b Mon Sep 17 00:00:00 2001 -From: joachim schiele <js@lastlog.de> -Date: Wed, 1 Mar 2017 13:12:19 +0100 -Subject: [PATCH] RPATH is back - https://github.com/arpa2/tlspool/issues/58#issuecomment-283318767 - ---- - tool/Makefile | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/tool/Makefile b/tool/Makefile -index c1e6ce9..9a15012 100644 ---- a/tool/Makefile -+++ b/tool/Makefile -@@ -18,9 +18,17 @@ LIBS = - - PREFIX = /usr/local - -+DIR := ${CURDIR} -+LIBDIR := "" -+ifndef DESTDIR -+ LIBDIR=$(DIR)/../lib/ -+else -+ LIBDIR=$(DESTDIR)/lib -+endif -+ - tlspool_CFLAGS = - tlspool_LIBS = ../lib/libtlspool.so --tlspool_LDFLAGS = -L ../lib -ltlspool -+tlspool_LDFLAGS = -L ../lib -ltlspool -Wl,-rpath,$(LIBDIR) - - donai_CFLAGS = -DDONAI_ONLY_TEXTPROC - donai_SRC = ../src/donai.c --- -2.11.1 - diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index cc2f994d0d54..ed5c30aa42b5 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.8"; + version = "1.7.0"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "0jfxhh4gc5amhndikskz1s7da27ycn442j3l20bm992n7zijid73"; + sha256 = "18i6p6zqmbs9gj57mz3iwz828csaab26gb534b8wrn0kzdqr1pcl"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 0c37043de9bb..3e77117e55f0 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1nja7n6pc45azd3l1xyvav89855lvcgwabrvf34rps81dbl8cnl4"; + sha256 = "0biy02vyhdwghy9qjmjwlfd8hzaz9gfsssd53ng6zpww4wkkiydz"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index ff54e1ab2d21..39674d22aa1d 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libpcap, python2 }: +{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2 }: stdenv.mkDerivation rec { name = "vde2-2.3.2"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( + fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; + sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; + } + ); + + buildInputs = [ openssl libpcap python2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b31ae93066ef..e2d4712d5bc3 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, pkgconfig, perl -, libidn2, zlib, pcre, libuuid, libiconv +, libidn2, zlib, pcre, libuuid, libiconv, libintl , IOSocketSSL, LWP, python3, lzip , libpsl ? null , openssl ? null }: @@ -25,12 +25,10 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's/localhost/127.0.0.1/g' done - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export LIBS="-liconv -lintl" ''; - nativeBuildInputs = [ gettext pkgconfig perl lzip ]; - buildInputs = [ libidn2 libiconv zlib pcre libuuid ] + nativeBuildInputs = [ gettext pkgconfig perl lzip libiconv libintl ]; + buildInputs = [ libidn2 zlib pcre libuuid ] ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (openssl != null) openssl ++ stdenv.lib.optional (libpsl != null) libpsl diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 48a3d1591fc9..4a40c3200407 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done - '' + stdenv.lib.optionalString (stdenv.isDarwin || stdenv.hostPlatform.isMusl) '' - echo "whois_LDADD += -liconv" >> Makefile ''; makeFlags = [ "HAVE_ICONV=1" ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 03831f9b8b87..a55fd33f8991 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: +{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }: stdenv.mkDerivation { name = "disnix-0.8"; - + src = fetchurl { url = https://github.com/svanderburg/disnix/files/1756701/disnix-0.8.tar.gz; sha256 = "02cmj1jqk5i90szjsn5csr7qb7n42v04rvl9syx0zi9sx9ldnb0w"; }; - + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; + buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix new file mode 100644 index 000000000000..c12b82a61e17 --- /dev/null +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -0,0 +1,32 @@ +{ pkgs, stdenv, fetchFromGitHub, mypy, python3 }: +let self = stdenv.mkDerivation rec { + name = "nix-pin-${version}"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "timbertson"; + repo = "nix-pin"; + rev = "version-0.1.2"; + sha256 = "1zwfb5198qzbjwivgiaxbwva9frgrrqaj92nw8vz95yi08pijssh"; + }; + buildInputs = [ python3 mypy ]; + buildPhase = '' + mypy bin/* + ''; + installPhase = '' + mkdir "$out" + cp -r bin share "$out" + ''; + passthru = { + callWithPins = path: args: + import "${self}/share/nix/call.nix" { + inherit pkgs path args; + }; + }; + meta = with stdenv.lib; { + homepage = "https://github.com/timbertson/nix-pin"; + description = "nixpkgs development utility"; + license = licenses.mit; + maintainers = [ maintainers.timbertson ]; + platforms = platforms.all; + }; +}; in self diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix new file mode 100644 index 000000000000..2b813638a11a --- /dev/null +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, python3 +, fetchFromGitHub +, nix +, makeWrapper +}: + +python3.pkgs.buildPythonApplication rec { + pname = "nix-review"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-review"; + rev = version; + sha256 = "06lj3q6405fw18fq1xg0bm52cwlwx94lx5hn4zpz3rxl5g49wiyz"; + }; + + buildInputs = [ makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/nix-review --prefix PATH : ${nix}/bin + ''; + + meta = with stdenv.lib; { + description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; + homepage = https://github.com/Mic92/nix-review; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5140ddd0283d..a2c30318072d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli +, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , libseccomp, busybox-sandbox-shell , hostPlatform, buildPlatform @@ -30,12 +30,13 @@ let buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals is20 [ brotli ] # Since 1.12 - ++ lib.optional (hostPlatform.isSeccomputable) libseccomp + ++ lib.meta.enableIfAvailable libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; customMemoryManagement = false; - }); + }) + ++ lib.optional fromGit boost; propagatedBuildInputs = [ boehmgc ]; @@ -60,7 +61,7 @@ let hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system ) ''--with-system=${hostPlatform.nix.system}'' # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ++ lib.optional (!hostPlatform.isSeccomputable) "--disable-seccomp-sandboxing"; + ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing"; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -94,16 +95,19 @@ let passthru = { inherit fromGit; }; }; - perl-bindings = { nix }: stdenv.mkDerivation { + perl-bindings = { nix, needsBoost ? false }: stdenv.mkDerivation { name = "nix-perl-" + nix.version; inherit (nix) src; postUnpack = "sourceRoot=$sourceRoot/perl"; + # This is not cross-compile safe, don't have time to fix right now + # but noting for future travellers. nativeBuildInputs = [ perl pkgconfig curl nix libsodium ] - ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ]; + ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ] + ++ lib.optional needsBoost boost; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" @@ -135,19 +139,19 @@ in rec { }; }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; - nixUnstable = nix; -/* nixUnstable = (lib.lowPrio (common rec { - name = "nix-2.0${suffix}"; - suffix = "pre5968_a6c0b773"; + name = "nix-2.1${suffix}"; + suffix = "pre6148_a4aac7f"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a6c0b773b72d4e30690e01f1f1dcffc28f2d9ea1"; - sha256 = "0i8wcblcjw3291ba6ki4llw3fgm8ylp9q52kajkyr58dih537346"; + rev = "a4aac7f88c59c97299027c9668461c637bbc6a72"; + sha256 = "1250fg1rgzcd0qy960nhl2bw9hsc1a6pyz11rmxasr0h3j1a2z53"; }; fromGit = true; - })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; -*/ + })) // { perl-bindings = perl-bindings { + nix = nixUnstable; + needsBoost = true; + }; }; } diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index daecb8746eaf..ec82115087b7 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5.2"; + version = "1.6"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb"; + sha256 = "0f8ql1a9maf9swl8q054b1haxqckdn78p2xgpwl7paxc98l67i7x"; }; }) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index d9c9661d41a4..f392e0f50ed1 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -25,6 +25,7 @@ python2Packages.buildPythonApplication { pysqlite datadog digital-ocean + libvirt ]; doCheck = false; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 04b29bcf8f7c..db490c7822f8 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { ''; makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; - patches = [ ./apg.patch ]; + patches = [ + ./apg.patch + ./phony-install-target.patch + ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile @@ -64,6 +67,6 @@ stdenv.mkDerivation rec { homepage = http://www.adel.nursat.kz/apg/; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/apg/phony-install-target.patch b/pkgs/tools/security/apg/phony-install-target.patch new file mode 100644 index 000000000000..9edf50b4b599 --- /dev/null +++ b/pkgs/tools/security/apg/phony-install-target.patch @@ -0,0 +1,11 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2003-08-08 00:40:39.000000000 +0900 ++++ b/Makefile 2018-04-05 22:29:39.284191020 +0900 +@@ -142,6 +142,7 @@ + strip ${CS_PROGNAME} + strip ${BFM_PROGNAME} + ++.PHONY: install + install: + if test -x ./apg; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ diff --git a/pkgs/tools/security/bettercap/Gemfile.lock b/pkgs/tools/security/bettercap/Gemfile.lock deleted file mode 100644 index 9260d1fd5ab6..000000000000 --- a/pkgs/tools/security/bettercap/Gemfile.lock +++ /dev/null @@ -1,42 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - bettercap (1.6.2) - colorize (~> 0.8.0) - em-proxy (~> 0.1, >= 0.1.8) - net-dns (~> 0.8, >= 0.8.0) - network_interface (~> 0.0, >= 0.0.1) - packetfu (~> 1.1, >= 1.1.10) - pcaprub (~> 0.12, >= 0.12.0, <= 1.1.11) - rubydns (~> 1.0, >= 1.0.3) - celluloid (0.16.0) - timers (~> 4.0.0) - celluloid-io (0.16.2) - celluloid (>= 0.16.0) - nio4r (>= 1.1.0) - colorize (0.8.1) - em-proxy (0.1.9) - eventmachine - eventmachine (1.2.5) - hitimes (1.2.6) - net-dns (0.8.0) - network_interface (0.0.2) - nio4r (2.2.0) - packetfu (1.1.13) - pcaprub - pcaprub (0.12.4) - rubydns (1.0.3) - celluloid (= 0.16.0) - celluloid-io (= 0.16.2) - timers (~> 4.0.1) - timers (4.0.4) - hitimes - -PLATFORMS - ruby - -DEPENDENCIES - bettercap - -BUNDLED WITH - 1.14.6 diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 46832e83ac96..a85ce7df9216 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,16 +1,23 @@ -{ lib, bundlerEnv, ruby, libpcap}: +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue }: -bundlerEnv rec { +buildGoPackage rec { name = "bettercap-${version}"; + version = "2.4"; - version = (import gemset).bettercap.version; - inherit ruby; - gemdir = ./.; - gemset = ./gemset.nix; + goPackagePath = "github.com/bettercap/bettercap"; - buildInputs = [ libpcap ruby ]; + src = fetchFromGitHub { + owner = "bettercap"; + repo = "bettercap"; + rev = "v${version}"; + sha256 = "1k1ank8z9sr3vxm86dfcrn1y3qa3gfwyb2z0fvkvi38gc88pfljb"; + }; + + buildInputs = [libpcap libnfnetlink libnetfilter_queue pkgconfig]; + + goDeps = ./deps.nix; - meta = with lib; { + meta = with stdenv.lib; { description = "A man in the middle tool"; longDescription = '' BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. diff --git a/pkgs/tools/security/bettercap/deps.nix b/pkgs/tools/security/bettercap/deps.nix new file mode 100644 index 000000000000..6a03e88000c2 --- /dev/null +++ b/pkgs/tools/security/bettercap/deps.nix @@ -0,0 +1,228 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/adrianmo/go-nmea"; + fetch = { + type = "git"; + url = "https://github.com/adrianmo/go-nmea"; + rev = "22095aa1b48050243d3eb9a001ca80eb91a0c6fa"; + sha256 = "0hgjfmnff794j537kbrjcsxzr9xyggm09rw3wp2xrzahh9pxdlm5"; + }; + } + { + goPackagePath = "github.com/bettercap/gatt"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/gatt"; + rev = "6475b946a0bff32e906c25d861f2b1c6d2056baa"; + sha256 = "0f2n35yz6fcbmswy1wyv2z72d3iia7xxapjkvwkbj2zqfxxwn26s"; + }; + } + { + goPackagePath = "github.com/bettercap/readline"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/readline"; + rev = "9cec905dd29109b64e6752507fba73474c2efd46"; + sha256 = "1lsnyckg2l78hz4la8dhwvjsyff706khw10nxds5afzl4mrih3vn"; + }; + } + { + goPackagePath = "github.com/chifflier/nfqueue-go"; + fetch = { + type = "git"; + url = "https://github.com/chifflier/nfqueue-go"; + rev = "61ca646babef3bd4dea1deb610bfb0005c0a1298"; + sha256 = "1i1q2xl86f3s9x3j2ffxprwqhcrkh4w23hh4ib7jksxvaq36v33l"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "bb3d318650d48840a39aa21a027c6630e198e626"; + sha256 = "1lqd8ix3cb164j5iazjby2jpa6bdsflhy0h9mi4yldvvcvrc194c"; + }; + } + { + goPackagePath = "github.com/elazarl/goproxy"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/goproxy"; + rev = "a96fa3a318260eab29abaf32f7128c9eb07fb073"; + sha256 = "0grm4n28mkj2w4c42ghl797svxykv1z3hsdi1ihnrvq6pr08xky4"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "437797734d06eec5394734a84cb5b59c82a66ee6"; + sha256 = "09ajj73rwsxc03dmm39g8b0qaz88h6gnraw2xn8h7z57qqv6ikcx"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; + sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; + }; + } + { + goPackagePath = "github.com/google/gopacket"; + fetch = { + type = "git"; + url = "https://github.com/google/gopacket"; + rev = "1d3841317373a001d49e2abcc5be4e442211d454"; + sha256 = "1jffnrvrma3rm5zxmig52145y9bxc3b4ys4jr1nwmq43jk15s3kp"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "4dbd923b0c9e99ff63ad54b0e9705ff92d3cdb06"; + sha256 = "02d5c3vh81v2j6g6fnca87ksxjx0xrgp7x7iivfw5x92q1l5h254"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "eb925808374e5ca90c83401a40d711dc08c0c0f6"; + sha256 = "0swncxnl97pmsl78q1p4npx9jghnrzj7alkxab89jy9cza5w165x"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-vhost"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-vhost"; + rev = "06d84117953b22058c096b49a429ebd4f3d3d97b"; + sha256 = "0wliilsybm7xf5h685a23rsm8bnlhkr332pkdkhf32q16sr1a9rk"; + }; + } + { + goPackagePath = "github.com/jpillora/go-tld"; + fetch = { + type = "git"; + url = "https://github.com/jpillora/go-tld"; + rev = "a31ae10e978ab5f352c5dad2cfbd60546dcea75f"; + sha256 = "1gfxnbr1xsnlja2qpqxis8ynnk1lrz9c65aah7vc2c44g8vyy78x"; + }; + } + { + goPackagePath = "github.com/malfunkt/iprange"; + fetch = { + type = "git"; + url = "https://github.com/malfunkt/iprange"; + rev = "3a31f5ed42d2d8a1fc46f1be91fd693bdef2dd52"; + sha256 = "0gv5w678r74jval675xp0y1hzpf7mm5m9apa1rz9krxc9zd0ycr8"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mdlayher/dhcp6"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/dhcp6"; + rev = "e26af0688e455a82b14ebdbecf43f87ead3c4624"; + sha256 = "0fvw8zz2yhla03jfb79bby9vg4rbmaj39v00ypb8yl4fb696zfip"; + }; + } + { + goPackagePath = "github.com/mgutz/ansi"; + fetch = { + type = "git"; + url = "https://github.com/mgutz/ansi"; + rev = "9520e82c474b0a04dd04f8a40959027271bab992"; + sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; + }; + } + { + goPackagePath = "github.com/mgutz/logxi"; + fetch = { + type = "git"; + url = "https://github.com/mgutz/logxi"; + rev = "aebf8a7d67ab4625e0fd4a665766fef9a709161b"; + sha256 = "1f8sqibkzz9wfplvvblz9s0xvvmhkd2af8ghcsmjw8818gcrzsqx"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; + sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; + sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; + }; + } + { + goPackagePath = "github.com/tarm/serial"; + fetch = { + type = "git"; + url = "https://github.com/tarm/serial"; + rev = "eaafced92e9619f03c72527efeab21e326f3bc36"; + sha256 = "09pii3q72bygv40v9xsh3nzj821iwqwa0b14wvkagid8mfnl3a7k"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "378d26f46672a356c46195c28f61bdb4c0a781dd"; + sha256 = "1d02saysx8lh2wv8s915k4shiqicg4j1fh6sxmcxy6bvywax2q9c"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-sourcemap/sourcemap"; + rev = "b019cc30c1eaa584753491b0d8f8c1534bf1eb44"; + sha256 = "03k44fdrnknba05f7cd58lq4rzk7jdpiqksmc0wxrdzwschrbgw8"; + }; + } +] \ No newline at end of file diff --git a/pkgs/tools/security/bettercap/gemset.nix b/pkgs/tools/security/bettercap/gemset.nix deleted file mode 100644 index bd5c33ba22c6..000000000000 --- a/pkgs/tools/security/bettercap/gemset.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - bettercap = { - dependencies = ["colorize" "em-proxy" "net-dns" "network_interface" "packetfu" "pcaprub" "rubydns"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mns96yfyfnksk720p8k83qkwwsid4sicwgrzxaa9gbc53aalll0"; - type = "gem"; - }; - version = "1.6.2"; - }; - celluloid = { - dependencies = ["timers"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; - type = "gem"; - }; - version = "0.16.0"; - }; - celluloid-io = { - dependencies = ["celluloid" "nio4r"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; - type = "gem"; - }; - version = "0.16.2"; - }; - colorize = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; - type = "gem"; - }; - version = "0.8.1"; - }; - em-proxy = { - dependencies = ["eventmachine"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yzkg6jkmcg859b5mf13igpf8q2bjhsmqjsva05948fi733w5n2j"; - type = "gem"; - }; - version = "0.1.9"; - }; - eventmachine = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; - type = "gem"; - }; - version = "1.2.5"; - }; - hitimes = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06222h9236jw9jgmdlpi0q7psac1shvxqxqx905qkvabmxdxlfar"; - type = "gem"; - }; - version = "1.2.6"; - }; - net-dns = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12nal6vhdyg0pbcqpsxqr59h7mbgdhcqp3v0xnzvy167n40gabf9"; - type = "gem"; - }; - version = "0.8.0"; - }; - network_interface = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xh4knfq77ii4pjzsd2z1p3nd6nrcdjhb2vi5gw36jqj43ffw0zp"; - type = "gem"; - }; - version = "0.0.2"; - }; - nio4r = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jjrj7vs29w6dfgsxq08226jfbi2j0x62lf4p9zmvyp19dj4z00a"; - type = "gem"; - }; - version = "2.2.0"; - }; - packetfu = { - dependencies = ["pcaprub"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll"; - type = "gem"; - }; - version = "1.1.13"; - }; - pcaprub = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; - type = "gem"; - }; - version = "0.12.4"; - }; - rubydns = { - dependencies = ["celluloid" "celluloid-io" "timers"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cvj8li8shz7zn1rc5hdrkqmvr9j187g4y28mvkfvmv1j9hdln62"; - type = "gem"; - }; - version = "1.0.3"; - }; - timers = { - dependencies = ["hitimes"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; - type = "gem"; - }; - version = "4.0.4"; - }; -} \ No newline at end of file diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index c6d4a78e6b4b..c7ed511753d4 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -1,9 +1,9 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -{ stdenv, buildGoPackage, fetchFromGitHub }: +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }: buildGoPackage rec { name = "browserpass-${version}"; - version = "2.0.13"; + version = "2.0.18"; goPackagePath = "github.com/dannyvankooten/browserpass"; @@ -13,9 +13,14 @@ buildGoPackage rec { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "0pch0jddphgaaw208ddqjhnkiy5916n0kjxfza1cpc78fa8zw82l"; + sha256 = "0wszjpxfa0krr2zdx7a33vl1r86k74dpy5c940r6ww1zbgqzcibg"; }; + postPatch = '' + substituteInPlace browserpass.go \ + --replace /usr/local/bin/gpg ${gnupg}/bin/gpg + ''; + postInstall = '' host_file="$bin/bin/browserpass" mkdir -p "$bin/etc" diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index ce7f1d0e1b4b..07061aa0d117 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -7,11 +7,11 @@ with pythonPackages; buildPythonApplication rec { pname = "diceware"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0855n4dh16ws1dhw1ixxwk3wx7qr45xff7pn32pjg58p4z4cx168"; + sha256 = "22a998361fd2afbc7890062e228235b3501084de1e6a5bb61f16d2637977f50d"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index a8de8742dd5c..30e8d4303dc1 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.10.2"; in +let version = "0.10.3.1"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1asn9gp0ybz6fak991vki9vln4ijramvr13rbwpxyj5wfmnh05r5"; + sha256 = "03gljmqykwwvwxcfhqqfccmnsjhsl93052i38r9mf7hj4jj8v7x5"; }; propagatedBuildInputs = [ gamin ] @@ -26,6 +26,8 @@ pythonPackages.buildPythonApplication { doCheck = false; preInstall = '' + substituteInPlace setup.py --replace /usr/share/doc/ share/doc/ + # see https://github.com/NixOS/nixpkgs/issues/4968 ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out ''; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 7f6f28593d20..3a9c81df2343 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.spacefrogg ]; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index c47780588cd7..87dcbe4e7066 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0mzgibq4dpxh3i9anmwg12xdjry28y83icafhx3j3djg5niqk89z"; + sha256 = "110rf476l3cgn52gh9ia5y0y06y2ialq9dqc12jkhnfhl9gqqkg6"; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 sqlite ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - patches = [ ./fix-libusb-include-path.patch ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index db58c6011f07..743f9136ae53 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -20,6 +20,16 @@ buildGoPackage rec { gnupg ]); + postInstall = '' + mkdir -p \ + $bin/share/bash-completion/completions \ + $bin/share/zsh/site-functions \ + $bin/share/fish/vendor_completions.d + $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass + $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass + $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish + ''; + postFixup = '' wrapProgram $bin/bin/gopass \ --prefix PATH : "${wrapperPath}" diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase/gui.nix index 53b871306d7e..1d50f5498c83 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups -, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr -, nss, pango, systemd, xorg, utillinuxMinimal }: +, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2 +, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: let libPath = stdenv.lib.makeLibraryPath [ @@ -17,6 +17,7 @@ let glib gnome2.GConf gtk2 + libnotify nspr nss pango diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix new file mode 100644 index 000000000000..dac6df56a796 --- /dev/null +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -0,0 +1,44 @@ +{ mkDerivation, stdenv, + fetchFromGitHub, + cmake, extra-cmake-modules, gnumake, + + pass, pass-otp ? null, krunner, +}: +let + pname = "krunner-pass"; + version = "1.3.0"; +in +mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "akermu"; + repo = "krunner-pass"; + rev = "v${version}"; + sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0"; + }; + + buildInputs = [ + pass + pass-otp + krunner + ]; + + nativeBuildInputs = [cmake extra-cmake-modules gnumake]; + + patches = [ + ./pass-path.patch + ]; + + CXXFLAGS = [ + ''-DNIXPKGS_PASS=\"${stdenv.lib.getBin pass}/bin/pass\"'' + ]; + + meta = with stdenv.lib; { + description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; + homepage = https://github.com/akermu/krunner-pass; + license = licenses.gpl3; + maintainers = with maintainers; [ ysndr ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/krunner-pass/pass-path.patch b/pkgs/tools/security/krunner-pass/pass-path.patch new file mode 100644 index 000000000000..4ceb3c5d92da --- /dev/null +++ b/pkgs/tools/security/krunner-pass/pass-path.patch @@ -0,0 +1,13 @@ +diff --git a/pass.cpp b/pass.cpp +index c02f9d0..85c5b99 100644 +--- a/pass.cpp ++++ b/pass.cpp +@@ -193,7 +193,7 @@ void Pass::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &m + } else { + args << "show" << match.text(); + } +- pass->start("pass", args); ++ pass->start(NIXPKGS_PASS, args); + + connect(pass, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + [=](int exitCode, QProcess::ExitStatus exitStatus) { diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index eba707b7d07c..1c235c9d8839 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.jabberwocky.com/software/paperkey/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ skeidel ]; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index ad2afa8ed912..4f9e6c06697c 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -74,8 +74,8 @@ in stdenv.mkDerivation rec { tree which qrencode + procps ] ++ optional tombPluginSupport tomb - ++ optional stdenv.isLinux procps ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 61f51973ed32..3928f61fa96a 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.5.3"; + version = "2.0.1"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq"; + sha256 = "1r5z9g2kc6qf9r2d7vanzdc594apf8fgyn1rh30fvxygl2976yrw"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix new file mode 100644 index 000000000000..88b5c147f303 --- /dev/null +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, unzip, libusb }: + +let + arch = if stdenv.system == "i686-linux" then "32" + else if stdenv.system == "x86_64-linux" then "64" + else throw "Unsupported system: ${stdenv.system}"; +in +stdenv.mkDerivation rec { + name = "pcsc-scm-scl-${version}"; + version = "2.09"; + + src = fetchurl { + url = "http://files.identiv.com/products/smart-card-readers/contactless/scl010-011/Linux_Driver_Ver${version}.zip"; + sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = '' + echo ${stdenv.system} + unzip $src + tar xf "Linux Driver Ver${version}/sclgeneric_${version}_linux_${arch}bit.tar.gz" + cd sclgeneric_${version}_linux_${arch}bit; export sourceRoot=`pwd` + ''; + + # Add support for SCL011 nPA (subsidized model for German eID) + patches = [ ./eid.patch ]; + + installPhase = '' + mkdir -p $out/pcsc/drivers + cp -r proprietary/*.bundle $out/pcsc/drivers + ''; + + libPath = stdenv.lib.makeLibraryPath [ libusb ]; + + fixupPhase = '' + patchelf --set-rpath $libPath \ + $out/pcsc/drivers/SCLGENERIC.bundle/Contents/Linux/libSCLGENERIC.so.${version}; + ''; + + meta = with stdenv.lib; { + description = "SCM Microsystems SCL011 chipcard reader user space driver"; + homepage = http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630; + downloadPage = https://support.identiv.com/scl010-scl011/; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ sephalon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/pkgs/tools/security/pcsc-scm-scl011/eid.patch new file mode 100644 index 000000000000..6e7ffd60f72f --- /dev/null +++ b/pkgs/tools/security/pcsc-scm-scl011/eid.patch @@ -0,0 +1,28 @@ +diff --git a/proprietary/SCLGENERIC.bundle/Contents/Info.plist b/proprietary/SCLGENERIC.bundle/Contents/Info.plist +index 412d6b9..5d1c6cc 100755 +--- a/proprietary/SCLGENERIC.bundle/Contents/Info.plist ++++ b/proprietary/SCLGENERIC.bundle/Contents/Info.plist +@@ -34,6 +34,7 @@ + <string>0x04E6</string> + <string>0x04E6</string> + <string>0x04E6</string> ++ <string>0x04E6</string> + </array> + + <key>ifdProductID</key> +@@ -42,6 +43,7 @@ + <string>0x5291</string> + <string>0x5290</string> + <string>0x5293</string> ++ <string>0x5292</string> + </array> + + <key>ifdFriendlyName</key> +@@ -50,6 +52,7 @@ + <string>SCL010 Contactless Reader</string> + <string>SCR331CL-NTTCom</string> + <string>SCL011G Contactless Reader</string> ++ <string>SCM Microsystems, Inc. SCL011 RFID reader</string> + </array> + + </dict> diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index ac00c1fd5443..07cf15baa224 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, enableEmacs ? false }: let @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { (mkEnable (libsecret != null) "libsecret") (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") + (mkEnable enableEmacs "pinentry-emacs") (mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (gcr != null) "pinentry-gnome3") (mkEnable (qt != null) "pinentry-qt") diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry/mac.nix index 074d71c08308..e555889d1abb 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -12,11 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ xcbuild libiconv Cocoa ncurses ]; - dontUseXcbuild = true; - installPhase = '' mkdir -p $out/Applications - mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications + mv Products/Release/pinentry-mac.app $out/Applications ''; passthru = { diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 908a47e6326f..eb05c3748078 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, pythonPackages, gnupg }: -let version = "2.2.4"; in +let version = "2.2.6"; in pythonPackages.buildPythonApplication { name = "pius-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "jaymzh"; repo = "pius"; rev = "v${version}"; - sha256 = "1yk6ngpk55yjdnzhm5sj675xbzwp7rir816a3aris647gsph1vlx"; + sha256 = "1rffwyjd84rwx1w5yyqckirm1kdj80ldfwjlw91kk74swhpbpzzj"; }; patchPhase = '' diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 3a6c09b9291d..3126dd2b4faf 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radamsa-${version}"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "http://haltp.org/download/${name}.tar.gz"; - sha256 = "1xs9dsrq6qrf104yi9x21scpr73crfikbi8q9njimiw5c1y6alrv"; + url = "https://github.com/aoh/radamsa/releases/download/v${version}/${name}.tar.gz"; + sha256 = "1d2chp45fbdb2v5zpsx6gh3bv8fhcjv0zijz10clcznadnm8c6p2"; }; patchPhase = '' diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix new file mode 100644 index 000000000000..75ea92a786c5 --- /dev/null +++ b/pkgs/tools/security/scallion/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl, ocl-icd }: + +stdenv.mkDerivation rec { + version = "2.1"; + name = "scallion-${version}"; + + src = fetchFromGitHub { + owner = "lachesis"; + repo = "scallion"; + rev = "v${version}"; + sha256 = "1l9aj101xpsaaa6kmmhmq68m6z8gzli1iaaf8xaxbivq0i7vka9k"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mono ]; + + buildPhase = '' + xbuild scallion.sln + ''; + + installPhase = '' + mkdir -p $out/share + cp scallion/bin/Debug/* $out/share/ + makeWrapper ${mono}/bin/mono $out/bin/scallion \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ocl-icd ]} \ + --add-flags $out/share/scallion.exe + ''; + + meta = with stdenv.lib; { + description = "GPU-based tor hidden service name generator"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 13bebe10c623..ba5defbe2151 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.35"; + version = "0.37"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0pzs6iznrar5zkg92gsh6d0zhdi715zwqcb8hh1aaykx9igjb1xw"; + sha256 = "0g1p12jbraj0q5qpvqnbg5v1jwlcx6h04xz5s7jds51l7gf5f9np"; }; prePatch = '' @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = with stdenv.lib; '' - install -Dt $out/lib spectre-meltdown-checker.sh - makeWrapper $out/lib/spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker \ + install -D spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker + wrapProgram $out/bin/spectre-meltdown-checker \ --prefix PATH : ${makeBinPath [ binutils-unwrapped ]} ''; diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index fd81933fb587..9782d00267f5 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://srm.sourceforge.net; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index d344f95573dd..c3bf4f69a46d 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc; buildInputs = - [ coreutils openssh ] ++ - stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; + [ coreutils openssh procps nettools ] + ++ stdenv.lib.optionals stdenv.isLinux [ iptables ]; checkInputs = with python3Packages; [ mock pytest pytestrunner ]; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 8bc94b64be99..54c9bbb14060 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "di-${version}"; - version = "4.44"; + version = "4.45"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "0803lp8kd3mp1jcm17i019xiqxdy85hhs6xk67zib8gmvg500gcn"; + sha256 = "18z56rprhpm6y0s7pqs19yf7ilq7n50020qzxdm9yra77ivdr09z"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 08cdec72c5b9..fbce70e9e8ea 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efibootmgr-${version}"; - version = "15"; + version = "16"; nativeBuildInputs = [ pkgconfig ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "rhboot"; repo = "efibootmgr"; rev = version; - sha256 = "0z7h1dirp8za6lbbf4f3dzn7l1px891rdymhkbqc10yj6gi1jpqp"; + sha256 = "0b27h8vf1b6laln5n0wk2hkzyyh87sxanj7wrz9kimyx03dcq6vi"; }; makeFlags = [ "EFIDIR=nixos" ]; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 7f20e8135011..458820440947 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0ycrdaz0ijkm3xb9fnwzhwi0pdj5c6s636wj4i6lbjbrijbzn4x5"; + sha256 = "0hc7l5z0hw5472bm6p4d9n24bbggv9lgw7px1hqrdkfjghqfnlxh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 9ff5f58f558a..42d34c9a8230 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { - sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792"; + sha256 = "15cqn09ng23k6a70xvxbpjjqlxw46838k7qr9216lcvxwl2banih"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix new file mode 100644 index 000000000000..2244f5c90d37 --- /dev/null +++ b/pkgs/tools/system/gotop/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gotop-${version}"; + version = "1.2.9"; + + goPackagePath = "github.com/cjbassi/gotop"; + + src = fetchFromGitHub { + repo = "gotop"; + owner = "cjbassi"; + rev = version; + sha256 = "07s2f04yhc79vqr1gdh2v974kpn7flp4slnp99mavpa331lv9q8a"; + }; + + meta = with stdenv.lib; { + description = "A terminal based graphical activity monitor inspired by gtop and vtop"; + homepage = https://github.com/cjbassi/gotop; + license = licenses.agpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 992067da50f4..974a95bc0fab 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -3,11 +3,11 @@ IOKit, python }: stdenv.mkDerivation rec { name = "htop-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; - sha256 = "0j07z0xm2gj1vzvbgh4323k4db9mr7drd7gw95mmpqi61ncvwq1j"; + sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; }; nativeBuildInputs = [ python ]; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index fe411edfcdac..c906ad3c8cf1 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = ''Command-line interface to IPMI-enabled devices''; license = licenses.bsd3; homepage = https://sourceforge.net/projects/ipmitool/; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index fdefb508fe51..6b206ea8761a 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.8"; + version = "3.0.9"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0pqi63v9l95px1k0dh68gmbd4pbbpwy0pcg6nr5bi0zy898if135"; + sha256 = "0j4lsfdj2bk1b1vw9l00zv1g4jan05p09szqbzxgqqw2lpnca4i7"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix new file mode 100644 index 000000000000..db0987d70739 --- /dev/null +++ b/pkgs/tools/system/krakenx/default.nix @@ -0,0 +1,23 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "krakenx"; + version = "0.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1vxyindph81srya0pfmb3n64n8h7ghp38ak86vc2zc5nyirf5zq8"; + }; + + propagatedBuildInputs = lib.singleton python3Packages.pyusb; + + doCheck = false; # there are no tests + + meta = with lib; { + description = "Python script to control NZXT cooler Kraken X52/X62"; + homepage = https://github.com/KsenijaS/krakenx; + license = licenses.gpl2; + maintainers = [ maintainers.willibutz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index d9cfc77203e1..c49054f3a67c 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, systemd, polkit, fetchFromGitHub, m4 }: +{ stdenv, go, systemd, polkit, fetchFromGitHub, m4, removeReferencesTo }: stdenv.mkDerivation { name = "localtime-2017-11-07"; @@ -10,10 +10,15 @@ stdenv.mkDerivation { sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; }; - buildInputs = [ go systemd polkit m4 ]; + buildInputs = [ go systemd polkit m4 removeReferencesTo ]; + disallowedRequisites = [ go ]; makeFlags = [ "PREFIX=$(out)" ]; + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + ''; + meta = { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = https://github.com/Stebalien/localtime; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 0149f1d91b61..8fac35fbe431 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lr-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1536d723dm50gxgpf8i9yij8mr0csh662ljhs5bmz0945jwfbx4n"; + sha256 = "0g4iqz8ddv7dsrfhx0828bmc16ff8qp8xh5ya9f0n5qj4zh4cn35"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index c06ba8e541b7..44d5bcf5f38a 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 7eced6973731..aa2f50f2df07 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = http://smarden.org/runit; maintainers = with maintainers; [ rickynils joachifm ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 13ce2414abf0..ed1da8d450dc 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/s6-rc/; description = "A service manager for s6-based systems"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index c1c4527d0a0a..ca1af7a74e4b 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sg.danny.cz/sg/; description = "Utilities that send SCSI commands to devices"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a2230503551f..b356cd1d484a 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, openssl, libcap, curl, which , eventlog, pkgconfig, glib, python, systemd, perl , riemann_c_client, protobufc, pcre, libnet -, json_c, libuuid, libivykis, mongoc, rabbitmq-c }: +, json_c, libuuid, libivykis, mongoc, rabbitmq-c +, libesmtp +}: let pname = "syslog-ng"; @@ -36,12 +38,14 @@ stdenv.mkDerivation rec { libivykis mongoc rabbitmq-c + libesmtp ]; configureFlags = [ "--enable-manpages" "--enable-dynamic-linking" "--enable-systemd" + "--enable-smtp" "--with-ivykis=system" "--with-librabbitmq-client=system" "--with-mongoc=system" diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 7b899e0399ef..3e9511fefdaa 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ansifilter-${version}"; - version = "2.9"; + version = "2.10"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "0fmwb8w1bpfxjwddal6cnhgmip26xqgcanpz2vp8jasklkcc1i7r"; + sha256 = "0gzfxfpic47cs2kqrbvaw166ji62c5nq5cjhh3ngpm2fkm1wzli3"; }; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix new file mode 100644 index 000000000000..9f6b7a7f1227 --- /dev/null +++ b/pkgs/tools/text/cconv/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, autoreconfHook }: +let version = "0.6.3"; in + stdenv.mkDerivation { + name = "cconv-${version}"; + + src = fetchurl { + url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz"; + sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A iconv based simplified-traditional chinese conversion tool"; + homepage = https://github.com/xiaoyjy/cconv; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.redfish64 ]; + }; +} diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix index bf27fc3de5d3..cfb627d70428 100644 --- a/pkgs/tools/text/diction/default.nix +++ b/pkgs/tools/text/diction/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "diction-1.11"; + name = "diction-${version}"; + version = "1.13"; src = fetchurl { - url = "mirror://gnu/diction/${name}.tar.gz"; - sha256 = "1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him"; + url = "http://www.moria.de/~michael/diction/${name}.tar.gz"; + sha256 = "08fi971b8qa4xycxbgb42i6b5ms3qx9zpp5hwpbxy2vypfs0wph9"; }; meta = { diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 8a1de29b0d9c..81b88ff8d835 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.2.3a"; name = "discount-${version}"; src = fetchurl { url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; - sha256 = "17797xiaq0kk152pj4rvd9grg4i518x3glnwg1lgl8rry3dbrzx8"; + sha256 = "0m09x9dd75d3pqvmrwr0kqw3dm2x3ss9clj5fxf7lq79lbyxbxbm"; }; patches = ./fix-configure-path.patch; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 2d18edeb44d6..e60ead5bc8f5 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "LanguageTool-${version}"; - version = "4.0"; + version = "4.1"; src = fetchzip { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "0nfqn04fb5kvxvpsc6xbgj03rmqcsn8vy2xj0zazijhvbxaf0zfb"; + sha256 = "0qc4z5rl9239lqfi2jrggzmjkx4f33n0arlqm5xgfaqgi8wypz0l"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 5bbe8cfd0943..4ea36ddbd5e7 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { name = "mdbook-${version}"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0m0vprjpd02z4nr3vd4qha2jka7l36k4liw8jcbf4xs09c584sjv"; + sha256 = "0k86zjrqb5wdxvmzz9cxl9c0mpjnr46fh5r5sbs5q9fk2h4lp4ip"; }; - cargoSha256 = "19hpr78p9rzgirq6fjw8v11d5mgcglms6vbqgjyvg49xmkklsqzr"; - depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + cargoSha256 = "0gj1x996lvn9j87dfmng2fn3fgz8rgvrw3akcz641psj4hlfgm5w"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 187a6526dc3c..3feecdf4f53c 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - meta = { description = "Simple .odt to .txt converter"; homepage = http://stosberg.net/odt2txt; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index acf657d2292c..9946da614c71 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook, -texinfo, libiconv }: +{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook +, texinfo, libiconv, libintl }: stdenv.mkDerivation rec { name = "recode-3.7-2fd838565"; @@ -12,15 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ]; + buildInputs = [ libintl ]; preAutoreconf = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" "" sed -i '/^AM_C_PROTOTYPES/d' configure.ac substituteInPlace src/Makefile.am --replace "ansi2knr" "" - '' - + stdenv.lib.optionalString stdenv.isDarwin '' - export LDFLAGS=-lintl ''; #doCheck = true; # doesn't work yet diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index c1b4aa1cf2c6..361b6782526b 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + buildInputs = [ libiconv ]; preConfigure = "./bootstrap"; diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index ec99e8b4a27a..b1671ad38b53 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "untex-${version}"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://www.ctan.org/tex-archive/support/untex/${name}.tar.gz"; - sha256 = "07p836jydd5yjy905m5ylnnac1h4cc4jsr41panqb808mlsiwmmy"; + url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz"; + sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix new file mode 100644 index 000000000000..337aa61af13a --- /dev/null +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, makeWrapper, dev_only_shellcheck ? null, +fetchFromGitHub, + +fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused, +docbook5 +}: +stdenv.mkDerivation rec { + name = "xmloscopy-${version}"; + version = "v0.1.2"; + + buildInputs = [ + makeWrapper + dev_only_shellcheck + ]; + + spath = lib.makeBinPath [ + fzf + coreutils + libxml2 + libxslt + jing + findutils + gnugrep + gnused + ]; + + src = fetchFromGitHub { + owner = "grahamc"; + repo = "xmloscopy"; + rev = version; + sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456"; + }; + + installPhase = '' + sed -i "s/hard to say/${version}/" ./xmloscopy + type -P shellcheck && shellcheck ./xmloscopy + chmod +x ./xmloscopy + patchShebangs ./xmloscopy + mkdir -p $out/bin + cp ./xmloscopy $out/bin/ + wrapProgram $out/bin/xmloscopy \ + --set RNG "${docbook5}/xml/rng/docbook/docbook.rng" \ + --set PATH "${spath}" + ''; + + meta = { + description = "wtf is my docbook broken?"; + homepage = https://github.com/grahamc/xmloscopy; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile index 92abd4f5cf2b..54509c601e36 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile @@ -4,4 +4,6 @@ gem 'asciidoctor-diagram' gem 'asciidoctor-bespoke' gem 'asciidoctor-pdf' gem 'asciidoctor-latex' +gem 'asciidoctor-mathematical' +gem 'coderay' gem 'pygments.rb' diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 25800ed3a1ca..6c52a2c416a1 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -1,82 +1,93 @@ GEM remote: https://rubygems.org/ specs: - Ascii85 (1.0.2) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + Ascii85 (1.0.3) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) afm (0.2.2) - asciidoctor (1.5.6.1) + asciidoctor (1.5.6.2) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) thread_safe (~> 0.3.5) - asciidoctor-diagram (1.5.4) + asciidoctor-diagram (1.5.9) asciidoctor (~> 1.5.0) asciidoctor-latex (1.5.0.17.dev) asciidoctor (~> 1.5, >= 1.5.2) htmlentities (~> 4.3) opal (~> 0.6.3) + asciidoctor-mathematical (0.2.2) + asciidoctor (~> 1.5, >= 1.5.0) + mathematical (~> 1.5, >= 1.5.8) + ruby-enum (~> 0.4) asciidoctor-pdf (1.5.0.alpha.16) asciidoctor (>= 1.5.0) - prawn (>= 1.3.0, < 3.0.0) - prawn-icon (= 1.2.0) - prawn-svg (>= 0.21.0, < 0.26.0) + prawn (>= 1.3.0, < 2.3.0) + prawn-icon (= 1.3.0) + prawn-svg (>= 0.21.0, < 0.28.0) prawn-table (= 0.2.2) - prawn-templates (= 0.0.3) + prawn-templates (>= 0.0.3, <= 0.1.1) safe_yaml (~> 1.0.4) - thread_safe (~> 0.3.5) + thread_safe (~> 0.3.6) treetop (= 1.5.3) - concurrent-ruby (1.0.4) - css_parser (1.4.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + css_parser (1.6.0) addressable hashery (2.1.2) htmlentities (4.3.4) - json (2.0.3) - multi_json (1.12.1) + i18n (1.0.0) + concurrent-ruby (~> 1.0) + json (2.1.0) + mathematical (1.6.11) + ruby-enum (~> 0.4) + multi_json (1.13.1) opal (0.6.3) source_map sprockets - pdf-core (0.6.1) - pdf-reader (1.4.1) + pdf-core (0.7.0) + pdf-reader (2.1.0) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk polyglot (0.3.5) - prawn (2.1.0) - pdf-core (~> 0.6.1) - ttfunk (~> 1.4.0) - prawn-icon (1.2.0) + prawn (2.2.2) + pdf-core (~> 0.7.0) + ttfunk (~> 1.5) + prawn-icon (1.3.0) prawn (>= 1.1.0, < 3.0.0) - prawn-svg (0.25.2) + prawn-svg (0.27.1) css_parser (~> 1.3) prawn (>= 0.11.1, < 3) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - prawn-templates (0.0.3) - pdf-reader (~> 1.3) - prawn (>= 0.15.0) - public_suffix (2.0.5) - pygments.rb (1.1.1) + prawn-templates (0.1.1) + pdf-reader (~> 2.0) + prawn (~> 2.2) + public_suffix (3.0.2) + pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.1) + rack (2.0.4) + ruby-enum (0.7.2) + i18n ruby-rc4 (0.1.5) safe_yaml (1.0.4) - slim (3.0.7) - temple (~> 0.7.6) + slim (3.0.9) + temple (>= 0.7.6, < 0.9) tilt (>= 1.3.3, < 2.1) source_map (3.0.1) json sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - temple (0.7.7) - thread_safe (0.3.5) - tilt (2.0.6) + temple (0.8.0) + thread_safe (0.3.6) + tilt (2.0.8) treetop (1.5.3) polyglot (~> 0.3) - ttfunk (1.4.0) + ttfunk (1.5.1) PLATFORMS ruby @@ -86,8 +97,10 @@ DEPENDENCIES asciidoctor-bespoke asciidoctor-diagram asciidoctor-latex + asciidoctor-mathematical asciidoctor-pdf + coderay pygments.rb BUNDLED WITH - 1.13.6 + 1.14.6 diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 02b57ee3a13b..f8cfe44cbd73 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, bundlerApp, ruby, curl }: +{ stdenv, lib, bundlerApp, ruby, curl + # Dependencies of the 'mathematical' package +, cmake, bison, flex, glib, pkgconfig, cairo +, pango, gdk_pixbuf, libxml2, python3, patchelf +}: bundlerApp { inherit ruby; @@ -11,8 +15,37 @@ bundlerApp { "asciidoctor-latex" "asciidoctor-pdf" "asciidoctor-safe" + "asciidoctor-mathematical" ]; + gemConfig = { + mathematical = attrs: { + buildInputs = [ + cmake + bison + flex + glib + pkgconfig + cairo + pango + gdk_pixbuf + libxml2 + python3 + ]; + + # The ruby build script takes care of this + dontUseCmakeConfigure = true; + + # For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here + postFixup = lib.optionalString stdenv.isLinux '' + soPath="$out/lib/ruby/gems/2.4.0/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" + ${patchelf}/bin/patchelf \ + --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \ + "$soPath" + ''; + }; + }; + meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; homepage = http://asciidoctor.org/; diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 43011b22b76a..4ae146d289ba 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -1,11 +1,12 @@ { addressable = { + dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.2"; }; afm = { source = { @@ -18,20 +19,21 @@ Ascii85 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q"; + sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "c4371c419306d69152809eb896c291ca09969dc26ca34be36f4eab82914fceca"; + sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f"; type = "gem"; }; - version = "1.5.6.1"; + version = "1.5.6.2"; }; asciidoctor-bespoke = { + dependencies = ["asciidoctor" "slim" "thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1awy933sswxvi2hxpll3rh9phxcvmqhrbb91m6ibjchnf7qsl3zk"; @@ -40,14 +42,16 @@ version = "1.0.0.alpha.1"; }; asciidoctor-diagram = { + dependencies = ["asciidoctor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kqlij2yc84zqxmb39bqi9pihapgac7gxyzrwm4kxfnmfdqmxrk"; + sha256 = "0rj02i00d9hkzqzzrk5al9rn8yv5x0wsnrv9y6j4k8rfylm69c1r"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.9"; }; asciidoctor-latex = { + dependencies = ["asciidoctor" "htmlentities" "opal"]; source = { remotes = ["https://rubygems.org"]; sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz"; @@ -55,29 +59,48 @@ }; version = "1.5.0.17.dev"; }; + asciidoctor-mathematical = { + dependencies = ["asciidoctor" "mathematical" "ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18igbvs70dnlrzgl62jcc0vfxhlb4r7v9bq3qf1v80l17lvq1x8f"; + type = "gem"; + }; + version = "0.2.2"; + }; asciidoctor-pdf = { + dependencies = ["asciidoctor" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f6b2a1533577dfba218de5dd886771447e4d1cb670b81d2c3bf3a180e6029a1"; + sha256 = "1899c071hfmzqg9822v7rg8y8iqlfy3dhpfy32ignzap6cajlsqg"; type = "gem"; }; version = "1.5.0.alpha.16"; }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; css_parser = { + dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aqv5ds1109s0g76ybvvaff41a71i03fjy0ix6272r8n0gdnjc3f"; + sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; type = "gem"; }; - version = "1.4.8"; + version = "1.6.0"; }; hashery = { source = { @@ -95,23 +118,42 @@ }; version = "4.3.4"; }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "191c2xzlvn42sb8dz6gjy0qaigri4chfvflg3d4k6n58flm0yp65"; + type = "gem"; + }; + version = "1.0.0"; + }; json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + mathematical = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xkr613hmzbhmm6zv92zlcjyfp0a6i2b3q3hg24lmj4j5l85p21"; type = "gem"; }; - version = "2.0.3"; + version = "1.6.11"; }; multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; opal = { + dependencies = ["source_map" "sprockets"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0dmdxhmg43ibd4bsldssslsz8870hzknwcxiv9l1838lh6hd390k"; @@ -122,18 +164,19 @@ pdf-core = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1s0h0kkddkivgpf7k1jni9nzqxw09d9bgcsvyga407ixbiipkgfy"; + sha256 = "19llwch2wfg51glb0kff0drfp3n6nb9vim4zlvzckxysksvxpby1"; type = "gem"; }; - version = "0.6.1"; + version = "0.7.0"; }; pdf-reader = { + dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ivmgm73jjk3hv7896mgld5ki8jhxdvksw766rqxp6i863y9v4jq"; + sha256 = "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45"; type = "gem"; }; - version = "1.4.1"; + version = "2.1.0"; }; polyglot = { source = { @@ -144,30 +187,34 @@ version = "0.3.5"; }; prawn = { + dependencies = ["pdf-core" "ttfunk"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18f99v3r0jzym38s68hr0y8anrilv98shmsdf763ascd0gc5dj2n"; + sha256 = "1qdjf1v6sfl44g3rqxlg8k4jrzkwaxgvh2l4xws97a8f3xv4na4m"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.2"; }; prawn-icon = { + dependencies = ["prawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "101npavqvv5w44vgphlkqn3gdawxmsnd4j8bk6lzbxz7niqgaqny"; + sha256 = "1pz8n7ajkfmflw05dib2l9qkzkfzwwbzx63qcvjr14k1dnbpx7qk"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; prawn-svg = { + dependencies = ["css_parser" "prawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19zc7i6jxycs9m00frvv9g3x98sgzsyb1xf1xnn3h1ki574ibnip"; + sha256 = "0fykcs10q2j6h04riav1kzrw77mga6gh1rxbh7q0ab6gkr0wamzx"; type = "gem"; }; - version = "0.25.2"; + version = "0.27.1"; }; prawn-table = { + dependencies = ["prawn"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1nxd6qmxqwl850icp18wjh5k0s3amxcajdrkjyzpfgq0kvilcv9k"; @@ -176,36 +223,47 @@ version = "0.2.2"; }; prawn-templates = { + dependencies = ["pdf-reader" "prawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d14sq01c5zn0ywzazwcz6lkk235za36km53wqbf1bqabdb1ls10"; + sha256 = "1gs894sj9zdlwx59h3rk4p0l3y8r18p22zhnfiyx9lngsa56gcrj"; type = "gem"; }; - version = "0.0.3"; + version = "0.1.1"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.2"; }; "pygments.rb" = { + dependencies = ["multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g0ipgxqfw0vf2md3s8sqf8y7m5lxqza2gwnr05z3vrf1nc6v6hk"; + sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1"; + sha256 = "1mfriw2r2913dv8qf3p87n7yal3qfsrs478x2qz106v8vhmxa017"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.4"; + }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; }; ruby-rc4 = { source = { @@ -224,14 +282,16 @@ version = "1.0.4"; }; slim = { + dependencies = ["temple" "tilt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "122hmc2kn3g151m8c41imadw29mghnsjwyzj8wav5zb1q69y4iqp"; + sha256 = "0zwz083xsbnlrma1pfkzrqc1fqm90fidn915vlifvkzl5fs43pvl"; type = "gem"; }; - version = "3.0.7"; + version = "3.0.9"; }; source_map = { + dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0fviv92glr51v2zqy4i5jzi3hzpvjrcwyrxddcfr84ki65zb7pkv"; @@ -240,6 +300,7 @@ version = "3.0.1"; }; sprockets = { + dependencies = ["concurrent-ruby" "rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar"; @@ -250,28 +311,29 @@ temple = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6"; + sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; type = "gem"; }; - version = "0.7.7"; + version = "0.8.0"; }; thread_safe = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qsyzq2k7blyp1rph56xczwfqi8gplns2whswyr67mdfzdi60vvm"; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.8"; }; treetop = { + dependencies = ["polyglot"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0wpl5z33796nz2ah44waflrd1girbra281d9i3m9nz4ylg1ljg5b"; @@ -282,9 +344,9 @@ ttfunk = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1k725rji58i0qx5xwf7p9d07cmhmjixqkdvhg1wk3rpp1753cf1j"; + sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; } diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index ad612fa18af6..f3f0a60b4802 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform, makeWrapper -, fontconfig, harfbuzz-icu, openssl, pkgconfig }: +, darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontconfig harfbuzz-icu openssl ]; + buildInputs = [ fontconfig harfbuzz-icu openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); # tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix new file mode 100644 index 000000000000..b60cbcf22ad0 --- /dev/null +++ b/pkgs/tools/typesetting/ted/default.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "ted"; + version = "2.23"; + + src = fetchurl { + url = "http://ftp.nluug.nl/pub/editors/${pname}/${name}.src.tar.gz"; + sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z"; + }; + + preConfigure = '' + mkdir pkgconfig-append + pushd pkgconfig-append + + # ted looks for libtiff, not libtiff-4 in its pkg-config invokations + cp ${libtiff.dev}/lib/pkgconfig/libtiff-4.pc libtiff.pc + + # ted needs a libpaper pkg-config file + cat > libpaper.pc << EOF + prefix=${libpaper} + libdir=${libpaper}/lib + includedir=${libpaper}/include + exec_prefix=\''${prefix} + + Name: libpaper + Version: ${libpaper.version} + Description: ${libpaper.meta.description} + Libs: -L\''${libdir} -lpaper + Cflags: -I\''${includedir} + EOF + + export PKG_CONFIG_PATH="$PWD:$PKG_CONFIG_PATH" + + popd + ''; + + makeFlags = [ "CONFIGURE_OPTIONS=--with-GTK" "CONFIGURE_OPTIONS+=--prefix=$(out)" "compile.shared" ]; + + installPhase = '' + runHook preInstall + + make tedPackage/makefile + pushd tedPackage + substituteInPlace makefile --replace /usr "" + make PKGDESTDIR=$out datadir + popd + + pushd $out/share/Ted/examples + for f in rtf2*.sh + do + makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ ghostscript ]} + done + popd + + cp -v Ted/Ted $out/bin + + runHook postInstall + ''; + + buildInputs = [ pkgconfig zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ]; + + meta = with stdenv.lib; { + description = "Ted, an easy rich text processor"; + longDescription = '' + Ted is a text processor running under X Windows on Unix/Linux systems. + Ted was developed as a standard easy light weight word processor, having + the role of Wordpad on MS-Windows. Since then, Ted has evolved to a real + word processor. It still has the same easy appearance and the same speed + as the original. The possibility to type a letter, a note or a report + with a simple light weight program on a Unix/Linux machine is clearly + missing. Ted was made to make it possible to edit rich text documents on + Unix/Linux in a wysiwyg way. RTF files from Ted are fully compatible with + MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to + Acrobat PDF converter. + ''; + homepage = https://nllgg.nl/Ted/; + license = licenses.gpl2; + platforms = platforms.all; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ obadz ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8318ad2afe99..92778c5eed1c 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -144,6 +144,9 @@ core = stdenv.mkDerivation rec { mv "$out"/share/{man,info} "$doc"/doc '' + cleanBrokenLinks; + # needed for poppler and xpdf + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) passthru = { inherit version buildInputs; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9962c3c8fe6e..4fec9d928c1f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,7 +59,6 @@ mapAliases (rec { digikam5 = digikam; # added 2017-02-18 double_conversion = double-conversion; # 2017-11-22 dwarf_fortress = dwarf-fortress; # added 2016-01-23 - dwbWrapper = dwb; # added 2015-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 exfat-utils = exfat; # 2015-09-11 @@ -120,6 +119,7 @@ mapAliases (rec { libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 + libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libtidy = html-tidy; # added 2014-12-21 @@ -202,6 +202,7 @@ mapAliases (rec { sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 + tahoelafs = tahoe-lafs; # added 2018-03-26 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 @@ -213,6 +214,10 @@ mapAliases (rec { telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 + tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 + tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 + tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 + tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 @@ -235,6 +240,10 @@ mapAliases (rec { wineStable = winePackages.stable; wineUnstable = winePackages.unstable; + # added 2018-03-26 + libva-full = libva; + libva1-full = libva1; + inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a515c543a91d..b2618fce479d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -111,6 +111,8 @@ with pkgs; buildMaven = callPackage ../build-support/build-maven.nix {}; + castxml = callPackage ../development/tools/castxml { }; + cmark = callPackage ../development/libraries/cmark { }; dhallToNix = callPackage ../build-support/dhall-to-nix.nix { @@ -412,6 +414,8 @@ with pkgs; acct = callPackage ../tools/system/acct { }; + acme-sh = callPackage ../tools/admin/acme.sh { }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { ffmpeg = ffmpeg_1; }; @@ -523,14 +527,6 @@ with pkgs; argyllcms = callPackage ../tools/graphics/argyllcms {}; - arm-frc-linux-gnueabi-eglibc = callPackage ../development/libraries/arm-frc-linux-gnueabi-eglibc {}; - - arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {}; - - arm-frc-linux-gnueabi-binutils = callPackage ../development/tools/misc/arm-frc-linux-gnueabi-binutils {}; - - arm-frc-linux-gnueabi-gcc = callPackage ../development/compilers/arm-frc-linux-gnueabi-gcc {}; - arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) @@ -567,6 +563,8 @@ with pkgs; aws-vault = callPackage ../tools/admin/aws-vault { }; + iamy = callPackage ../tools/admin/iamy { }; + azure-cli = nodePackages.azure-cli; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; @@ -611,6 +609,8 @@ with pkgs; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; + cconv = callPackage ../tools/text/cconv { }; + chkcrontab = callPackage ../tools/admin/chkcrontab { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -625,9 +625,9 @@ with pkgs; encryptr = callPackage ../tools/security/encryptr { gconf = gnome2.GConf; - }; + }; - enchive = callPackage ../tools/security/enchive { }; + enchive = callPackage ../tools/security/enchive { }; enpass = callPackage ../tools/security/enpass { }; @@ -941,7 +941,7 @@ with pkgs; caddy = callPackage ../servers/caddy { }; traefik = callPackage ../servers/traefik { }; - calamares = libsForQt59.callPackage ../tools/misc/calamares { + calamares = libsForQt5.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; }; @@ -975,8 +975,12 @@ with pkgs; image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + cbor-diag = callPackage ../development/tools/cbor-diag { }; + ccnet = callPackage ../tools/networking/ccnet { }; + cddl = callPackage ../development/tools/cddl { }; + cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; @@ -1003,6 +1007,8 @@ with pkgs; colpack = callPackage ../applications/science/math/colpack { }; + compactor = callPackage ../applications/networking/compactor { }; + consul = callPackage ../servers/consul { }; consul-ui = callPackage ../servers/consul/ui.nix { }; @@ -1043,6 +1049,8 @@ with pkgs; cri-tools = callPackage ../tools/virtualization/cri-tools {}; + crip = callPackage ../applications/audio/crip { }; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -1114,7 +1122,9 @@ with pkgs; doitlive = callPackage ../tools/misc/doitlive { }; - dosage = pythonPackages.dosage; + dosage = callPackage ../applications/graphics/dosage { + pythonPackages = python3Packages; + }; dpic = callPackage ../tools/graphics/dpic { }; @@ -1332,6 +1342,8 @@ with pkgs; patdiff = callPackage ../tools/misc/patdiff { }; + pbzx = callPackage ../tools/compression/pbzx { }; + playerctl = callPackage ../tools/audio/playerctl { }; ps_mem = callPackage ../tools/system/ps_mem { }; @@ -1346,6 +1358,8 @@ with pkgs; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; + sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syslogng = callPackage ../tools/system/syslog-ng { }; @@ -1410,7 +1424,7 @@ with pkgs; utillinux = utillinuxMinimal; }; - antigen = callPackage ../shells/antigen { }; + antigen = callPackage ../shells/zsh/antigen { }; apparix = callPackage ../tools/misc/apparix { }; @@ -1593,7 +1607,7 @@ with pkgs; with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; - clementineFree = clementine.free; + clementineUnfree = clementine.unfree; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -1623,15 +1637,15 @@ with pkgs; connman = callPackage ../tools/networking/connman { }; - connman-gtk = callPackage ../tools/networking/connman-gtk { }; + connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; - connman-ncurses = callPackage ../tools/networking/connman-ncurses { }; + connman-ncurses = callPackage ../tools/networking/connman/connman-ncurses { }; - connman-notify = callPackage ../tools/networking/connman-notify { }; + connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - connmanui = callPackage ../tools/networking/connmanui { }; + connmanui = callPackage ../tools/networking/connman/connmanui { }; - connman_dmenu = callPackage ../tools/networking/connman_dmenu { }; + connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; convertlit = callPackage ../tools/text/convertlit { }; @@ -1786,6 +1800,8 @@ with pkgs; crackxls = callPackage ../tools/security/crackxls { }; + create-cycle-app = nodePackages_8_x.create-cycle-app; + createrepo_c = callPackage ../tools/package-management/createrepo_c { }; cromfs = callPackage ../tools/archivers/cromfs { }; @@ -1872,7 +1888,7 @@ with pkgs; debootstrap = callPackage ../tools/misc/debootstrap { }; - deer = callPackage ../shells/zsh-deer { }; + deer = callPackage ../shells/zsh/zsh-deer { }; detox = callPackage ../tools/misc/detox { }; @@ -1931,7 +1947,7 @@ with pkgs; diction = callPackage ../tools/text/diction { }; diffoscope = callPackage ../tools/misc/diffoscope { - jdk = jdk7; + jdk = jdk8; }; diffstat = callPackage ../tools/text/diffstat { }; @@ -2023,6 +2039,8 @@ with pkgs; duo-unix = callPackage ../tools/security/duo-unix { }; + duplicati = callPackage ../tools/backup/duplicati { }; + duplicity = callPackage ../tools/backup/duplicity { gnupg = gnupg1; }; @@ -2089,7 +2107,7 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = callPackage ../development/compilers/emscripten-fastcomp { }; + emscriptenfastcompPackages = callPackage ../development/compilers/emscripten/fastcomp { }; emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; @@ -2104,8 +2122,8 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.6"; - elk6Version = "6.1.2"; + elk5Version = "5.6.9"; + elk6Version = "6.2.4"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; @@ -2377,6 +2395,8 @@ with pkgs; fsfs = callPackage ../tools/filesystems/fsfs { }; + fstl = qt5.callPackage ../applications/graphics/fstl { }; + fswebcam = callPackage ../os-specific/linux/fswebcam { }; fuseiso = callPackage ../tools/filesystems/fuseiso { }; @@ -2574,6 +2594,7 @@ with pkgs; gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; godot = callPackage ../development/tools/godot {}; + godot_headers = callPackage ../development/libraries/godot_headers {}; goklp = callPackage ../tools/networking/goklp {}; @@ -2656,6 +2677,8 @@ with pkgs; inherit (xorg) libXdmcp; }; + gron = callPackage ../development/tools/gron { }; + groonga = callPackage ../servers/search/groonga { }; grub = callPackage_i686 ../tools/misc/grub { @@ -2693,9 +2716,7 @@ with pkgs; sbsigntool = callPackage ../tools/security/sbsigntool { }; - gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { - inherit (gnome2) libglademm; - }; + gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; gssdp = callPackage ../development/libraries/gssdp { inherit (gnome2) libsoup; @@ -2755,8 +2776,16 @@ with pkgs; pgjwt = callPackage ../servers/sql/postgresql/pgjwt {}; + cstore_fdw = callPackage ../servers/sql/postgresql/cstore_fdw {}; + + pg_hll = callPackage ../servers/sql/postgresql/pg_hll {}; + + pg_cron = callPackage ../servers/sql/postgresql/pg_cron {}; + pgtap = callPackage ../servers/sql/postgresql/pgtap {}; + pg_topn = callPackage ../servers/sql/postgresql/topn {}; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; @@ -2861,8 +2890,6 @@ with pkgs; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; - hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { @@ -3073,6 +3100,8 @@ with pkgs; jing = self.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jl = haskellPackages.callPackage ../development/tools/jl { }; + jmespath = callPackage ../development/tools/jmespath { }; jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; @@ -3131,15 +3160,13 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; - kexectools = if hostPlatform.isKexecable - then callPackage ../os-specific/linux/kexectools { } - else null; + kexectools = callPackage ../os-specific/linux/kexectools { }; keybase = callPackage ../tools/security/keybase { }; kbfs = callPackage ../tools/security/kbfs { }; - keybase-gui = callPackage ../tools/security/keybase-gui { }; + keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; keychain = callPackage ../tools/misc/keychain { }; @@ -3157,12 +3184,16 @@ with pkgs; kore = callPackage ../development/web/kore { }; + krakenx = callPackage ../tools/system/krakenx { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; krename = libsForQt5.callPackage ../applications/misc/krename { }; + krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; + kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; elisa = libsForQt5.callPackage ../applications/audio/elisa { }; @@ -3236,6 +3267,8 @@ with pkgs; ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; + lvmsync = callPackage ../tools/backup/lvmsync { }; + kippo = callPackage ../servers/kippo { }; kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; @@ -3274,7 +3307,7 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; - nagstamon = callPackage ../tools/nagstamon { + nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; }; @@ -3432,6 +3465,8 @@ with pkgs; libnabo = callPackage ../development/libraries/libnabo { }; + libngspice = callPackage ../development/libraries/libngspice { }; + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; @@ -3462,6 +3497,8 @@ with pkgs; limesurvey = callPackage ../servers/limesurvey { }; + linuxquota = callPackage ../tools/misc/linuxquota { }; + localtime = callPackage ../tools/system/localtime { }; logcheck = callPackage ../tools/system/logcheck { @@ -3851,9 +3888,9 @@ with pkgs; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; - networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager/applet.nix { }; - networkmanager_dmenu = callPackage ../tools/networking/networkmanager_dmenu { }; + networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; @@ -3991,7 +4028,7 @@ with pkgs; offlineimap = callPackage ../tools/networking/offlineimap { }; - oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { }; @@ -4209,6 +4246,10 @@ with pkgs; pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; + pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; + + pdd = python3Packages.callPackage ../tools/misc/pdd { }; + pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { }; @@ -4263,6 +4304,10 @@ with pkgs; gtk2 = null; }; + pinentry_emacs = pinentry_ncurses.override { + enableEmacs = true; + }; + pinentry_gnome = pinentry_ncurses.override { gcr = gnome3.gcr; }; @@ -4275,7 +4320,7 @@ with pkgs; qt = qt5.qtbase; }; - pinentry_mac = callPackage ../tools/security/pinentry-mac { + pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -4392,6 +4437,8 @@ with pkgs; pssh = callPackage ../tools/networking/pssh { }; + pspg = callPackage ../tools/misc/pspg { }; + pstoedit = callPackage ../tools/graphics/pstoedit { }; psutils = callPackage ../tools/typesetting/psutils { }; @@ -4408,6 +4455,8 @@ with pkgs; pwnat = callPackage ../tools/networking/pwnat { }; + pwndbg = callPackage ../development/tools/misc/pwndbg { }; + pycangjie = pythonPackages.pycangjie; pydb = callPackage ../development/tools/pydb { }; @@ -4420,6 +4469,8 @@ with pkgs; pytrainer = callPackage ../applications/misc/pytrainer { }; + pywal = callPackage ../tools/graphics/pywal {}; + remarshal = callPackage ../development/tools/remarshal { }; rtaudio = callPackage ../development/libraries/audio/rtaudio { }; @@ -4469,7 +4520,7 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; - quota = callPackage ../tools/misc/quota { }; + quota = if stdenv.isLinux then linuxquota else unixtools.quota; wiggle = callPackage ../development/tools/wiggle { }; @@ -4499,6 +4550,8 @@ with pkgs; rdma-core = callPackage ../os-specific/linux/rdma-core { }; + react-native-debugger = callPackage ../development/tools/react-native-debugger { }; + read-edid = callPackage ../os-specific/linux/read-edid { }; redir = callPackage ../tools/networking/redir { }; @@ -4606,11 +4659,7 @@ with pkgs; v8 = v8_static; }; - rsnapshot = callPackage ../tools/backup/rsnapshot { - # For the `logger' command, we can use either `utillinux' or - # GNU Inetutils. The latter is more portable. - logger = if stdenv.isLinux then utillinux else inetutils; - }; + rsnapshot = callPackage ../tools/backup/rsnapshot { }; rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -4622,6 +4671,8 @@ with pkgs; rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; + rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; + rpm = callPackage ../tools/package-management/rpm { }; rpm-ostree = callPackage ../tools/misc/rpm-ostree { @@ -4632,6 +4683,8 @@ with pkgs; rrdtool = callPackage ../tools/misc/rrdtool { }; + rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; }; @@ -4648,6 +4701,8 @@ with pkgs; runzip = callPackage ../tools/archivers/runzip { }; + rw = callPackage ../tools/misc/rw { }; + rxp = callPackage ../tools/text/xml/rxp { }; rzip = callPackage ../tools/compression/rzip { }; @@ -4676,12 +4731,18 @@ with pkgs; safe-rm = callPackage ../tools/system/safe-rm { }; + safeeyes = callPackage ../applications/misc/safeeyes { }; + salt = callPackage ../tools/admin/salt {}; salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; samplicator = callPackage ../tools/networking/samplicator { }; + sasview = callPackage ../applications/science/misc/sasview {}; + + scallion = callPackage ../tools/security/scallion { }; + scanbd = callPackage ../tools/graphics/scanbd { }; screen = callPackage ../tools/misc/screen { @@ -4796,12 +4857,18 @@ with pkgs; sleuthkit = callPackage ../tools/system/sleuthkit {}; + sleepyhead = callPackage ../applications/misc/sleepyhead {}; + slimrat = callPackage ../tools/networking/slimrat { inherit (perlPackages) WWWMechanize LWP; }; slsnif = callPackage ../tools/misc/slsnif { }; + slstatus = callPackage ../applications/misc/slstatus { + conf = config.slstatus.conf or null; + }; + smartmontools = callPackage ../tools/system/smartmontools { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; @@ -4963,6 +5030,8 @@ with pkgs; inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; }; + swfdec = callPackage ../tools/graphics/swfdec {}; + svnfs = callPackage ../tools/filesystems/svnfs { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; @@ -5016,6 +5085,8 @@ with pkgs; tcpreplay = callPackage ../tools/networking/tcpreplay { }; + ted = callPackage ../tools/typesetting/ted { }; + teamviewer = callPackage ../applications/networking/remote/teamviewer { stdenv = stdenv_32bit; }; @@ -5094,6 +5165,8 @@ with pkgs; tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); + tmsu = callPackage ../tools/filesystems/tmsu { }; toilet = callPackage ../tools/misc/toilet { }; @@ -5256,7 +5329,8 @@ with pkgs; vcftools = callPackage ../applications/science/biology/vcftools { }; vcsh = callPackage ../applications/version-management/vcsh { - inherit (perlPackages) ShellCommand TestMost; + inherit (perlPackages) ShellCommand TestMost TestDifferences TestDeep + TestException TestWarn; }; vcstool = callPackage ../development/tools/vcstool { }; @@ -5632,6 +5706,8 @@ with pkgs; xmlroff = callPackage ../tools/typesetting/xmlroff { }; + xmloscopy = callPackage ../tools/text/xml/xmloscopy { }; + xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { }; xmlto = callPackage ../tools/typesetting/xmlto { @@ -5720,17 +5796,17 @@ with pkgs; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; - zsh-git-prompt = callPackage ../shells/zsh-git-prompt { }; + zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; - zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { }; + zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; - zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { }; + zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; - zsh-powerlevel9k = callPackage ../shells/zsh-powerlevel9k { }; + zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { }; - zsh-command-time = callPackage ../shells/zsh-command-time { }; + zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; zssh = callPackage ../tools/networking/zssh { }; @@ -5757,17 +5833,19 @@ with pkgs; interactive = true; }); - bash-completion = callPackage ../shells/bash-completion { }; + bash-completion = callPackage ../shells/bash/bash-completion { }; - nix-bash-completions = callPackage ../shells/nix-bash-completions { }; + nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { }; dash = callPackage ../shells/dash { }; + dashing = callPackages ../tools/misc/dashing { }; + es = callPackage ../shells/es { }; fish = callPackage ../shells/fish { }; - fish-foreign-env = callPackage ../shells/fish-foreign-env { }; + fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { }; ion = callPackage ../shells/ion { }; @@ -5789,13 +5867,13 @@ with pkgs; zsh = callPackage ../shells/zsh { }; - nix-zsh-completions = callPackage ../shells/nix-zsh-completions { }; + nix-zsh-completions = callPackage ../shells/zsh/nix-zsh-completions { }; - zsh-completions = callPackage ../shells/zsh-completions { }; + zsh-completions = callPackage ../shells/zsh/zsh-completions { }; - zsh-prezto = callPackage ../shells/zsh-prezto { }; + zsh-prezto = callPackage ../shells/zsh/zsh-prezto { }; - grml-zsh-config = callPackage ../shells/grml-zsh-config { }; + grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { }; ### DEVELOPMENT / COMPILERS @@ -5856,8 +5934,13 @@ with pkgs; clang-sierraHack = clang.override { name = "clang-wrapper-with-reexport-hack"; - bintools = clang.bintools.override { + bintools = darwin.binutils.override { useMacosReexportHack = true; + bintools = darwin.binutils.bintools.override { + cctools = darwin.cctools.override { + enableDumpNormalizedLibArgs = true; + }; + }; }; }; @@ -5928,6 +6011,8 @@ with pkgs; ecl = callPackage ../development/compilers/ecl { }; ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; + eli = callPackage ../development/compilers/eli { }; + eql = callPackage ../development/compilers/eql {}; elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); @@ -5937,7 +6022,9 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; gerbil = callPackage ../development/compilers/gerbil { }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; @@ -6310,10 +6397,6 @@ with pkgs; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - icedtea7_web = callPackage ../development/compilers/icedtea-web { - jdk = jdk7; - }; - icedtea8_web = callPackage ../development/compilers/icedtea-web { jdk = jdk8; }; @@ -6351,39 +6434,23 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - openjdk7 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk-darwin { } - else - callPackage ../development/compilers/openjdk/7.nix { - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; }; - }; - openjdk8 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk-darwin/8.nix { } + callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; inherit (gnome2) GConf gnome_vfs; }; - openjdk9 = - # if stdenv.isDarwin then - # callPackage ../development/compilers/openjdk-darwin/9.nix { } - # else - callPackage ../development/compilers/openjdk/9.nix { - bootjdk = openjdk8; + openjdk10 = + callPackage ../development/compilers/openjdk/10.nix { + bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; inherit (gnome2) GConf gnome_vfs; }; openjdk = openjdk8; - jdk7 = openjdk7 // { outputs = [ "out" ]; }; - jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } @@ -6398,19 +6465,19 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; - jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" + jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; + jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk9.jre // { outputs = [ "jre" ]; })); - jre9_headless = + (openjdk10.jre // { outputs = [ "jre" ]; })); + jre10_headless = if stdenv.isArm || stdenv.isAarch64 then - oraclejre9 + oraclejre10 else if stdenv.isDarwin then - jre9 + jre10 else - lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless" + lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); jdk = jdk8; jre = jre8; @@ -6426,8 +6493,6 @@ with pkgs; oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; - oraclejdk9 = pkgs.oraclejdk9distro "JDK" false; - oraclejdk10 = pkgs.oraclejdk10distro "JDK" false; oraclejre = lowPrio (pkgs.jdkdistro false false); @@ -6436,12 +6501,8 @@ with pkgs; oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); - oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false); - oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false); - oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false); - oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false); jrePlugin = jre8Plugin; @@ -6458,10 +6519,6 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); - oraclejdk9distro = packageType: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); - oraclejdk10distro = packageType: pluginSupport: (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); @@ -6865,15 +6922,14 @@ with pkgs; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; }; - wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun { + wrapBintoolsWith = { bintools, libc, extraBuildCommands ? "" }: bintoolsWrapperFun { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; noLibc = (libc == null); - inherit bintools libc; - extraBuildCommands = ""; + inherit bintools libc extraBuildCommands; }; # prolog @@ -6886,8 +6942,7 @@ with pkgs; z88dk = callPackage ../development/compilers/z88dk { }; zulu8 = callPackage ../development/compilers/zulu/8.nix { }; - zulu9 = callPackage ../development/compilers/zulu { }; - zulu = zulu9; + zulu = callPackage ../development/compilers/zulu { }; ### DEVELOPMENT / INTERPRETERS @@ -7198,6 +7253,8 @@ with pkgs; pythonPackages = python3Packages; }; + setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; + # These pyside tools do not provide any Python modules and are meant to be here. # See ../development/python-modules/pyside/default.nix for details. pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; @@ -7326,12 +7383,10 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/stm32/betaflight { }; + betaflight = callPackage ../development/misc/stm32/betaflight { }; sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; - ecj = callPackage ../development/eclipse/ecj { }; - jruby = callPackage ../development/interpreters/jruby { }; jython = callPackage ../development/interpreters/jython {}; @@ -7396,6 +7451,7 @@ with pkgs; ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {}; ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {}; ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {}; + ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {}; ansible = ansible_2_4; ansible2 = ansible_2_4; @@ -7414,6 +7470,8 @@ with pkgs; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; + apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + apacheKafka = apacheKafka_1_0; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; @@ -7470,33 +7528,17 @@ with pkgs; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = - if targetPlatform.isDarwin - then darwin.binutils - else if targetPlatform.isRiscV - then binutils_2_30 - else binutils-raw; - binutils-unwrapped = callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; }; - binutils-raw = wrapBintoolsWith { + binutils = wrapBintoolsWith { libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; bintools = binutils-unwrapped; }; - binutils-unwrapped_2_30 = callPackage ../development/tools/misc/binutils/2.30.nix { - # FHS sys dirs presumably only have stuff for the build platform - noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; - }; - binutils-raw_2_30 = wrapBintoolsWith { + binutils_nogold = lowPrio (wrapBintoolsWith { libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; - bintools = binutils-unwrapped_2_30; - }; - binutils_2_30 = binutils-raw_2_30; - - binutils_nogold = lowPrio (binutils-raw.override { - bintools = binutils-raw.bintools.override { + bintools = binutils-unwrapped.override { gold = false; }; }); @@ -7592,7 +7634,9 @@ with pkgs; cl-launch = callPackage ../development/tools/misc/cl-launch {}; - cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { + go = go_1_9; + }; coan = callPackage ../development/tools/analysis/coan { }; @@ -7612,14 +7656,9 @@ with pkgs; ctodo = callPackage ../applications/misc/ctodo { }; - cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { - wantPS = stdenv.isDarwin; - inherit (darwin) ps; - }; + cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { - inherit (darwin) ps; - }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -7643,20 +7682,20 @@ with pkgs; cppcheck = callPackage ../development/tools/analysis/cppcheck { }; + cquery = callPackage ../development/tools/misc/cquery { + llvmPackages = llvmPackages_6; + }; + creduce = callPackage ../development/tools/misc/creduce { inherit (perlPackages) perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; inherit (llvmPackages_4) llvm clang-unwrapped; - utillinux = if stdenv.isLinux then utillinuxMinimal else null; }; cscope = callPackage ../development/tools/misc/cscope { }; csmith = callPackage ../development/tools/misc/csmith { inherit (perlPackages) perl SysCPU; - # Workaround optional dependency on libbsd that's - # currently broken on Darwin. - libbsd = if stdenv.isDarwin then null else libbsd; }; csslint = callPackage ../development/web/csslint { }; @@ -7767,7 +7806,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt + inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa; }; @@ -7783,7 +7822,7 @@ with pkgs; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = callPackage ../development/tools/misc/gede { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = callPackage ../development/tools/misc/gdbgui { }; @@ -7818,10 +7857,7 @@ with pkgs; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = if hostPlatform.isRiscV # Technically this check should be for glibc version. - then gnumake42HEAD - else gnumake42; - gnumake42HEAD = callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { }; + gnumake = gnumake42; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); @@ -7869,6 +7905,10 @@ with pkgs; hyenae = callPackage ../tools/networking/hyenae { }; + iaca_2_1 = callPackage ../development/tools/iaca/2.1.nix { }; + iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { }; + iaca = iaca_3_0; + icestorm = callPackage ../development/tools/icestorm { }; icmake = callPackage ../development/tools/build-managers/icmake { }; @@ -8027,6 +8067,8 @@ with pkgs; pahole = callPackage ../development/tools/misc/pahole {}; + panopticon = callPackage ../development/tools/analysis/panopticon {}; + pants = callPackage ../development/tools/build-managers/pants {}; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; @@ -8076,7 +8118,7 @@ with pkgs; pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt5.callPackage ../development/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; @@ -8155,7 +8197,7 @@ with pkgs; shards = callPackage ../development/tools/build-managers/shards { }; - shellcheck = haskellPackages.ShellCheck; + shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; schemaspy = callPackage ../development/tools/database/schemaspy { }; @@ -8210,7 +8252,9 @@ with pkgs; swfmill = callPackage ../tools/video/swfmill { }; - swftools = callPackage ../tools/video/swftools { }; + swftools = callPackage ../tools/video/swftools { + stdenv = gccStdenv; + }; tcptrack = callPackage ../development/tools/misc/tcptrack { }; @@ -8373,6 +8417,8 @@ with pkgs; armadillo = callPackage ../development/libraries/armadillo {}; + arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; + assimp = callPackage ../development/libraries/assimp { }; asio = callPackage ../development/libraries/asio { }; @@ -8516,14 +8562,10 @@ with pkgs; classads = callPackage ../development/libraries/classads { }; - classpath = callPackage ../development/libraries/java/classpath { - javac = gcj; - jvm = gcj; - gconf = gnome2.GConf; - }; - clearsilver = callPackage ../development/libraries/clearsilver { }; + clipper = callPackage ../development/libraries/clipper { }; + cln = callPackage ../development/libraries/cln { }; clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; @@ -8697,6 +8739,8 @@ with pkgs; esdl = callPackage ../development/libraries/esdl { }; + libesmtp = callPackage ../development/libraries/libesmtp { }; + exiv2 = callPackage ../development/libraries/exiv2 { }; expat = callPackage ../development/libraries/expat { }; @@ -8895,7 +8939,7 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gflags = callPackage ../development/libraries/gflags { }; + gflags = google-gflags; gf2x = callPackage ../development/libraries/gf2x {}; @@ -8923,15 +8967,15 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security; }; libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security; }; + glbinding = callPackage ../development/libraries/glbinding { }; + gle = callPackage ../development/libraries/gle { }; glew = callPackage ../development/libraries/glew { }; @@ -8943,13 +8987,9 @@ with pkgs; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc_2_26 = callPackage ../development/libraries/glibc { + glibc = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; }; - glibc_2_27 = callPackage ../development/libraries/glibc/2.27.nix { - installLocales = config.glibc.locales or false; - }; - glibc = if hostPlatform.isRiscV then glibc_2_27 else glibc_2_26; glibc_memusage = callPackage ../development/libraries/glibc { installLocales = false; @@ -8957,11 +8997,7 @@ with pkgs; }; # Being redundant to avoid cycles on boot. TODO: find a better way - glibcCross = let - expr = if hostPlatform.isRiscV - then ../development/libraries/glibc/2.27.nix - else ../development/libraries/glibc; - in callPackage expr { + glibcCross = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; stdenv = crossLibcStdenv; }; @@ -8979,6 +9015,7 @@ with pkgs; else if name == "uclibc" then uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 + else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; @@ -9056,6 +9093,8 @@ with pkgs; grpc = callPackage ../development/libraries/grpc { }; + gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); }); @@ -9411,6 +9450,8 @@ with pkgs; stdenv = llvmPackages_4.stdenv; }; + isso = callPackage ../servers/isso { }; + itk = callPackage ../development/libraries/itk { }; jasper = callPackage ../development/libraries/jasper { }; @@ -9425,6 +9466,8 @@ with pkgs; jemalloc = callPackage ../development/libraries/jemalloc { }; + jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { }; + jshon = callPackage ../development/tools/parsing/jshon { }; json2hcl = callPackage ../development/tools/json2hcl { }; @@ -9526,6 +9569,8 @@ with pkgs; libantlr3c = callPackage ../development/libraries/libantlr3c {}; + libaom = callPackage ../development/libraries/libaom { }; + libappindicator-gtk2 = callPackage ../development/libraries/libappindicator { gtkVersion = "2"; }; libappindicator-gtk3 = callPackage ../development/libraries/libappindicator { gtkVersion = "3"; }; @@ -9601,7 +9646,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; - libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { }; + libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { + inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit; + }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; @@ -9774,9 +9821,7 @@ with pkgs; libgroove = callPackage ../development/libraries/libgroove { }; - libseccomp = if hostPlatform.isSeccomputable - then callPackage ../development/libraries/libseccomp { } - else null; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; @@ -9940,11 +9985,7 @@ with pkgs; mysql = mysql57; }; - libnatspec = callPackage ../development/libraries/libnatspec ( - stdenv.lib.optionalAttrs stdenv.isDarwin { - inherit (darwin) libiconv; - } - ); + libnatspec = callPackage ../development/libraries/libnatspec { }; libndp = callPackage ../development/libraries/libndp { }; @@ -10002,7 +10043,7 @@ with pkgs; # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if hostPlatform.libc == "glibc" + if (hostPlatform.libc == "glibc" || hostPlatform.libc == "musl") then glibcIconv (if hostPlatform != buildPlatform then libcCross else stdenv.cc.libc) @@ -10023,7 +10064,7 @@ with pkgs; }; # On non-GNU systems we need GNU Gettext for libintl. - libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; + libintl = if hostPlatform.libc != "glibc" then gettext else null; libid3tag = callPackage ../development/libraries/libid3tag { gperf = gperf_3_0; @@ -10353,17 +10394,15 @@ with pkgs; }); libva = callPackage ../development/libraries/libva { }; - libva-full = libva.override { minimal = false; }; + libva-minimal = libva.override { minimal = true; }; libva-utils = callPackage ../development/libraries/libva-utils { }; libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; - libva1-full = libva1.override { minimal = false; }; + libva1-minimal = libva1.override { minimal = true; }; libvdpau = callPackage ../development/libraries/libvdpau { }; - libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { - libva = libva-full; # also wants libva-{x11} - }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; libvirt = callPackage ../development/libraries/libvirt { }; @@ -10523,60 +10562,48 @@ with pkgs; ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them - # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, - # or other runtime dispatcher - libGL = mesa_noglu; + libGL = libGLDarwinOr mesa_noglu.stubs; # Default libGLU - libGLU = mesa_glu; + libGLU = libGLDarwinOr mesa_glu; # Combined derivation, contains both libGL and libGLU # Please, avoid using this attribute. It was meant as transitional hack # for packages that assume that libGLU and libGL live in the same prefix. # libGLU_combined propagates both libGL and libGLU - libGLU_combined = mesa; + libGLU_combined = libGLDarwinOr (buildEnv { + name = "libGLU-combined"; + paths = [ libGL libGLU ]; + extraOutputsToInstall = [ "dev" ]; + }); # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) - libGL_driver = mesa_drivers; + libGL_driver = libGLDarwinOr mesa_drivers; libGLSupported = lib.elem system lib.platforms.mesaPlatforms; - libGLDarwinOr = alternative: if stdenv.isDarwin - then callPackage ../development/libraries/mesa-darwin { - inherit (darwin.apple_sdk.frameworks) OpenGL; - inherit (darwin.apple_sdk.libs) Xplugin; - inherit (darwin) apple_sdk; - } - else alternative; + libGLDarwin = callPackage ../development/libraries/mesa-darwin { + inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk.libs) Xplugin; + inherit (darwin) apple_sdk; + }; - # FIXME: should be `libGL = libGLDarwinOr mesa_nonglu` but this change cause mass rebuild, - # until all packages will refer to libGL/GLU/GLU combined - mesa_noglu = libGLDarwinOr (callPackage ../development/libraries/mesa { + libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; + + mesa_noglu = callPackage ../development/libraries/mesa { # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM - }); + llvmPackages = llvmPackages_6; + }; - mesa_glu = libGLDarwinOr (callPackage ../development/libraries/mesa-glu { }); - mesa_drivers = libGLDarwinOr ( + mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa_drivers = let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; enableTextureFloats = true; }; - in mo.drivers - ); - - # Please, avoid using this attribute. It was meant as transitional hack - # for packages that assume that libGLU and libGL live in the same prefix. - # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether - # you need libGLU or not (_glu propagates _noglu). - mesa = libGLDarwinOr (buildEnv { - name = "mesa-${mesa_noglu.version}"; - paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; - meta = { - platforms = lib.platforms.unix; - }; - }); + in mo.drivers; ## End libGL/libGLU/Mesa stuff @@ -10692,7 +10719,9 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = nixUnstable; + }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -10794,6 +10823,7 @@ with pkgs; opal = callPackage ../development/libraries/opal { ffmpeg = ffmpeg_2; + stdenv = overrideCC stdenv gcc6; }; openh264 = callPackage ../development/libraries/openh264 { }; @@ -10863,6 +10893,8 @@ with pkgs; paperkey = callPackage ../tools/security/paperkey { }; + parquet-cpp = callPackage ../development/libraries/parquet-cpp {}; + pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcaudiolib = callPackage ../development/libraries/pcaudiolib { @@ -10983,7 +11015,8 @@ with pkgs; flatbuffers = callPackage ../development/libraries/flatbuffers { }; - pth = callPackage ../development/libraries/pth { }; + gnupth = callPackage ../development/libraries/pth { }; + pth = if stdenv.hostPlatform.isMusl then npth else gnupth; ptlib = callPackage ../development/libraries/ptlib {}; @@ -11121,10 +11154,6 @@ with pkgs; grantlee = callPackage ../development/libraries/grantlee/5 { }; - inherit (callPackage ../development/libraries/kirigami { }) - kirigami_1 - kirigami_2; - kdb = callPackage ../development/libraries/kdb { }; kdiagram = callPackage ../development/libraries/kdiagram { }; @@ -11133,8 +11162,6 @@ with pkgs; kreport = callPackage ../development/libraries/kreport { }; - kirigami = kirigami_1; - libcommuni = callPackage ../development/libraries/libcommuni { }; libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; @@ -11147,9 +11174,7 @@ with pkgs; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; - libqtav = callPackage ../development/libraries/libqtav { - libva = libva-full; # also wants libva-x11 - }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { }; @@ -11182,6 +11207,7 @@ with pkgs; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { }; qscintilla = callPackage ../development/libraries/qscintilla { withQt5 = true; @@ -11261,7 +11287,7 @@ with pkgs; haskellLib = haskell.lib; }; - lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { }; + lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; leksah = callPackage ../development/tools/haskell/leksah { inherit (haskellPackages) ghcWithPackages; @@ -11301,7 +11327,7 @@ with pkgs; rlog = callPackage ../development/libraries/rlog { }; - rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb = callPackage ../development/libraries/rocksdb { jemalloc = jemalloc450; }; rocksdb_lite = rocksdb.override { enableLite = true; }; @@ -11371,6 +11397,8 @@ with pkgs; sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; + selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; + serd = callPackage ../development/libraries/serd {}; serf = callPackage ../development/libraries/serf {}; @@ -11526,7 +11554,9 @@ with pkgs; t1lib = callPackage ../development/libraries/t1lib { }; - tachyon = callPackage ../development/libraries/tachyon {}; + tachyon = callPackage ../development/libraries/tachyon { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; taglib = callPackage ../development/libraries/taglib { }; taglib_1_9 = callPackage ../development/libraries/taglib/1.9.nix { }; @@ -11682,13 +11712,9 @@ with pkgs; v8_static = lowPrio (self.v8.override { static = true; }); - vaapiIntel = callPackage ../development/libraries/vaapi-intel { - libva = libva-full; # also wants libva-{x11,drm,wayland} - }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; - vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { - libva = libva-full; # needs libva-{x11,glx} - }; + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; vale = callPackage ../tools/text/vale { }; @@ -11733,9 +11759,7 @@ with pkgs; stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7 }; - wavpack = callPackage ../development/libraries/wavpack { - inherit (darwin) libiconv; - }; + wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { graphviz = graphviz-nox; @@ -11927,7 +11951,9 @@ with pkgs; czmq = czmq3; }; - zig = callPackage ../development/compilers/zig {}; + zig = callPackage ../development/compilers/zig { + llvmPackages = llvmPackages_6; + }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -12043,8 +12069,11 @@ with pkgs; buildGo19Package = callPackage ../development/go-modules/generic { go = go_1_9; }; + buildGo110Package = callPackage ../development/go-modules/generic { + go = go_1_10; + }; - buildGoPackage = buildGo19Package; + buildGoPackage = buildGo110Package; go2nix = callPackage ../development/tools/go2nix { }; @@ -12361,12 +12390,7 @@ with pkgs; jetty = callPackage ../servers/http/jetty { }; knot-dns = callPackage ../servers/dns/knot-dns { }; - knot-resolver = callPackage ../servers/dns/knot-resolver { - # TODO: vimNox after it gets fixed on Darwin or something lighter - hexdump = if stdenv.isLinux then utillinux.bin - else if stdenv.isDarwin then darwin.shell_cmds - else vim/*xxd*/; - }; + knot-resolver = callPackage ../servers/dns/knot-resolver { }; rdkafka = callPackage ../development/libraries/rdkafka { }; @@ -12695,6 +12719,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; + inherit (pythonPackages) buildPythonPackage qpid-python; }; quagga = callPackage ../servers/quagga { }; @@ -12716,6 +12741,8 @@ with pkgs; restic = callPackage ../tools/backup/restic { }; + restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; + restya-board = callPackage ../servers/web-apps/restya-board { }; rethinkdb = callPackage ../servers/nosql/rethinkdb { @@ -12882,12 +12909,11 @@ with pkgs; inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook - autoconf automake libtool mtdev pixman + autoconf automake libtool mtdev pixman libGL cairo epoxy; inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; inherit (darwin) apple_sdk cf-private libobjc; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; - mesa = libGL; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; @@ -12975,9 +13001,6 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; - # Needed for LibreOffice - bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); - bluez = bluez5; inherit (python3Packages) bedup; @@ -13085,8 +13108,6 @@ with pkgs; ebtables = callPackage ../os-specific/linux/ebtables { }; - eject = utillinux; - facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; fatrace = callPackage ../os-specific/linux/fatrace { }; @@ -13129,6 +13150,8 @@ with pkgs; gpm-ncurses = gpm.override { inherit ncurses; }; + gpu-switch = callPackage ../os-specific/linux/gpu-switch { }; + gradm = callPackage ../os-specific/linux/gradm { flex = flex_2_5_35; }; @@ -13145,6 +13168,8 @@ with pkgs; inherit (darwin) IOKit; }; + nmon = callPackage ../os-specific/linux/nmon { }; + # GNU/Hurd core packages. gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { inherit platform; @@ -13203,7 +13228,9 @@ with pkgs; kmscube = callPackage ../os-specific/linux/kmscube { }; - kmsxx = callPackage ../development/libraries/kmsxx { }; + kmsxx = callPackage ../development/libraries/kmsxx { + stdenv = overrideCC stdenv gcc6; + }; latencytop = callPackage ../os-specific/linux/latencytop { }; @@ -13339,6 +13366,22 @@ with pkgs; ]; }; + linux_4_16 = callPackage ../os-specific/linux/kernel/linux-4.16.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13444,7 +13487,6 @@ with pkgs; nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; - nvidia_x11_legacy173 = nvidiaPackages.legacy_173; nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_beta = nvidiaPackages.beta; @@ -13498,6 +13540,8 @@ with pkgs; systemtap = callPackage ../development/tools/profiling/systemtap { }; + tmon = callPackage ../os-specific/linux/tmon { }; + tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; usbip = callPackage ../os-specific/linux/usbip { }; @@ -13531,7 +13575,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_15; + linuxPackages_latest = linuxPackages_4_16; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -13542,17 +13586,31 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15); + linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; - linuxPackages_custom = { version, src, configfile }: + linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile stdenv; - allowImportFromDerivation = true; + inherit version src configfile stdenv allowImportFromDerivation; + inherit (stdenv) hostPlatform; })); + # This serves as a test for linuxPackages_custom + linuxPackages_custom_tinyconfig_kernel = let + base = pkgs.linuxPackages.kernel; + tinyLinuxPackages = pkgs.linuxPackages_custom { + inherit (base) version src; + allowImportFromDerivation = false; + configfile = pkgs.linuxConfig { + makeTarget = "tinyconfig"; + src = base.src; + }; + }; + in tinyLinuxPackages.kernel; + # Build a kernel with bcachefs module linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); @@ -13590,6 +13648,20 @@ with pkgs; # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + + # Derive one of the default .config files + linuxConfig = { src, makeTarget ? "defconfig", name ? "kernel.config" }: + stdenv.mkDerivation { + inherit name src; + buildPhase = '' + set -x + make ${makeTarget} + ''; + installPhase = '' + cp .config $out + ''; + }; + buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; keyutils = callPackage ../os-specific/linux/keyutils { }; @@ -13673,7 +13745,8 @@ with pkgs; if hostPlatform.isMusl then musl-getconf else lib.getBin stdenv.cc.libc; - nettools = callPackage ../os-specific/linux/net-tools { }; + nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } + else unixtools.nettools; nftables = callPackage ../os-specific/linux/nftables { }; @@ -13723,6 +13796,8 @@ with pkgs; gotools = callPackage ../development/tools/gotools { }; + gotop = callPackage ../tools/system/gotop { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; @@ -13731,13 +13806,19 @@ with pkgs; gogoclient = callPackage ../os-specific/linux/gogoclient { }; + linux-pam = callPackage ../os-specific/linux/pam { }; + nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; + openpam = callPackage ../development/libraries/openpam { }; + + openbsm = callPackage ../development/libraries/openbsm { }; + pagemon = callPackage ../os-specific/linux/pagemon { }; - pam = callPackage ../os-specific/linux/pam { }; + pam = if stdenv.isLinux then linux-pam else openpam; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) @@ -13796,7 +13877,8 @@ with pkgs; procps = procps-ng; - procps-ng = callPackage ../os-specific/linux/procps-ng { }; + procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } + else unixtools.procps; watch = callPackage ../os-specific/linux/procps/watch.nix { }; @@ -13820,6 +13902,7 @@ with pkgs; radeontop = callPackage ../os-specific/linux/radeontop { }; raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; + raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -13989,15 +14072,17 @@ with pkgs; usermount = callPackage ../os-specific/linux/usermount { }; - utillinux = callPackage ../os-specific/linux/util-linux { }; + utillinux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } + else unixtools.utillinux; + utillinuxCurses = utillinux; - utillinuxMinimal = appendToName "minimal" (utillinux.override { + utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override { minimal = true; ncurses = null; perl = null; systemd = null; - }); + }) else utillinux; v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; @@ -14178,6 +14263,8 @@ with pkgs; docbook5_xsl = docbook_xsl_ns; + documentation-highlighter = callPackage ../misc/documentation-highlighter { }; + cabin = callPackage ../data/fonts/cabin { }; camingo-code = callPackage ../data/fonts/camingo-code { }; @@ -14420,6 +14507,8 @@ with pkgs; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; + scheherazade = callPackage ../data/fonts/scheherazade { }; + signwriting = callPackage ../data/fonts/signwriting { }; soundfont-fluid = callPackage ../data/soundfonts/fluid { }; @@ -14500,15 +14589,9 @@ with pkgs; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; - tex-gyre = callPackage ../data/fonts/tex-gyre { }; + tex-gyre = callPackages ../data/fonts/tex-gyre { }; - tex-gyre-bonum-math = callPackage ../data/fonts/tex-gyre-math { variant = "bonum"; }; - - tex-gyre-pagella-math = callPackage ../data/fonts/tex-gyre-math { variant = "pagella"; }; - - tex-gyre-schola-math = callPackage ../data/fonts/tex-gyre-math { variant = "schola"; }; - - tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-math { variant = "termes"; }; + tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; tipa = callPackage ../data/fonts/tipa { }; @@ -14601,7 +14684,6 @@ with pkgs; }; abiword = callPackage ../applications/office/abiword { - inherit (gnome2) libglade libgnomecanvas; iconTheme = gnome3.defaultIconTheme; }; @@ -14627,7 +14709,9 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; - ahoviewer = callPackage ../applications/graphics/ahoviewer { }; + ahoviewer = callPackage ../applications/graphics/ahoviewer { + useUnrar = config.ahoviewer.useUnrar or false; + }; airwave = callPackage ../applications/audio/airwave/default.nix { }; @@ -14743,9 +14827,7 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - avidemux = libsForQt5.callPackage ../applications/video/avidemux { - libva = libva-full; - }; + avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avogadro = callPackage ../applications/science/chemistry/avogadro { eigen = eigen2; @@ -14778,6 +14860,8 @@ with pkgs; backintime = backintime-qt4; + balsa = callPackage ../applications/networking/mailreaders/balsa { }; + bandwidth = callPackage ../tools/misc/bandwidth { }; baresip = callPackage ../applications/networking/instant-messengers/baresip { @@ -14850,7 +14934,7 @@ with pkgs; blender = callPackage ../applications/misc/blender { cudaSupport = config.cudaSupport or false; - python = python35; + pythonPackages = python35Packages; stdenv = overrideCC stdenv gcc6; }; @@ -14966,7 +15050,9 @@ with pkgs; chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chuck = callPackage ../applications/audio/chuck { }; + chuck = callPackage ../applications/audio/chuck { + inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel; + }; cinelerra = callPackage ../applications/video/cinelerra { }; @@ -14999,6 +15085,7 @@ with pkgs; }; cni = callPackage ../applications/networking/cluster/cni {}; + cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; @@ -15109,6 +15196,8 @@ with pkgs; distrho = callPackage ../applications/audio/distrho {}; + dit = callPackage ../applications/editors/dit { }; + djvulibre = callPackage ../applications/misc/djvulibre { }; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; @@ -15131,11 +15220,11 @@ with pkgs; # go 1.9 pin until https://github.com/moby/moby/pull/35739 inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) - docker_17_12 - docker_18_02; + docker_18_03 + docker_18_04; - docker = docker_17_12; - docker-edge = docker_18_02; + docker = docker_18_03; + docker-edge = docker_18_04; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -15147,7 +15236,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; }; - docker-distribution = callPackage ../applications/virtualization/docker-distribution { }; + docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; @@ -15183,9 +15272,6 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dwb-unwrapped = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; - dwb = wrapFirefox dwb-unwrapped { desktopName = "dwb"; }; - dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; }; @@ -15200,7 +15286,9 @@ with pkgs; eaglemode = callPackage ../applications/misc/eaglemode { }; - eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk24x-gtk2 = null; }); + eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { + jdk = jdk10; + }); ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; @@ -15214,9 +15302,9 @@ with pkgs; electrum = callPackage ../applications/misc/electrum { }; - electrum-dash = callPackage ../applications/misc/electrum-dash { }; + electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = callPackage ../applications/misc/electrum-ltc { }; + electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; elinks = callPackage ../applications/networking/browsers/elinks { }; @@ -15564,15 +15652,15 @@ with pkgs; extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ]; }; - gnuradio-nacl = callPackage ../applications/misc/gnuradio-nacl { }; + gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/misc/gnuradio-gsm { }; + gnuradio-gsm = callPackage ../applications/misc/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/misc/gnuradio-ais { }; + gnuradio-ais = callPackage ../applications/misc/gnuradio/ais.nix { }; - gnuradio-rds = callPackage ../applications/misc/gnuradio-rds { }; + gnuradio-rds = callPackage ../applications/misc/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; + gnuradio-osmosdr = callPackage ../applications/misc/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; @@ -15596,6 +15684,8 @@ with pkgs; gtk2 = gtk2-x11; }; + gpx = callPackage ../applications/misc/gpx { }; + gqrx = qt5.callPackage ../applications/misc/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -15812,12 +15902,6 @@ with pkgs; gtk = gtk3; }; - girara-light = callPackage ../applications/misc/girara { - gtk = gtk3; - withBuildColors = false; - ncurses = null; - }; - gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt; @@ -15995,8 +16079,7 @@ with pkgs; }; guake = callPackage ../applications/misc/guake { - gconf = gnome2.GConf; - vte = gnome2.vte.override { pythonSupport = true; }; + inherit (gnome3) vte; }; guitone = callPackage ../applications/version-management/guitone { @@ -16129,6 +16212,8 @@ with pkgs; i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { }; + i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + i810switch = callPackage ../os-specific/linux/i810switch { }; icewm = callPackage ../applications/window-managers/icewm {}; @@ -16433,51 +16518,54 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - bluez5 = bluez5_28; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - # checking whether g++ supports C++14 or C++11... configure: error: no - stdenv = overrideCC stdenv gcc5; - }); - - libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - bluez5 = bluez5_28; - poppler = poppler_0_61; - fontsConf = makeFontsConf { - fontDirectories = [ - freefont_ttf xorg.fontmiscmisc - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - icu = icu58; - # checking whether g++ supports C++14 or C++11... configure: error: no - stdenv = overrideCC stdenv gcc5; - }); - + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix + { libreoffice = callPackage ../applications/office/libreoffice { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + fontsConf = makeFontsConf { + fontDirectories = [ + carlito dejavu_fonts + freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + # checking whether g++ supports C++14 or C++11... configure: error: no + # Still relevant: 2018-04-13 + stdenv = overrideCC stdenv gcc5; + };}); + + libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix + { libreoffice = callPackage ../applications/office/libreoffice/still.nix { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + poppler = poppler_0_61; + fontsConf = makeFontsConf { + fontDirectories = [ + carlito dejavu_fonts + freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + # checking whether g++ supports C++14 or C++11... configure: error: no + # Still relevant: 2018-04-13; gcc6 is not enough! + stdenv = overrideCC stdenv gcc5; + };}); liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) libpeas gsettings-desktop-schemas dconf; @@ -16542,6 +16630,11 @@ with pkgs; flavour = "git"; }; + luakit = callPackage ../applications/networking/browsers/luakit { + inherit (lua51Packages) luafilesystem; + lua5 = lua5_1; + }; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; lumail = callPackage ../applications/networking/mailreaders/lumail { @@ -16554,6 +16647,8 @@ with pkgs; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; + magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; + mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; magnetophonDSP = { @@ -16662,15 +16757,22 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; monero = callPackage ../applications/altcoins/monero { - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + boost = boost15x; }; - monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { }; + monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { + boost = boost15x; + }; xmr-stak = callPackage ../applications/misc/xmr-stak { hwloc = hwloc-nox; }; + xmrig = callPackage ../applications/misc/xmrig { }; + + xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; @@ -16689,27 +16791,27 @@ with pkgs; mopidy = callPackage ../applications/audio/mopidy { }; - mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-gmusic = callPackage ../applications/audio/mopidy/gmusic.nix { }; - mopidy-local-images = callPackage ../applications/audio/mopidy-local-images { }; + mopidy-local-images = callPackage ../applications/audio/mopidy/local-images.nix { }; - mopidy-local-sqlite = callPackage ../applications/audio/mopidy-local-sqlite { }; + mopidy-local-sqlite = callPackage ../applications/audio/mopidy/local-sqlite.nix { }; - mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + mopidy-spotify = callPackage ../applications/audio/mopidy/spotify.nix { }; - mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mopidy-moped = callPackage ../applications/audio/mopidy/moped.nix { }; - mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; + mopidy-mopify = callPackage ../applications/audio/mopidy/mopify.nix { }; - mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy-spotify-tunigo { }; + mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy/spotify-tunigo.nix { }; - mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { }; + mopidy-youtube = callPackage ../applications/audio/mopidy/youtube.nix { }; - mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { }; + mopidy-soundcloud = callPackage ../applications/audio/mopidy/soundcloud.nix { }; - mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { }; + mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy/musicbox-webclient.nix { }; - mopidy-iris = callPackage ../applications/audio/mopidy-iris { }; + mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { }; motif = callPackage ../development/libraries/motif { }; @@ -16767,7 +16869,6 @@ with pkgs; mpv = callPackage ../applications/video/mpv rec { inherit (luaPackages) luasocket; youtube-dl = pythonPackages.youtube-dl; - libva = libva-full; waylandSupport = stdenv.isLinux; alsaSupport = !stdenv.isDarwin; pulseSupport = !stdenv.isDarwin; @@ -16852,6 +16953,8 @@ with pkgs; ostinato = callPackage ../applications/networking/ostinato { }; + p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; + panamax_api = callPackage ../applications/networking/cluster/panamax/api { }; panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { }; @@ -16970,6 +17073,8 @@ with pkgs; nedit = callPackage ../applications/editors/nedit { }; + nheko = callPackage ../applications/networking/instant-messengers/nheko { }; + nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; @@ -17033,6 +17138,8 @@ with pkgs; openjump = callPackage ../applications/misc/openjump { }; + openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; + openscad = callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; @@ -17125,6 +17232,8 @@ with pkgs; photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; + photoflow = callPackage ../applications/graphics/photoflow { }; + phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; phrasendrescher = callPackage ../tools/security/phrasendrescher { }; @@ -17171,6 +17280,8 @@ with pkgs; pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; + purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; @@ -17229,8 +17340,9 @@ with pkgs; qiv = callPackage ../applications/graphics/qiv { }; - processing = callPackage ../applications/graphics/processing { - jdk = jdk7; + processing = processing3; + processing3 = callPackage ../applications/graphics/processing3 { + jdk = oraclejdk8; }; # perhaps there are better apps for this task? It's how I had configured my preivous system. @@ -17283,9 +17395,11 @@ with pkgs; inherit (darwin.stubs) rez setfile; }; - qemu-riscv = callPackage ../applications/virtualization/qemu/riscv.nix {}; + qemu-riscv = lowPrio (callPackage ../applications/virtualization/qemu/riscv.nix {}); - qgis = callPackage ../applications/gis/qgis {}; + qgis = callPackage ../applications/gis/qgis { + inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; + }; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; @@ -17376,8 +17490,8 @@ with pkgs; quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; - quodlibet-full = callPackage ../applications/audio/quodlibet { - inherit (gnome2) gtksourceview; + quodlibet-full = quodlibet.override { + inherit (gnome3) gtksourceview webkitgtk; withDbusPython = true; withPyInotify = true; withMusicBrainzNgs = true; @@ -17385,7 +17499,6 @@ with pkgs; keybinder3 = keybinder3; libmodplug = libmodplug; kakasi = kakasi; - webkitgtk = webkitgtk24x-gtk3; libappindicator-gtk3 = libappindicator-gtk3; tag = "-full"; }; @@ -17453,7 +17566,8 @@ with pkgs; rkt = callPackage ../applications/virtualization/rkt { }; - rofi = callPackage ../applications/misc/rofi { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { }; + rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -17644,7 +17758,7 @@ with pkgs; dropbox = callPackage ../applications/networking/dropbox { }; - dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; + dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; insync = callPackage ../applications/networking/insync { }; @@ -17655,13 +17769,13 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; - lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) exo; }; slic3r = callPackage ../applications/misc/slic3r { }; - slic3r-prusa3d = callPackage ../applications/misc/slic3r-prusa3d { }; + slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; cura_stable = callPackage ../applications/misc/cura/stable.nix { @@ -17675,6 +17789,8 @@ with pkgs; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; + curaByDagoma = callPackage ../applications/misc/curabydagoma { }; + peru = callPackage ../applications/version-management/peru {}; pmidi = callPackage ../applications/audio/pmidi { }; @@ -17725,6 +17841,9 @@ with pkgs; inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; + curl = curl.override { + sslSupport = false; gnutlsSupport = true; + }; }; libspotify = callPackage ../development/libraries/libspotify { @@ -17758,9 +17877,11 @@ with pkgs; inherit sbcl lispPackages; }; - sublime = callPackage ../applications/editors/sublime { }; + sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); + + sublime3 = sublime3Packages.sublime3; - sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); + sublime3-dev = sublime3Packages.sublime3-dev; inherit (callPackages ../applications/version-management/subversion/default.nix { bdbSupport = true; @@ -17821,7 +17942,7 @@ with pkgs; tagainijisho = callPackage ../applications/office/tagainijisho {}; - tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; + tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; tailor = callPackage ../applications/version-management/tailor {}; @@ -17863,9 +17984,9 @@ with pkgs; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { - vte = gnome2.vte.override { pythonSupport = true; }; - }; + terminator = callPackage ../applications/misc/terminator { }; + + terminus = callPackage ../applications/misc/terminus { inherit (gnome2) GConf; }; lxterminal = callPackage ../applications/misc/lxterminal { vte = gnome3.vte; @@ -17929,6 +18050,8 @@ with pkgs; tnef = callPackage ../applications/misc/tnef { }; + todiff = callPackage ../applications/misc/todiff { }; + todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; tomahawk = callPackage ../applications/audio/tomahawk { @@ -17958,6 +18081,8 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; + toxiproxy = callPackage ../development/tools/toxiproxy { }; + tqsl = callPackage ../applications/misc/tqsl { }; transcode = callPackage ../applications/audio/transcode { }; @@ -18176,7 +18301,6 @@ with pkgs; vlc = callPackage ../applications/video/vlc { ffmpeg = ffmpeg_2; - libva = libva-full; # also wants libva-x11 }; vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { @@ -18197,7 +18321,7 @@ with pkgs; vscode = callPackage ../applications/editors/vscode { }; - vscode-with-extensions = callPackage ../applications/editors/vscode-with-extensions {}; + vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; vscode-utils = callPackage ../misc/vscode-extensions/vscode-utils.nix {}; @@ -18385,6 +18509,7 @@ with pkgs; ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun + ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple ); }; @@ -18433,9 +18558,7 @@ with pkgs; gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { - libva = libva-full; - }; + kodiPlain = callPackage ../applications/video/kodi { }; xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); @@ -18553,21 +18676,21 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome2"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome3"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; @@ -18738,9 +18861,7 @@ with pkgs; bastet = callPackage ../games/bastet {}; - beancount = callPackage ../applications/office/beancount { - pythonPackages = python3Packages; - }; + beancount = with python3.pkgs; toPythonApplication beancount; bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; @@ -18863,6 +18984,8 @@ with pkgs; endless-sky = callPackage ../games/endless-sky { }; + enyo-doom = libsForQt5.callPackage ../games/enyo-doom { }; + eternity = callPackage ../games/eternity-engine { }; extremetuxracer = callPackage ../games/extremetuxracer { @@ -18877,6 +19000,8 @@ with pkgs; factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; }; + factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; factorio-mods = callPackage ../games/factorio/mods.nix { }; @@ -18928,6 +19053,8 @@ with pkgs; gcs = callPackage ../games/gcs { }; + gcompris = libsForQt59.callPackage ../games/gcompris { }; + gemrb = callPackage ../games/gemrb { }; gl117 = callPackage ../games/gl-117 {}; @@ -19407,6 +19534,13 @@ with pkgs; xsokoban = callPackage ../games/xsokoban { }; + inherit (callPackage ../games/quake2/yquake2 { }) + yquake2 + yquake2-ctf + yquake2-ground-zero + yquake2-the-reckoning + yquake2-all-games; + zandronum = callPackage ../games/zandronum { }; zandronum-server = zandronum.override { @@ -19433,7 +19567,10 @@ with pkgs; clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; - deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + deepin = recurseIntoAttrs (import ../desktops/deepin { + inherit pkgs libsForQt5; + inherit (lib) makeScope; + }); enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; @@ -19456,7 +19593,7 @@ with pkgs; gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); - gnomeExtensions = { + gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; @@ -19464,10 +19601,12 @@ with pkgs; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; + impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { }; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; + system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; @@ -19517,7 +19656,7 @@ with pkgs; numix-gtk-theme = callPackage ../misc/themes/numix { }; - numix-solarized-gtk-theme = callPackage ../misc/themes/gtk3/numix-solarized-gtk-theme { }; + numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { }; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; @@ -19673,7 +19812,11 @@ with pkgs; blas = callPackage ../development/libraries/science/math/blas { }; - clblas = callPackage ../development/libraries/science/math/clblas { }; + clblas = callPackage ../development/libraries/science/math/clblas { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; + }; + + cliquer = callPackage ../development/libraries/science/math/cliquer { }; jags = callPackage ../applications/science/math/jags { }; @@ -19691,6 +19834,10 @@ with pkgs; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; + m4ri = callPackage ../development/libraries/science/math/m4ri { }; + + m4rie = callPackage ../development/libraries/science/math/m4rie { }; + nasc = callPackage ../applications/science/math/nasc { }; openblas = callPackage ../development/libraries/science/math/openblas { }; @@ -19703,6 +19850,8 @@ with pkgs; openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; + planarity = callPackage ../development/libraries/science/math/planarity { }; + fenics = callPackage ../development/libraries/science/math/fenics { inherit (python3Packages) numpy ply pytest python six sympy; pythonPackages = python3Packages; @@ -19710,6 +19859,8 @@ with pkgs; docs = true; }; + lrcalc = callPackage ../applications/science/math/lrcalc { }; + lie = callPackage ../applications/science/math/LiE { }; magma = callPackage ../development/libraries/science/math/magma { }; @@ -19807,6 +19958,8 @@ with pkgs; aspino = callPackage ../applications/science/logic/aspino {}; + beluga = callPackage ../applications/science/logic/beluga { }; + boogie = dotnetPackages.Boogie; inherit (callPackage ./coq-packages.nix {}) @@ -19879,6 +20032,7 @@ with pkgs; lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; + elan = callPackage ../applications/science/logic/elan {}; leo2 = callPackage ../applications/science/logic/leo2 { ocaml = ocamlPackages_4_01_0.ocaml;}; @@ -19945,14 +20099,18 @@ with pkgs; why3 = callPackage ../applications/science/logic/why3 {}; + workcraft = callPackage ../applications/science/logic/workcraft {}; + yices = callPackage ../applications/science/logic/yices { gmp-static = gmp.override { withStatic = true; }; }; - z3_4_5_0 = callPackage ../applications/science/logic/z3/4.5.0.nix {}; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; tlaplus = callPackage ../applications/science/logic/tlaplus {}; + tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {}; + tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {gtk = gtk2;}; + aiger = callPackage ../applications/science/logic/aiger {}; @@ -20037,6 +20195,8 @@ with pkgs; gap = callPackage ../applications/science/math/gap { }; + gap-minimal = lowPrio (gap.override { keepAllPackages = false; }); + geogebra = callPackage ../applications/science/math/geogebra { }; maxima = callPackage ../applications/science/math/maxima { @@ -20044,6 +20204,7 @@ with pkgs; }; maxima-ecl = callPackage ../applications/science/math/maxima { ecl = ecl_16_1_2; + ecl-fasl = true; sbcl = null; }; @@ -20071,13 +20232,7 @@ with pkgs; inherit (gnome3) gtksourceview; }; - singular = callPackage ../applications/science/math/singular { - stdenv = overrideCC stdenv gcc5; - }; - libsingular = callPackage ../applications/science/math/singular { - asLibsingular = true; - stdenv = overrideCC stdenv gcc5; - }; + singular = callPackage ../applications/science/math/singular { }; scilab = callPackage ../applications/science/math/scilab { withXaw3d = false; @@ -20128,6 +20283,8 @@ with pkgs; megam = callPackage ../applications/science/misc/megam { }; + ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; + root = callPackage ../applications/science/misc/root { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -20227,6 +20384,8 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; + click = callPackage ../applications/networking/cluster/click { }; + cups = callPackage ../misc/cups { libusb = libusb1; }; @@ -20264,6 +20423,8 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + cups-brother-hl1110 = callPackage_i686 ../misc/cups/drivers/hl1110 { }; + # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { }; @@ -20391,6 +20552,8 @@ with pkgs; helm = callPackage ../applications/audio/helm { }; + heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; + hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; @@ -20446,6 +20609,8 @@ with pkgs; moltengamepad = callPackage ../misc/drivers/moltengamepad { }; + openzwave = callPackage ../development/libraries/openzwave { }; + mongoc = callPackage ../development/libraries/mongoc { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { }; @@ -20480,6 +20645,8 @@ with pkgs; nix-index = callPackage ../tools/package-management/nix-index { }; + nix-pin = callPackage ../tools/package-management/nix-pin { }; + inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr nix-prefetch-cvs @@ -20494,6 +20661,8 @@ with pkgs; nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; }; + nix-review = callPackage ../tools/package-management/nix-review { }; + nix-serve = callPackage ../tools/package-management/nix-serve { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; @@ -20535,7 +20704,7 @@ with pkgs; pcre = pcre-cpp; }); - redis-desktop-manager = libsForQt59.callPackage ../applications/misc/redis-desktop-manager { }; + redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { }; robo3t = callPackage ../applications/misc/robo3t { }; @@ -20628,6 +20797,8 @@ with pkgs; canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; + hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; + mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { }; @@ -20675,6 +20846,11 @@ with pkgs; seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; + selinux-python = callPackage ../os-specific/linux/selinux-python { + # needs python3 bindings + libselinux = libselinux.override { python = python3; }; + libsemanage = libsemanage.override { python = python3; }; + }; slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; @@ -20718,8 +20894,12 @@ with pkgs; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {}; + terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; + terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { @@ -21116,4 +21296,9 @@ with pkgs; xml2rfc = callPackage ../tools/typesetting/xml2rfc { }; mmark = callPackage ../tools/typesetting/mmark { }; + + # Unix tools + unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); + inherit (unixtools) hexdump ps logger eject umount + mount wall hostname more sysctl; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 43d6d8d2dd5e..e21445b423d0 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -72,7 +72,7 @@ in rec { version = "8.7.2"; }; coq_8_8 = callPackage ../applications/science/logic/coq { - version = "8.8+beta1"; + version = "8.8.0"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 1f8039010d7b..d2d41792c461 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -1,4 +1,6 @@ -{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }: +{ buildPackages, pkgs, targetPackages +, darwin, stdenv, callPackage, callPackages, newScope +}: let apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; @@ -10,19 +12,23 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; + binutils-unwrapped = callPackage ../os-specific/darwin/binutils { + inherit (darwin) cctools; + inherit (pkgs) binutils-unwrapped; + }; + binutils = pkgs.wrapBintoolsWith { libc = if pkgs.targetPlatform != pkgs.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc; - bintools = callPackage ../os-specific/darwin/binutils { - inherit (darwin) cctools; - }; + bintools = darwin.binutils-unwrapped; }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { inherit (darwin) libobjc maloader; stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; + libcxxabi = pkgs.libcxxabi; xctoolchain = darwin.xcode.toolchain; }; @@ -39,8 +45,10 @@ in insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; - ios-cross = callPackage ../os-specific/darwin/ios-cross { - inherit (darwin) binutils; + iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs { + buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; + targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; + inherit (pkgs.llvmPackages) clang-unwrapped; }; libobjc = apple-source-releases.objc4; @@ -57,12 +65,16 @@ in stubs = callPackages ../os-specific/darwin/stubs { }; - swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { }; - trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; }; usr-include = callPackage ../os-specific/darwin/usr-include { }; xcode = callPackage ../os-specific/darwin/xcode { }; + CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; + + swift-corelibs = callPackages ../os-specific/darwin/swift-corelibs { }; + + darling = callPackage ../os-specific/darwin/darling/default.nix { }; + }) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index fbad836bc1ba..acc087108c98 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -385,9 +385,9 @@ let in lib.makeScope newScope (self: {} + // elpaPackages self // melpaStablePackages self // melpaPackages self - // elpaPackages self // orgPackages self // packagesFun self ) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 56d5aada81b6..f9cd2eb94337 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -67,6 +67,12 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; + ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { + bootPkgs = packages.ghc821Binary; + inherit (bootPkgs) alex happy; + buildLlvmPackages = buildPackages.llvmPackages_5; + llvmPackages = pkgs.llvmPackages_5; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; @@ -128,6 +134,11 @@ in rec { ghc = bh.compiler.ghc841; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; + ghc842 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc842; + ghc = bh.compiler.ghc842; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index a23de670836b..3da443098037 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -738,7 +738,7 @@ let owner = "libmpack"; repo = "libmpack-lua"; rev = version; - sha256 = "1nydi6xbmxwl1fmi32v5v8n74msnmzblzqaqnb102w6vkinampsb"; + sha256 = "0l4k7qmwaa0zpxrlp27yp4pbbyiz3zgxywkm543q6wkzn6wmq8l8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 65d3de2d9e2e..72bcc45c48e6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -326,10 +326,16 @@ let js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {}; + js_of_ocaml-lwt = callPackage ../development/tools/ocaml/js_of_ocaml/lwt.nix {}; + js_of_ocaml-ocamlbuild = callPackage ../development/tools/ocaml/js_of_ocaml/ocamlbuild.nix {}; js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; + js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {}; + + js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; + jsonm = callPackage ../development/ocaml-modules/jsonm { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; @@ -366,16 +372,18 @@ let lru = callPackage ../development/ocaml-modules/lru { }; - lwt2 = callPackage ../development/ocaml-modules/lwt { }; + lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { }; lwt3 = if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/lwt { - version = "3.0.0"; - } + then callPackage ../development/ocaml-modules/lwt { } else throw "lwt3 is not available for OCaml ${ocaml.version}"; ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { + lwt = lwt3; + }; + lwt_react = callPackage ../development/ocaml-modules/lwt_react { lwt = lwt3; }; @@ -650,7 +658,9 @@ let ssl = callPackage ../development/ocaml-modules/ssl { }; - stog = callPackage ../applications/misc/stog { }; + stog = callPackage ../applications/misc/stog { + ocaml_lwt = lwt2; + }; stringext = callPackage ../development/ocaml-modules/stringext { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13554ff6ee68..2034fd81c87b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -51,7 +51,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9"; }; - propagatedBuildInputs = [AlgorithmDiff]; + propagatedBuildInputs = [ AlgorithmDiff ]; }; AlgorithmC3 = buildPerlPackage rec { @@ -88,12 +88,25 @@ let self = _self // overrides; _self = with self; { }; }; - aliased = buildPerlPackage rec { + aliased = buildPerlModule rec { name = "aliased-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "1syyqzy462501kn5ma9gl6xbmcahqcn4qpafhsmpz0nd0x2m4l63"; }; + buildInputs = [ ModuleBuildTiny ]; + }; + + asa = buildPerlPackage rec { + name = "asa-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/asa-1.03.tar.gz; + sha256 = "1w97m0gf3n9av61d0qcw7d1i1rac4gm0fd2ba5wyh53df9d7p0i2"; + }; + meta = { + description = "Lets your class/object say it works like something else"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; AlienTidyp = buildPerlModule rec { @@ -104,18 +117,19 @@ let self = _self // overrides; _self = with self; { sha256 = "0raapwp4155lqag1kzhsd20z4if10hav9wx4d7mc1xpvf7dcnr5r"; }; - buildInputs = [ FileShareDir ArchiveExtract ]; + buildInputs = [ ArchiveExtract ]; TIDYP_DIR = "${pkgs.tidyp}"; + propagatedBuildInputs = [ FileShareDir ]; }; - AlienWxWidgets = buildPerlPackage rec { - name = "Alien-wxWidgets-0.67"; + AlienWxWidgets = buildPerlModule rec { + name = "Alien-wxWidgets-0.69"; src = fetchurl { url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; - sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; + sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK - ModulePluggable ModuleBuild ]; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ]; + buildInputs = [ LWPProtocolHttps ]; }; AnyEvent = buildPerlPackage rec { @@ -136,7 +150,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PO/POTYL/${name}.tar.gz"; sha256 = "41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ AnyEvent ]; doCheck = false; # does an DNS lookup meta = { @@ -183,21 +196,21 @@ let self = _self // overrides; _self = with self; { }; AnyMoose = buildPerlPackage rec { - name = "Any-Moose-0.26"; + name = "Any-Moose-0.27"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "1wcd1lpx38hvxk6k0zpx48hb7yidxnlr34lyk51zxin9ra9f2104"; + sha256 = "0dc55mpayrixwx8dwql0vj0jalg4rlb3k64rprc84bl0z8vkx9m8"; }; - propagatedBuildInputs = [ Mouse ]; + propagatedBuildInputs = [ Moose Mouse ]; }; ApacheLogFormatCompiler = buildPerlModule rec { - name = "Apache-LogFormat-Compiler-0.33"; + name = "Apache-LogFormat-Compiler-0.35"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "17blk3zhp05azgypn25ydxf3d7fyfgr9bxyiv7xkchhqma96vwqv"; + sha256 = "06i70ydxk2wa2rcqn16842kra2qz3jwk0vk1abq8lah4180c0m0n"; }; - buildInputs = [ HTTPMessage ModuleBuild TestMockTime TestRequires TryTiny URI ]; + buildInputs = [ HTTPMessage ModuleBuildTiny TestMockTime TestRequires TryTiny URI ]; propagatedBuildInputs = [ POSIXstrftimeCompiler ]; # We cannot change the timezone on the fly. prePatch = "rm t/04_tz.t"; @@ -208,7 +221,7 @@ let self = _self // overrides; _self = with self; { }; }; - ApacheSession = buildPerlPackage { + ApacheSession = buildPerlModule { name = "Apache-Session-1.93"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz; @@ -235,22 +248,23 @@ let self = _self // overrides; _self = with self; { }; AppCLI = buildPerlPackage { - name = "App-CLI-0.313"; + name = "App-CLI-0.49"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORNELIUS/App-CLI-0.313.tar.gz; - sha256 = "0ni1z14xis1b634qjc3zra9c9pl2icfr6sp5qxs0xy8nvib65037"; + url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.49.tar.gz; + sha256 = "0gv4dcscxiacdrb9aqxc9mdl1w8wszicmg2q86zlz31ya5spjvv3"; }; - propagatedBuildInputs = [LocaleMaketextSimple]; + propagatedBuildInputs = [ CaptureTiny ClassLoad ]; + buildInputs = [ TestKwalitee TestPod ]; }; AppCmd = buildPerlPackage rec { - name = "App-Cmd-0.330"; + name = "App-Cmd-0.331"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "7a7bfd7196f7551a07509b03ea7abddc1fa9aee19a84e3dd5ba939c619cb6011"; + sha256 = "4a5d3df0006bd278880d01f4957aaa652a8f91fe8f66e93adf70fba0c3ecb680"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix SubExporter SubInstall ]; + propagatedBuildInputs = [ CaptureTiny ClassLoad GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix ]; meta = { homepage = https://github.com/rjbs/App-Cmd; description = "Write command line apps with less suffering"; @@ -269,13 +283,26 @@ let self = _self // overrides; _self = with self; { meta = { description = "A bundle of Perl5 modules for reading configuration files and parsing command line arguments"; }; + buildInputs = [ TestPod ]; + }; + + AppFatPacker = buildPerlPackage rec { + name = "App-FatPacker-0.010007"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010007.tar.gz; + sha256 = "1g9nff9fdg7dvja0ix2yv32w5xcj963ybcf7x22j61g6r81845fi"; + }; + meta = { + description = "pack your dependencies onto your script file"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; Appcpanminus = buildPerlPackage rec { - name = "App-cpanminus-1.7040"; + name = "App-cpanminus-1.7043"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "fc8e5cde17cc5f4cc13aea8781c1e9425f76abc684cc720e9253f47ab3529556"; + sha256 = "68a06f7da80882a95bc02c92c7ee305846fb6ab648cf83678ea945e44ad65c65"; }; meta = { homepage = https://github.com/miyagawa/cpanminus; @@ -286,13 +313,13 @@ let self = _self // overrides; _self = with self; { }; Appperlbrew = buildPerlPackage rec { - name = "App-perlbrew-0.73"; + name = "App-perlbrew-0.82"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0ym7ahjm95igm1hg0qwy29zdcjqdcakcmrn3r8xlbvqkk5xrxg5c"; + sha256 = "0p6l5i85zp89f5sh0gyz7didla672zg169yprbqcf97icmr46g80"; }; - buildInputs = [ pkgs.curl IOAll PathClass TestException TestNoWarnings TestOutput TestSpec ]; - propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; + buildInputs = [ pkgs.curl FileWhich IOAll PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec ]; + propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ]; preConfigure = '' patchShebangs . @@ -306,24 +333,29 @@ let self = _self // overrides; _self = with self; { }; }; + ArchiveAnyLite = buildPerlPackage rec { + name = "Archive-Any-Lite-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz; + sha256 = "0w2i50fd81ip674zmnrb15nadw162fdpiw4rampbd94k74jqih8m"; + }; + propagatedBuildInputs = [ ArchiveZip ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "simple CPAN package extractor"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AppSqitch = buildPerlModule rec { - version = "0.9996"; + version = "0.9997"; name = "App-Sqitch-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "864edde554e7cd6578e8fe2a4c17ea8eda82da878cdfd00fd9fb3c53f696fc1e"; + sha256 = "985ade1a4181bef776016a287194711051e79c7a3c18f1ee1ec47e22ccf319d2"; }; - buildInputs = [ - CaptureTiny PathClass TestDeep TestDir TestException - TestFile TestFileContents TestMockModule TestNoWarnings - ]; - propagatedBuildInputs = [ - Clone ConfigGitLike DBI DateTime - DevelStackTrace EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 - IPCSystemSimple ListMoreUtils Moo PathClass PerlIOutf8_strict StringFormatter - StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI - URIdb libintlperl namespaceautoclean - ]; + buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = http://sqitch.org/; @@ -379,14 +411,28 @@ let self = _self // overrides; _self = with self; { }; }; - ArrayCompare = buildPerlPackage rec { - name = "Array-Compare-2.11"; + ArrayCompare = buildPerlModule rec { + name = "Array-Compare-3.0.1"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/${name}.tar.gz"; - sha256 = "0f1mg2lpr5jzxy1hciww7vlp4r602vfwpzsqmhkgv1i107pmiwcs"; + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.1.tar.gz; + sha256 = "0fyj6jdfshga4kj4567529a1aiqy49awxg62lslx54166j4mhkzb"; }; - buildInputs = [ TestNoWarnings Moo TypeTiny ]; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ Moo TypeTiny ]; + }; + + ArrayDiff = buildPerlPackage rec { + name = "Array-Diff-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TY/TYPESTER/Array-Diff-0.07.tar.gz; + sha256 = "0il3izx45wkh71fli2hvaq32jyin95k8x3qrnwby2x2c6yix7rvq"; + }; + propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; + meta = { + description = "Find the differences between two arrays"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ArrayFIFO = buildPerlPackage rec { @@ -395,7 +441,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; sha256 = "8082b7ca456d02c7c862ba409cbd62a9cafdb8c5832f5d7fb1d37ba8698ee5b1"; }; - buildInputs = [ TestSpec ]; + buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/dwburke/perl-Array-FIFO; @@ -433,12 +479,12 @@ let self = _self // overrides; _self = with self; { }; ArchiveExtract = buildPerlPackage rec { - name = "Archive-Extract-0.76"; + name = "Archive-Extract-0.80"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "9ae7080ca70346dd7d9845c581d2e112f4513ec0f7d79c2011c0e0a2ce874cfc"; + sha256 = "25cbc2d5626c14d39a0b5e4fe8383941e085c9a7e0aa873d86e81b6e709025f4"; }; - propagatedBuildInputs = [ self."if" ]; + propagatedBuildInputs = [ ModuleLoadConditional ]; meta = { description = "Generic archive extracting mechanism"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -446,10 +492,10 @@ let self = _self // overrides; _self = with self; { }; ArchiveTar = buildPerlPackage rec { - name = "Archive-Tar-2.08"; + name = "Archive-Tar-2.26"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "62e34feffd51e21b24f2ba5b15adf3ca3bd084163bfec40fe30f8f8e8963066b"; + sha256 = "01246ffbadb6e76a04a32bf689894cf56ef9d34d58101ff1c51af8f6f1ef5843"; }; meta = { description = "Manipulates TAR archives"; @@ -457,34 +503,47 @@ let self = _self // overrides; _self = with self; { }; }; + ArchiveTarWrapper = buildPerlPackage rec { + name = "Archive-Tar-Wrapper-0.23"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSCHILLI/Archive-Tar-Wrapper-0.23.tar.gz; + sha256 = "1ykl0r2dwa93l0nxrjgs8qqkwjxn44qbvxpmrwiy269na4x3j0jc"; + }; + propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; + meta = { + description = "API wrapper around the 'tar' utility"; + }; + }; + ArchiveZip = buildPerlPackage { - name = "Archive-Zip-1.16"; + name = "Archive-Zip-1.60"; src = fetchurl { - url = http://tarballs.nixos.org/Archive-Zip-1.16.tar.gz; - sha256 = "1ghgs64by3ybjlb0bj65kxysb03k72i7iwmw63g41bj175l44ima"; + url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz; + sha256 = "02y2ylq83hy9kgj57sc0239x65br9sm98c0chsm61s08yc2mpiza"; }; + buildInputs = [ TestMockModule ]; }; ArchiveZip_1_53 = buildPerlPackage { - name = "Archive-Zip-1.53"; + name = "Archive-Zip-1.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.53.tar.gz; - sha256 = "c66f3cdfd1965d47d84af1e37b997e17d3f8c5f2cceffc1e90d04d64001424b9"; + url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz; + sha256 = "eac75b05f308e860aa860c3094aa4e7915d3d31080e953e49bc9c38130f5c20b"; }; meta = { description = "Provide an interface to ZIP archive files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestMockModule ]; }; AudioScan = buildPerlPackage rec { - name = "Audio-Scan-0.93"; + name = "Audio-Scan-0.99"; src = fetchurl { url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "03nwcm234y76jb1p20rlcky6vzv68i46s9mjfr7kzp65w3yg94js"; + sha256 = "00092cjj89sp019b35fm3qiz4iczqznwa3yhx5jdkazlwjhlmmma"; }; - buildInputs = [ pkgs.zlib ModuleBuild ModuleBuildPluggablePPPort ]; - propagatedBuildInputs = [ TestWarn ]; + buildInputs = [ pkgs.zlib TestWarn ]; NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; meta = { @@ -493,14 +552,13 @@ let self = _self // overrides; _self = with self; { }; }; - AuthenDecHpwd = buildPerlPackage rec { - name = "Authen-DecHpwd-2.006"; + AuthenDecHpwd = buildPerlModule rec { + name = "Authen-DecHpwd-2.007"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "67f45fef6a23b7548f387b675cbf7881bf9da62d7d007cbf90d3a4b851b99eb7"; + sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ ScalarString DataInteger DigestCRC ]; + propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; license = stdenv.lib.licenses.gpl1Plus; @@ -510,7 +568,7 @@ let self = _self // overrides; _self = with self; { AuthenHtpasswd = buildPerlPackage rec { name = "Authen-Htpasswd-0.171"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Authen/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz; sha256 = "0rw06hwpxg388d26l0jvirczx304f768ijvc20l4b2ll7xzg9ymm"; }; propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; @@ -520,15 +578,13 @@ let self = _self // overrides; _self = with self; { }; }; - AuthenPassphrase = buildPerlPackage rec { + AuthenPassphrase = buildPerlModule rec { name = "Authen-Passphrase-0.008"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ModuleRuntime ParamsClassify CryptPasswdMD5 CryptDES - DataEntropy CryptUnixCryptXS CryptEksblowfish CryptMySQL DigestMD4 AuthenDecHpwd]; + propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ]; meta = { description = "Hashed passwords/passphrases as objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -538,7 +594,7 @@ let self = _self // overrides; _self = with self; { AuthenRadius = buildPerlPackage rec { name = "Authen-Radius-0.26"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/P/PO/PORTAONE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.26.tar.gz; sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3"; }; buildInputs = [ TestNoWarnings ]; @@ -575,11 +631,24 @@ let self = _self // overrides; _self = with self; { }; }; + AuthenSimplePasswd = buildPerlModule rec { + name = "Authen-Simple-Passwd-0.6"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz; + sha256 = "1ckl2ry9r5nb1rcn1ik2l5b5pp1i3g4bmllsmzb0zpwy4lvbqmfg"; + }; + propagatedBuildInputs = [ AuthenSimple ]; + meta = { + description = "Simple Passwd authentication"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + autobox = buildPerlPackage rec { - name = "autobox-2.84"; + name = "autobox-2.85"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz"; - sha256 = "98dd2754f226684a72ccba3a95956b7eaff2871568e4dd9746e6fb6daae0b96b"; + sha256 = "d0b8d0f27f3d1c1e8ef47f806fa06b9c229c3ca84057004fedc35dbbc0341140"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { @@ -596,8 +665,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TE/TEEJAY/${name}.tar.gz"; sha256 = "08pl5y18nsvy8ihfzdsbd8rz6a8al09wqfna07zdjfdyib42b0dc"; }; - propagatedBuildInputs = [ TemplateToolkit Inline InlineJava GraphViz - XMLSimple DBI ]; + propagatedBuildInputs = [ TemplateToolkit XMLSimple ]; meta = { description = "AutoDia, create UML diagrams from source code"; @@ -619,6 +687,7 @@ let self = _self // overrides; _self = with self; { maintainers = [ ]; }; + buildInputs = [ DBI ]; }; autodie = null; # part of Perl @@ -636,10 +705,10 @@ let self = _self // overrides; _self = with self; { }; autovivification = buildPerlPackage rec { - name = "autovivification-0.16"; + name = "autovivification-0.18"; src = fetchurl { url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "1422kw9fknv7rbjkgdfflg1q3mb69d3yryszp38dn0bgzkqhwkc1"; + sha256 = "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d"; }; meta = { homepage = http://search.cpan.org/dist/autovivification/; @@ -649,10 +718,10 @@ let self = _self // overrides; _self = with self; { }; base = buildPerlPackage { - name = "base-2.18"; + name = "base-2.23"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/base-2.18.tar.gz; - sha256 = "55b0d21f8edb5ef6dddcb1fd2457acb19c7584f2dfdea614685cd8ea62a1c306"; + url = mirror://cpan/authors/id/R/RJ/RJBS/base-2.23.tar.gz; + sha256 = "40f55841299a9fe6fab03cd098f94e9221fb516978e9ef40fd8ff2cbd6625dde"; }; }; @@ -668,13 +737,14 @@ let self = _self // overrides; _self = with self; { description = "Perl compiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; BFlags = buildPerlPackage rec { - name = "B-Flags-0.14"; + name = "B-Flags-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "07inzxvvf4bkl4iliys9rfdiz309nccpbr82a7g57bhcylj7qhzn"; + sha256 = "1chhgkaw2h3qniz71dykynggqp0r6b6mi2f4nh4x3ghm2g89gny1"; }; meta = { description = "Friendlier flags for B"; @@ -687,12 +757,12 @@ let self = _self // overrides; _self = with self; { }; BHooksEndOfScope = buildPerlPackage rec { - name = "B-Hooks-EndOfScope-0.15"; + name = "B-Hooks-EndOfScope-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "0bllq4077hxbdsh31r3cwpm6mzmc0247rrg1lr7rk7flscif8bhj"; + sha256 = "0b70vbpabsy9ia366k330cz1zbdyb1pwhb0l7j28pmpih045iwwh"; }; - propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ]; + propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; meta = { homepage = https://metacpan.org/release/B-Hooks-EndOfScope; description = "Execute code after a scope finished compilation"; @@ -701,10 +771,10 @@ let self = _self // overrides; _self = with self; { }; BHooksOPCheck = buildPerlPackage { - name = "B-Hooks-OP-Check-0.19"; + name = "B-Hooks-OP-Check-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/B-Hooks-OP-Check-0.19.tar.gz; - sha256 = "0pp1piv74pv9irqlvl5xcs2dvzbb74niwjhnj6dsckxf1j34mzrg"; + url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz; + sha256 = "1kfdv25gn6yik8jrwik4ajp99gi44s6idcvyyrzhiycyynzd3df7"; }; buildInputs = [ ExtUtilsDepends ]; meta = { @@ -721,20 +791,20 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; sha256 = "28685b271251927d327851e5951e38649524a4e50cb0d1d35d649e2b814f212d"; }; - buildInputs = [ MathBigInt MathBigRat ]; meta = { description = "Transparent BigNumber support for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ MathBigInt ]; }; BitVector = buildPerlPackage { - name = "Bit-Vector-7.3"; + name = "Bit-Vector-7.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz; - sha256 = "0gcg1173i1bsx2qvyw77kw90xbf03b861jc42hvq744vzc5k6xjs"; + url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz; + sha256 = "09m96p8c0ipgz42li2ywdgy0vxb57mb5nf59j9gw7yzc3xkslv9w"; }; - propagatedBuildInputs = [CarpClan]; + propagatedBuildInputs = [ CarpClan ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -742,10 +812,10 @@ let self = _self // overrides; _self = with self; { }; BKeywords = buildPerlPackage rec { - name = "B-Keywords-1.14"; + name = "B-Keywords-1.18"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "1llaqhx6711lsf6mxmvrhjigpy3ymmf3wl8kvn7l0fsppnmn45lw"; + sha256 = "0f5bb2fpbq5jzdb2jfs73hrggrq2gnpacd2kkxgifjl7q7xd9ck5"; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -772,21 +842,20 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz"; sha256 = "1jnihz3029x51a455nxa0jx2z125x38q3vkkggsgdlrvawzxsm00"; }; - propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; patches = [ # Fix out of memory error on Perl 5.19.4 and later. ../development/perl-modules/boost-geometry-utils-fix-oom.patch ]; perlPreHook = "export LD=$CC"; + buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp ]; }; BSDResource = buildPerlPackage rec { name = "BSD-Resource-1.2911"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz"; + url = mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz; sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x"; }; - buildInputs = [ TestPod TestPodCoverage ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "BSD process resource limit and priority functions"; @@ -794,26 +863,40 @@ let self = _self // overrides; _self = with self; { }; }; + BUtils = buildPerlPackage rec { + name = "B-Utils-0.27"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz; + sha256 = "1spzhmk3z6c4blmra3kn84nq20fira2b3vjg86m0j085lgv56zzr"; + }; + propagatedBuildInputs = [ TaskWeaken ]; + buildInputs = [ ExtUtilsDepends ]; + meta = { + description = "Helper functions for op tree manipulation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://search.cpan.org/dist/B-Utils"; + }; + }; + BusinessHours = buildPerlPackage rec { name = "Business-Hours-0.12"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz; sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv"; }; - buildInputs = [ TestPod TestPodCoverage ]; - propagatedBuildInputs = [ SetIntSpan TimeLocal ]; + propagatedBuildInputs = [ SetIntSpan ]; meta = { description = "Calculate business hours in a time period"; }; }; BusinessISBN = buildPerlPackage rec { - name = "Business-ISBN-2.09"; + name = "Business-ISBN-3.004"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "0fhjzgwjxypai16vv0bws6pnxgcglcbgza81avkck6w6d3jkki4r"; + sha256 = "07l3zfv8hagv37i3clvj5a1zc2jarr5phg80c93ks35zaz6llx9i"; }; - propagatedBuildInputs = [ BusinessISBNData URI ]; + propagatedBuildInputs = [ BusinessISBNData ]; meta = { description = "Parse and validate ISBNs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -821,10 +904,10 @@ let self = _self // overrides; _self = with self; { }; BusinessISBNData = buildPerlPackage rec { - name = "Business-ISBN-Data-20140910.002"; + name = "Business-ISBN-Data-20140910.003"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "1bnbiv4vsz0hr1bm3nq9pjsjnf0mndp2vahwsvxbnv1gczb1691y"; + sha256 = "1jc5jrjwkr6pqga7998zkgw0yrxgb5n1y7lzgddawxibkf608mn7"; }; meta = { description = "Data pack for Business::ISBN"; @@ -833,10 +916,10 @@ let self = _self // overrides; _self = with self; { }; BusinessISMN = buildPerlPackage rec { - name = "Business-ISMN-1.13"; + name = "Business-ISMN-1.131"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "0cm1v75axg4gp6cnbyavmnqqjscsxh7nc60vcbw34rqivvf9idc9"; + sha256 = "1xyc7x4c4xl930rz7grs1l52f1vg4rbiv0c6xlxdsim8qsh7k94g"; }; propagatedBuildInputs = [ TieCycle ]; meta = { @@ -860,7 +943,7 @@ let self = _self // overrides; _self = with self; { CacheCache = buildPerlPackage rec { name = "Cache-Cache-1.08"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz; sha256 = "1s6i670dc3yb6ngvdk48y6szdk5n1f4icdcjv2vi1l2xp9fzviyj"; }; propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ]; @@ -868,10 +951,10 @@ let self = _self // overrides; _self = with self; { }; CacheFastMmap = buildPerlPackage rec { - name = "Cache-FastMmap-1.43"; + name = "Cache-FastMmap-1.46"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; - sha256 = "18k10bhi67iyy8igw8hwb339miwscgnsh9y2pbncw6gdr2b610vi"; + url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.46.tar.gz; + sha256 = "0061kwlbv398b2hb0kx1r6lmqf4kb6dnq9j4lsikczyk981sxs98"; }; }; @@ -890,10 +973,10 @@ let self = _self // overrides; _self = with self; { }; CacheMemcachedFast = buildPerlPackage { - name = "Cache-Memcached-Fast-0.21"; + name = "Cache-Memcached-Fast-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KROKI/Cache-Memcached-Fast-0.21.tar.gz; - sha256 = "0lvwkkyazbb7i6c5ga5ms3gsvy721njpcbc2icxcsvc8bz32nz5i"; + url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz; + sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq"; }; meta = { description = "Perl client for B<memcached>, in C language"; @@ -903,13 +986,13 @@ let self = _self // overrides; _self = with self; { }; }; - CacheMemory = buildPerlPackage { - name = "Cache-Memory-2.04"; + CacheMemory = buildPerlModule { + name = "Cache-2.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLEISHMAN/Cache-2.04.tar.gz; - sha256 = "1zykapgl9lxnlx79xfghzb26qimhry94xfxfyswwfhra1ywd9yyg"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz; + sha256 = "14m513f4g02daklmnvdm7vqh3w3ick65wvmvqnmnc4cqfybdilp1"; }; - propagatedBuildInputs = [ TimeDate DBFile DigestSHA1 FileNFSLock HeapFibonacci IOString ]; + propagatedBuildInputs = [ DBFile FileNFSLock HeapFibonacci IOString TimeDate ]; doCheck = false; # can time out meta = { maintainers = with maintainers; [ ]; @@ -935,22 +1018,33 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.cairo ]; + buildInputs = [ pkgs.cairo ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the cairo 2D vector graphics library"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; - cam_pdf = buildPerlPackage rec { + cam_pdf = buildPerlModule rec { name = "CAM-PDF-1.60"; src = fetchurl { url = "mirror://cpan/authors/id/C/CD/CDOLAN/${name}.tar.gz"; sha256 = "12dv5ssf3y7yjz9mrrqnfzx8nf4ydk1qijf5fx59495671zzqsp7"; }; propagatedBuildInputs = [ CryptRC4 TextPDF ]; - buildInputs = [ TestMore ]; + }; + + capitalization = buildPerlPackage rec { + name = "capitalization-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz; + sha256 = "0g7fpckydzxsf8mjkfbyj0pv42dzym4hwbizqahnh7wlfbaicdgi"; + }; + propagatedBuildInputs = [ DevelSymdump ]; + meta = { + }; }; CanaryStability = buildPerlPackage rec { @@ -965,13 +1059,12 @@ let self = _self // overrides; _self = with self; { }; CaptchaReCAPTCHA = buildPerlPackage rec { - name = "Captcha-reCAPTCHA-0.97"; + name = "Captcha-reCaptcha-0.99"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz; - sha256 = "12f2yh89aji6mnkrqxjcllws5dlg545wvz0j7wamy149xyqi12wq"; + url = mirror://cpan/authors/id/S/SU/SUNNYP/Captcha-reCaptcha-0.99.tar.gz; + sha256 = "14j3lk6fhfzda5d3d7z6f373ng3fzxazzwpjyziysrhic1v3b4mq"; }; - propagatedBuildInputs = [HTMLTiny LWP]; - buildInputs = [TestPod]; + propagatedBuildInputs = [ HTMLTiny LWP ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -979,10 +1072,10 @@ let self = _self // overrides; _self = with self; { }; CaptureTiny = buildPerlPackage rec { - name = "Capture-Tiny-0.30"; + name = "Capture-Tiny-0.46"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "1siswsz63wcvldnq1ns1gm5kbs768agsgcgh1papfzkmg19fbd53"; + sha256 = "05bhlx6d4nzamhkkh0pkckg7wlvaq6mazf7q1fbb5wpp1j1nlyjx"; }; meta = { homepage = https://metacpan.org/release/Capture-Tiny; @@ -1013,42 +1106,44 @@ let self = _self // overrides; _self = with self; { description = "Warns and dies noisily with stack backtraces"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestBase ]; }; CarpAssert = buildPerlPackage { - name = "Carp-Assert-0.20"; + name = "Carp-Assert-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Carp-Assert-0.20.tar.gz; - sha256 = "1wzy4lswvwi45ybsm65zlq17rrqx84lsd7rajvd0jvd5af5lmlqd"; + url = mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz; + sha256 = "0km5fc6r6whxh6h5yd7g1j0bi96sgk0gkda6cardicrw9qmqwkwj"; }; meta = { }; }; CarpAssertMore = buildPerlPackage { - name = "Carp-Assert-More-1.14"; + name = "Carp-Assert-More-1.16"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.14.tar.gz; - sha256 = "0cq7qk4qbhqppm4raby5k24b5mx5qjgy1884nrddhxillnzlq01z"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz; + sha256 = "1x9jd6s3lq97na6gz7g0zaq62l8z297xsfpdj2v42p3ijpfirl4f"; }; - propagatedBuildInputs = [ CarpAssert TestException ]; + propagatedBuildInputs = [ CarpAssert ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; license = stdenv.lib.licenses.artistic2; }; + buildInputs = [ TestException ]; }; CarpClan = buildPerlPackage { - name = "Carp-Clan-6.04"; + name = "Carp-Clan-6.06"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Carp-Clan-6.04.tar.gz; - sha256 = "1v71k8s1pi16l5y579gnrg372c6pdvy6qqm6iddm8h1dx7n16bjl"; + url = mirror://cpan/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz; + sha256 = "1m6902n6s627nsvyn2vyrk29q7lh6808hsdk7ka5cirm27vchjpa"; }; - propagatedBuildInputs = [ TestException ]; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException ]; }; CatalystActionRenderView = buildPerlPackage rec { @@ -1057,8 +1152,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "8565203950a057d43ecd64e9593715d565c2fbd8b02c91f43c53b2111acd3948"; }; - buildInputs = [ HTTPRequestAsCGI ]; - propagatedBuildInputs = [ CatalystRuntime DataVisitor MROCompat ]; + propagatedBuildInputs = [ CatalystRuntime DataVisitor ]; meta = { description = "Sensible default end action"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1066,13 +1160,13 @@ let self = _self // overrides; _self = with self; { }; CatalystActionREST = buildPerlPackage rec { - name = "Catalyst-Action-REST-1.20"; + name = "Catalyst-Action-REST-1.21"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.20.tar.gz; - sha256 = "c0470541ec0016b837db3186ed77915813c8b856b941db89b86db8602e31ead6"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.21.tar.gz; + sha256 = "ccf81bba5200d3a0ad6901f923af173a3d4416618aea08a6938baaffdef4cb20"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ CatalystRuntime ClassInspector JSONMaybeXS MROCompat ModulePluggable Moose ParamsValidate URIFind namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime URIFind ]; meta = { description = "Automated REST Method Dispatching"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1080,13 +1174,13 @@ let self = _self // overrides; _self = with self; { }; CatalystAuthenticationCredentialHTTP = buildPerlPackage { - name = "Catalyst-Authentication-Credential-HTTP-1.015"; + name = "Catalyst-Authentication-Credential-HTTP-1.016"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Credential-HTTP-1.015.tar.gz; - sha256 = "02gyq0vkhj2psd7hvw4b095mvsz7vbq8kv4k8lq748jnx5kmnfrq"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Credential-HTTP-1.016.tar.gz; + sha256 = "0r4kah3qr9d7iq16i64qbj6hxjfwv5fjy3jzwgs2qmr4mjixsg51"; }; buildInputs = [ TestException TestMockObject ]; - propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime ClassAccessorFast DataUUID StringEscape URI ]; + propagatedBuildInputs = [ CatalystPluginAuthentication DataUUID StringEscape ]; meta = { description = "HTTP Basic and Digest authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1095,15 +1189,14 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystAuthenticationStoreHtpasswd = buildPerlPackage rec { - name = "Catalyst-Authentication-Store-Htpasswd-1.003"; + CatalystAuthenticationStoreHtpasswd = buildPerlModule rec { + name = "Catalyst-Authentication-Store-Htpasswd-1.006"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "09mn0wjwfvnfi28y47g816nx50zdpvwvbxp0nrpsap0ir1m80wi3"; + url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Store-Htpasswd-1.006.tar.gz; + sha256 = "0kw0w2g1qmym896bgnqr1bfhvgb6xja39mv10701ipp8fmi8bzf7"; }; - buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; - propagatedBuildInputs = - [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ]; + buildInputs = [ ModuleBuildTiny TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ AuthenHtpasswd CatalystPluginAuthentication ]; }; CatalystAuthenticationStoreDBIxClass = buildPerlPackage { @@ -1112,12 +1205,13 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz; sha256 = "0i5ja7690fs9nhxcij6lw51j804sm8s06m5mvk1n8pi8jljrymvw"; }; - propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ]; + propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; + buildInputs = [ TestWarn ]; }; CatalystComponentInstancePerContext = buildPerlPackage rec { @@ -1126,7 +1220,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz"; sha256 = "7f63f930e1e613f15955c9e6d73873675c50c0a3bc2a61a034733361ed26d271"; }; - propagatedBuildInputs = [ CatalystRuntime Moose ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Moose role to create only one instance of component per context"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1134,27 +1228,27 @@ let self = _self // overrides; _self = with self; { }; CatalystControllerHTMLFormFu = buildPerlPackage rec { - name = "Catalyst-Controller-HTML-FormFu-1.00"; + name = "Catalyst-Controller-HTML-FormFu-2.02"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz"; - sha256 = "84329b287716cdc6d3c5a9ee185458cd2ce7abd9d902eac1c6240ef17572f12c"; + url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.02.tar.gz; + sha256 = "5ddfd4983bfb0c722995c964b4d9264b3a26a89c820c921648631a7717be0551"; }; - buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT TemplateToolkit TestAggregate TestWWWMechanize TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystRuntime ConfigAny HTMLFormFu Moose MooseXAttributeChained RegexpAssemble TaskWeaken namespaceautoclean ]; + buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT TemplateToolkit TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFu RegexpAssemble ]; meta = { description = "Catalyst integration for HTML::FormFu"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - CatalystControllerPOD = buildPerlPackage rec { + CatalystControllerPOD = buildPerlModule rec { name = "Catalyst-Controller-POD-1.0.0"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9"; }; - buildInputs = [ CatalystRuntime ModuleBuild ModuleInstall TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystPluginStaticSimple CatalystRuntime ClassAccessor FileShareDir FileSlurp JSONXS LWP ListMoreUtils PathClass PodPOM PodPOMViewTOC TestWWWMechanizeCatalyst XMLSimple ]; + buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ CatalystPluginStaticSimple FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ]; meta = { homepage = http://search.cpan.org/dist/Catalyst-Controller-POD/; description = "Serves PODs right from your Catalyst application"; @@ -1170,7 +1264,7 @@ let self = _self // overrides; _self = with self; { sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple CatalystRuntime ConfigGeneral FileChangeNotify FileCopyRecursive FileShareDir ModuleInstall Moose MooseXDaemonize MooseXEmulateClassAccessorFast PathClass TemplateToolkit Starman namespaceautoclean namespaceclean ]; + propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; @@ -1185,7 +1279,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MG/MGRIMES/${name}.tar.gz"; sha256 = "06jq1lmpq88rmp9zik5gqczg234xac0hiyc3l698iif7zsgcyb80"; }; - propagatedBuildInputs = [ Moose TextSimpleTable ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Regex DispatchType"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1235,7 +1329,7 @@ let self = _self // overrides; _self = with self; { sha256 = "26a911ef5ef7ffc81b6ce65c3156f71fb35083c456ad27e6d82d2dc02493eeea"; }; buildInputs = [ DBDSQLite TestException TestRequires ]; - propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassSchemaLoader HashMerge ListMoreUtils ModuleRuntime Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes MooseXTypesLoadableClass TieIxHash TryTiny namespaceautoclean namespaceclean ]; + propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystXComponentTraits DBIxClassSchemaLoader MooseXMarkAsMethods MooseXNonMoose MooseXTypesLoadableClass TieIxHash ]; meta = { description = "DBIx::Class::Schema Model Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1244,13 +1338,13 @@ let self = _self // overrides; _self = with self; { }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90104"; + name = "Catalyst-Runtime-5.90117"; src = fetchurl { url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "91d551944beb3a0ae8635c78d5f2e1583ef1e7873d5c8ee407e2f64380ad870b"; + sha256 = "fe12d82c4e0704d1f15946651554ca069abccb6afbe5d9de315e97d90c0c92a3"; }; - buildInputs = [ DataDump HTTPMessage IOstringy JSONMaybeXS TestFatal TypeTiny ]; - propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable ClassLoad DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI HashMultiValue JSONMaybeXS LWP ListMoreUtils MROCompat ModulePluggable Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StreamBuffered StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI URIws namespaceautoclean namespaceclean ]; + buildInputs = [ TestFatal TypeTiny ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable DataDump HTTPBody HTTPRequestAsCGI ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; @@ -1265,7 +1359,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; sha256 = "873db8e4e72a994e3e17aeb53d2b837e6d524b4b8b0f3539f262135c88cc2120"; }; - propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime DateTime ]; meta = { homepage = https://metacpan.org/release/Catalyst-Plugin-AccessLog; description = "Request logging from within Catalyst"; @@ -1279,8 +1373,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "0v6hb4r1wv3djrnqvnjcn3xx1scgqzx8nyjdg9lfc1ybvamrl0rn"; }; - buildInputs = [ ClassMOP Moose TestException ]; - propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1294,6 +1388,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0z4328rr6l9xi45hyv6q9pwwamp0864q6skcp29jrz9f919ycdra"; }; propagatedBuildInputs = [ CatalystRuntime ClassThrowable ]; + buildInputs = [ CatalystPluginAuthentication CatalystPluginAuthorizationRoles CatalystPluginSession CatalystPluginSessionStateCookie TestWWWMechanizeCatalyst ]; }; CatalystPluginAuthorizationRoles = buildPerlPackage { @@ -1303,7 +1398,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0l83lkwmq0lngwh8b1rv3r719pn8w1gdbyhjqm74rnd0wbjl8h7f"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ]; + propagatedBuildInputs = [ CatalystPluginAuthentication SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1318,7 +1413,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1q23aipvrl888h06ldr4mmjbykz0j4rqwipxg1jv094kki2fspr9"; }; buildInputs = [ TestDeep TestException ]; - propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Flexible caching support for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1333,8 +1428,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz; sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba"; }; - buildInputs = [ CatalystRuntime Testuseok TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; + buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ ClassAccessor HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1349,7 +1444,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz; sha256 = "0llyj3v5nx9cx46jdbbvxf1lc9s9cxq5ml22xmx3wkb201r5qgaa"; }; - propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession GDSecurityImage HTTPDate ]; + propagatedBuildInputs = [ CatalystPluginSession GDSecurityImage ]; meta = { description = "Create and validate Captcha for Catalyst"; platforms = stdenv.lib.platforms.linux; @@ -1362,7 +1457,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"; }; - propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat]; + propagatedBuildInputs = [ CatalystRuntime ConfigAny DataVisitor ]; }; CatalystPluginFormValidator = buildPerlPackage rec { @@ -1371,7 +1466,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; sha256 = "5834f11bf5c9f4b5d336d65c7ce6639b76ce7bfe7a2875eb048d7ea1c82ce05a"; }; - propagatedBuildInputs = [ CatalystRuntime DataFormValidator MROCompat Moose ]; + propagatedBuildInputs = [ CatalystRuntime DataFormValidator ]; meta = { description = "Data::FormValidator"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1384,7 +1479,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; sha256 = "486c6a0e8f410fd017279f4804ab9e35ba46321d33a0a9721fe1e08a391de7a0"; }; - propagatedBuildInputs = [ CatalystPluginFormValidator CatalystRuntime FormValidatorSimple ]; + propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; @@ -1421,7 +1516,7 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginLogHandler = buildPerlPackage rec { + CatalystPluginLogHandler = buildPerlModule rec { name = "Catalyst-Plugin-Log-Handler-0.08"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEPE/${name}.tar.gz"; @@ -1442,7 +1537,7 @@ let self = _self // overrides; _self = with self; { sha256 = "171vi9xcl775scjaw4fcfdmqvz0rb1nr0xxg2gb3ng6bjzpslhgv"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; - propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; + propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1455,7 +1550,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "7707c56734cdb1512f733dc400fadf6f4c53cb217b58207857824dad6780a079"; }; - propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime MROCompat Moose namespaceautoclean ]; + propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Per-session custom expiry times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1469,8 +1564,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; }; - buildInputs = [ TestMockObject ]; - propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession ]; + propagatedBuildInputs = [ CatalystPluginSession ]; meta = { platforms = stdenv.lib.platforms.linux; }; @@ -1479,11 +1573,10 @@ let self = _self // overrides; _self = with self; { CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { name = "Catalyst-Plugin-Session-Store-FastMmap-0.16"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-Store-FastMmap-0.16.tar.gz; sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs"; }; - propagatedBuildInputs = - [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; + propagatedBuildInputs = [ CacheFastMmap CatalystPluginSession ]; meta = { platforms = stdenv.lib.platforms.linux; }; @@ -1495,7 +1588,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f"; }; - propagatedBuildInputs = [ CacheCache CatalystPluginSession CatalystRuntime ClassDataInheritable MROCompat ]; + propagatedBuildInputs = [ CacheCache CatalystPluginSession ]; meta = { description = "File storage backend for session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1509,7 +1602,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz; sha256 = "1b2ksz74cpigxqzf63rddar3vfmnbpwpdcbs11v0ml89pb8ar79j"; }; - propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Display a stack trace on the debug screen"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1518,14 +1611,13 @@ let self = _self // overrides; _self = with self; { }; CatalystPluginStaticSimple = buildPerlPackage rec { - name = "Catalyst-Plugin-Static-Simple-0.33"; + name = "Catalyst-Plugin-Static-Simple-0.36"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "1h8f12bhzh0ssq9gs8r9g3hqn8zn2k0q944vc1vm8j81bns16msy"; + url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz; + sha256 = "0m4l627p2fvzr4i6sgdxhdvsx4wpa6qmaibsbxlg5x5yjs7k7drn"; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; - propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes - namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime MIMETypes ]; meta = { description = "Make serving static pages painless"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1538,7 +1630,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz"; sha256 = "649c894ab16f9f48ada8f9cc599a7ecbb8891ab3761ff6fd510520c6de407c1f"; }; - propagatedBuildInputs = [ CatalystRuntime SubName strictures ]; + propagatedBuildInputs = [ CatalystRuntime strictures ]; meta = { description = "Handle passing of status messages between screens of a web application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1552,8 +1644,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MC/MCB/${name}.tar.gz"; sha256 = "e41326b6099891f244b432921ed10096ac619f32b8c4f8b41633313bd54662db"; }; - buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystRuntime CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass Moose TestException ]; - propagatedBuildInputs = [ CatalystRuntime TextCSV URI ]; + buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass TestException ]; + propagatedBuildInputs = [ CatalystRuntime TextCSV ]; meta = { description = "CSV view class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1567,8 +1659,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz"; sha256 = "1qgq6y9iwfbhbkbgpw9czang2ami6z8jk1zlagrzdisy4igqzkvs"; }; - buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; - propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; + buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; @@ -1576,13 +1667,13 @@ let self = _self // overrides; _self = with self; { }; CatalystViewJSON = buildPerlPackage rec { - name = "Catalyst-View-JSON-0.35"; + name = "Catalyst-View-JSON-0.36"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK//${name}.tar.gz"; - sha256 = "184pyghlrkl7p387bnyvswi2d9myvdg4v3lax6xrd59shskvpmkm"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-JSON-0.36.tar.gz; + sha256 = "0x943j1n2r0zqanyzdrs1xsnn8ayn2wqskn7h144xcqa6v6gcisl"; }; - buildInputs = [ JSON ]; - propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; + buildInputs = [ YAML ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "JSON view for your data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1596,7 +1687,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; }; - propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; + propagatedBuildInputs = [ CatalystRuntime TemplateTimer ]; meta = { description = "Template View Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1610,8 +1701,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; sha256 = "0iq4ci8m6g2c4g01fvdl568y7pjz28f3widk986v3pyhr7ll8j88"; }; - propagatedBuildInputs = - [ CatalystRuntime MooseXTraitsPluggable namespaceautoclean ListMoreUtils ]; + propagatedBuildInputs = [ CatalystRuntime MooseXTraitsPluggable ]; }; CatalystXRoleApplicator = buildPerlPackage rec { @@ -1620,8 +1710,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/H/HD/HDP/${name}.tar.gz"; sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ MooseXRelatedClassRoles CatalystRuntime ]; + propagatedBuildInputs = [ CatalystRuntime MooseXRelatedClassRoles ]; }; CatalystTraitForRequestProxyBase = buildPerlPackage { @@ -1630,8 +1719,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz; sha256 = "a7bf0faa7e12ca5df625d9f5fc710f11bfd16ba5385837e48d42b3d286c9710a"; }; - buildInputs = [ CatalystRuntime HTTPMessage ]; - propagatedBuildInputs = [ CatalystXRoleApplicator Moose URI namespaceautoclean ]; + buildInputs = [ CatalystRuntime CatalystXRoleApplicator HTTPMessage ]; + propagatedBuildInputs = [ Moose URI namespaceautoclean ]; meta = { description = "Replace request base with value passed by HTTP proxy"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1650,7 +1739,7 @@ let self = _self // overrides; _self = with self; { ../development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch ]; buildInputs = [ TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; + propagatedBuildInputs = [ CatalystRuntime Starman ]; meta = { description = "Replace the development server with Starman"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1658,6 +1747,21 @@ let self = _self // overrides; _self = with self; { }; }; + CDDB_get = buildPerlPackage rec { + name = "CDDB_get-2.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FO/FONKIE/${name}.tar.gz"; + sha256 = "1jfrwvfasylcafbvb0jjm94ad4v6k99a7rf5i4qwzhg4m0gvmk5x"; + }; + meta = { + homepage = https://metacpan.org/module/CDDB_get; + description = "Get the CDDB info for an audio cd"; + license = stdenv.lib.licenses.artistic1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; + }; + CGI = buildPerlPackage rec { name = "CGI-4.38"; src = fetchurl { @@ -1665,7 +1769,7 @@ let self = _self // overrides; _self = with self; { sha256 = "8c58f4a529bb92a914b22b7e64c5e31185c9854a4070a6dfad44fe5cc248e7d4"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ HTMLParser self."if" ]; + propagatedBuildInputs = [ HTMLParser ]; meta = { homepage = https://metacpan.org/module/CGI; description = "Handle Common Gateway Interface requests and responses"; @@ -1674,6 +1778,21 @@ let self = _self // overrides; _self = with self; { }; }; + CGICompile = buildPerlModule rec { + name = "CGI-Compile-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Compile-0.22.tar.gz; + sha256 = "1bycbdgbsn88kavy0q8p2i7vn6lf3xk1y7v2rdl32gkrdff4w2gm"; + }; + propagatedBuildInputs = [ Filepushd ]; + buildInputs = [ ModuleBuildTiny TestNoWarnings TestRequires ]; + meta = { + description = "Compile .cgi scripts to a code reference like ModPerl::Registry"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/CGI-Compile"; + }; + }; + CGICookieXS = buildPerlPackage rec { name = "CGI-Cookie-XS-0.18"; src = fetchurl { @@ -1683,10 +1802,10 @@ let self = _self // overrides; _self = with self; { }; CGIEmulatePSGI = buildPerlPackage { - name = "CGI-Emulate-PSGI-0.21"; + name = "CGI-Emulate-PSGI-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Emulate-PSGI-0.21.tar.gz; - sha256 = "06b8f1864101de69b2264ad3c3a2b15333e428cf9f5d17a777cfc61f8c64093f"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz; + sha256 = "dd5b6c353f08fba100dae09904284f7f73f8328d31f6a67b2c136fad728d158b"; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ CGI HTTPMessage ]; @@ -1698,26 +1817,26 @@ let self = _self // overrides; _self = with self; { }; CGIExpand = buildPerlPackage { - name = "CGI-Expand-2.04"; + name = "CGI-Expand-2.05"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.04.tar.gz; - sha256 = "0jk2vvk4mlz7phq3h3wpryix46adi7fkkzvkv0ssn5xkqy3pqlny"; + url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.05.tar.gz; + sha256 = "1ad48nd067j5irjampxpw3zvzpg8wpnpan6szkdc5h64wccd30kf"; }; - propagatedBuildInputs = [ TestException ]; meta = { description = "Convert flat hash to nested data using TT2's dot convention"; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestException ]; }; CGIFast = buildPerlPackage { - name = "CGI-Fast-2.10"; + name = "CGI-Fast-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.10.tar.gz; - sha256 = "98263afcc9f5d88c7cbbd39651c5431b434c1c815fe284962d887ed7be3a1dd3"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.13.tar.gz; + sha256 = "792f21fc3b94380e37c99faa7901ecedf01d6855191000d1ffb2a7003813b1d4"; }; - propagatedBuildInputs = [ FCGI if_ ]; + propagatedBuildInputs = [ CGI FCGI ]; doCheck = false; meta = { homepage = https://metacpan.org/module/CGI::Fast; @@ -1726,10 +1845,10 @@ let self = _self // overrides; _self = with self; { }; CGIFormBuilder = buildPerlPackage rec { - name = "CGI-FormBuilder-3.09"; + name = "CGI-FormBuilder-3.10"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NW/NWIGER/${name}.tgz"; - sha256 = "0qx8kxj0iy55ss9kraqr8q2m4igi2ylajff7d6qvphqpfx90fjb5"; + url = mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz; + sha256 = "163ixq9kninqq094z2rnkg9pv3bcmvjphlww4vksfrzhq3h9pjdf"; }; propagatedBuildInputs = [ CGI ]; @@ -1748,27 +1867,27 @@ let self = _self // overrides; _self = with self; { }; }; - CGISession = buildPerlPackage rec { + CGISession = buildPerlModule rec { name = "CGI-Session-4.48"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; - buildInputs = [ DBFile ]; propagatedBuildInputs = [ CGI ]; }; - CGISimple = buildPerlPackage rec { - name = "CGI-Simple-1.115"; + CGISimple = buildPerlModule rec { + name = "CGI-Simple-1.15"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SZ/SZABGAB/${name}.tar.gz"; - sha256 = "1nkyb1m1g5r47xykflf68dplanih5p15njv82frbgbsms34kp1sg"; + url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.15.tar.gz; + sha256 = "013dcy9k4sj9alkksk5aqz65ryxw0rxgg71c7w666y941gd8n46q"; }; propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException TestNoWarnings ]; }; CGIStruct = buildPerlPackage { @@ -1791,7 +1910,7 @@ let self = _self // overrides; _self = with self; { sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; }; buildInputs = [ TestClass TestDeep TestException TestWarn TimeDate ]; - propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLike MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse TryTiny ]; + propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse ]; meta = { description = "Unified cache handling interface"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1802,7 +1921,7 @@ let self = _self // overrides; _self = with self; { Chart = buildPerlPackage rec { name = "Chart-2.4.10"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/C/CH/CHARTGRP/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz; sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf"; }; propagatedBuildInputs = [ GD ]; @@ -1813,23 +1932,23 @@ let self = _self // overrides; _self = with self; { }; ClassAccessor = buildPerlPackage { - name = "Class-Accessor-0.34"; + name = "Class-Accessor-0.51"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz; - sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; + url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz; + sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - ClassAccessorChained = buildPerlPackage { + ClassAccessorChained = buildPerlModule { name = "Class-Accessor-Chained-0.01"; src = fetchurl { url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz; sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5"; }; - propagatedBuildInputs = [ClassAccessor]; + propagatedBuildInputs = [ ClassAccessor ]; }; ClassAccessorFast = ClassAccessor; @@ -1840,7 +1959,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz; sha256 = "c4613ee3307939f47a9afd40e8b173f3a22f501c3b139799aa030f01b627e7fe"; }; - buildInputs = [ ClassXSAccessor DevelHide PackageStash SubName TestException ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Lets you build groups of accessors"; @@ -1873,18 +1992,19 @@ let self = _self // overrides; _self = with self; { }; ClassBase = buildPerlPackage rec { - name = "Class-Base-0.06"; + name = "Class-Base-0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SZ/SZABGAB/${name}.tar.gz"; - sha256 = "15mvg1ba0iphjjb90a2fq73hyzcgp8pv0c44pjfcn7vdlzp098z3"; + url = mirror://cpan/authors/id/Y/YA/YANICK/Class-Base-0.09.tar.gz; + sha256 = "117dmsrb30a09zlrv919fb5h5rg8r4asa24i99k04n2habgbv9g1"; }; + propagatedBuildInputs = [ Clone ]; }; ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.30"; + name = "Class-C3-0.33"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "0lmgiqv46x9lx8ip23qr8qprips21wiwaks17yb6pk7igvbgdjnc"; + sha256 = "1c319k0j9knba2k0xjr8fml54kfvs71wcnc0hxp7s3lqc49mvzxf"; }; propagatedBuildInputs = [ AlgorithmC3 ]; meta = { @@ -1893,14 +2013,14 @@ let self = _self // overrides; _self = with self; { }; }; - ClassC3AdoptNEXT = buildPerlPackage rec { + ClassC3AdoptNEXT = buildPerlModule rec { name = "Class-C3-Adopt-NEXT-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "1xsbydmiskpa1qbmnf6n39cb83nlb432xgkad9kfhxnvm8jn4rw5"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ ListMoreUtils MROCompat ]; + buildInputs = [ ModuleBuildTiny TestException ]; + propagatedBuildInputs = [ MROCompat ]; meta = { homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT; description = "Make NEXT suck less"; @@ -1909,10 +2029,10 @@ let self = _self // overrides; _self = with self; { }; ClassC3Componentised = buildPerlPackage { - name = "Class-C3-Componentised-1.001000"; + name = "Class-C3-Componentised-1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Class-C3-Componentised-1.001000.tar.gz; - sha256 = "1nzav8arxll0rya7r2vp032s3acliihbb9mjlfa13rywhh77bzvl"; + url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-Componentised-1.001002.tar.gz; + sha256 = "14wn1g45z3b5apqq7dcai5drk01hfyqydsd2m6hsxzhyvi3b2l9h"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; @@ -1929,11 +2049,11 @@ let self = _self // overrides; _self = with self; { }; }; - ClassContainer = buildPerlPackage { - name = "Class-Container-0.12"; + ClassContainer = buildPerlModule { + name = "Class-Container-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.12.tar.gz; - sha256 = "771206f2b7a916ce0dfb93d82200472beaeb910248482734179bf36808e486b1"; + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.13.tar.gz; + sha256 = "f5d495b1dfb826d5c0c45d03b4d0e6b6047cbb06cdbf6be15fd4dc902aeeb70b"; }; propagatedBuildInputs = [ ParamsValidate ]; meta = { @@ -1966,13 +2086,12 @@ let self = _self // overrides; _self = with self; { }; }; - ClassFactoryUtil = buildPerlPackage rec { + ClassFactoryUtil = buildPerlModule rec { name = "Class-Factory-Util-1.7"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc"; }; - buildInputs = [ ModuleBuild ]; meta = { description = "Provide utility methods for factory classes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1980,10 +2099,10 @@ let self = _self // overrides; _self = with self; { }; ClassInspector = buildPerlPackage { - name = "Class-Inspector-1.28"; + name = "Class-Inspector-1.32"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.28.tar.gz; - sha256 = "04iij8dbcgaim7g109frpyf7mh4ydsd8zh53r53chk0zxnivg91w"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz; + sha256 = "0d85rihxahdvhj8cysqrgg0kbmcqghz5hgy41dbkxr1qaf5xrynf"; }; meta = { description = "Get information about a class and its structure"; @@ -2010,10 +2129,10 @@ let self = _self // overrides; _self = with self; { }; ClassMakeMethods = buildPerlPackage rec { - name = "Class-MakeMethods-1.009"; + name = "Class-MakeMethods-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz"; - sha256 = "10f65j4ywrnwyz0dm1q5ymmpv875drj40mj1xvsjv0bnjinnwzj8"; + sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c"; }; }; @@ -2032,10 +2151,10 @@ let self = _self // overrides; _self = with self; { }; ClassMethodModifiers = buildPerlPackage rec { - name = "Class-Method-Modifiers-2.11"; + name = "Class-Method-Modifiers-2.12"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "14nk2gin9cjwpysakli7f0gs4q1w220sn73xzv35rhlspngrggyy"; + sha256 = "1j3swa212wh14dq5r6zjarm2lzpx6mrdfplpjy65px8b09ri0k74"; }; buildInputs = [ TestFatal TestRequires ]; meta = { @@ -2045,14 +2164,13 @@ let self = _self // overrides; _self = with self; { }; }; - ClassMix = buildPerlPackage rec { - name = "Class-Mix-0.005"; + ClassMix = buildPerlModule rec { + name = "Class-Mix-0.006"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b"; + sha256 = "8747f643893914f8c44979f1716d0c1ec8a41394796555447944e860f1ff7c0b"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ ParamsClassify self."if" ]; + propagatedBuildInputs = [ ParamsClassify ]; meta = { description = "Dynamic class mixing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2090,6 +2208,19 @@ let self = _self // overrides; _self = with self; { }; }; + ClassTiny = buildPerlPackage rec { + name = "Class-Tiny-1.006"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz; + sha256 = "0knbi1agcfc9d7fca0szvxr6335pb22pc5n648q1vrcba8qvvz1f"; + }; + meta = { + description = "Minimalist class construction"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "https://github.com/dagolden/Class-Tiny"; + }; + }; + ClassLoad = buildPerlPackage rec { name = "Class-Load-0.24"; src = fetchurl { @@ -2097,7 +2228,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0bb983da46c146534fc77a556d6e40d925142f2eb43103534025ee545265ca36"; }; buildInputs = [ TestFatal TestNeeds ]; - propagatedBuildInputs = [ DataOptList ModuleImplementation ModuleRuntime PackageStash TryTiny ]; + propagatedBuildInputs = [ DataOptList PackageStash ]; meta = { homepage = https://github.com/moose/Class-Load; description = "A working (require \"Class::Name\") and more"; @@ -2111,7 +2242,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1"; }; - buildInputs = [ ModuleImplementation TestFatal TestNeeds ]; + buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ ClassLoad ]; meta = { homepage = https://github.com/moose/Class-Load-XS; @@ -2129,7 +2260,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassISA ]; }; - ClassStd = buildPerlPackage { + ClassStd = buildPerlModule { name = "Class-Std-0.013"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz; @@ -2142,12 +2273,13 @@ let self = _self // overrides; _self = with self; { }; ClassUnload = buildPerlPackage rec { - name = "Class-Unload-0.09"; + name = "Class-Unload-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "1q50hw217kll1vaxp7vz4x84f478ymd4lgz7mhmz8p94l8lxgi5g"; + sha256 = "0pqa98z3ij6a3v9wkmvc8b410kv30y0xxqf0i6if3lp4lx3rgqjj"; }; propagatedBuildInputs = [ ClassInspector ]; + buildInputs = [ TestRequires ]; }; ClassVirtual = buildPerlPackage rec { @@ -2196,10 +2328,10 @@ let self = _self // overrides; _self = with self; { Clone = buildPerlPackage rec { - name = "Clone-0.38"; + name = "Clone-0.39"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GARU/${name}.tar.gz"; - sha256 = "1s5xrv9zlckqqzyhxi0l9lwj9m6na2bz5hqxrkva2v7gnx5m7c4z"; + sha256 = "0bgsidb96gxzf3zhy6v1ksj1c200vxbwykk32fqm1mj97rl4dc5c"; }; meta = { description = "Recursively copy Perl datatypes"; @@ -2207,6 +2339,46 @@ let self = _self // overrides; _self = with self; { }; }; + CloneChoose = buildPerlPackage rec { + name = "Clone-Choose-0.008"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.008.tar.gz; + sha256 = "0grf0bg1ldzqakaq7aaigjngwd07zybrlmwjcnb0q986q0jcfank"; + }; + buildInputs = [ Clone ClonePP ]; + meta = { + description = "Choose appropriate clone utility"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/Clone-Choose"; + }; + }; + + ClonePP = buildPerlPackage rec { + name = "Clone-PP-1.07"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz; + sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; + }; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + CodeTidyAll = buildPerlPackage rec { + name = "Code-TidyAll-0.69"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.69.tar.gz; + sha256 = "0pl5pnq9flcak1m9rvqxbygk9vp5ma7dymr90waaazpdqrx4zyhk"; + }; + propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich FileZglob Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; + buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; + meta = { + description = "Engine for tidyall, your all-in-one code tidier and validator"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://metacpan.org/release/Code-TidyAll"; + }; + }; + # For backwards compatibility. CommonSense = self.commonsense; @@ -2224,22 +2396,23 @@ let self = _self // overrides; _self = with self; { }; CompressBzip2 = buildPerlPackage { - name = "Compress-Bzip2-2.22"; + name = "Compress-Bzip2-2.26"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.22.tar.gz; - sha256 = "1603e284e07953415b8eaa132698db8b03f46383f883c0902926f36eecb7e895"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz; + sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c"; }; meta = { description = "Interface to Bzip2 compression library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.070"; + name = "Compress-Raw-Bzip2-2.074"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0rmwpqhnhw5n11gm9mbxrxnardm0jfy7568ln9zw21bq3d7dsmn8"; + sha256 = "0b5jwqf15zr787acnx8sfyy2zavdd7gfkd98n1dgy8fs6r8yb8a4"; }; # Don't build a private copy of bzip2. @@ -2262,19 +2435,18 @@ let self = _self // overrides; _self = with self; { CompressZlib = IOCompress; CompressUnLZMA = buildPerlPackage rec { - name = "Compress-unLZMA-0.04"; + name = "Compress-unLZMA-0.05"; src = fetchurl { url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; - sha256 = "0sg9gj3rhif6hgmhwpz6w0g52l65vj5hx9818v5cdhvcif0jhg0b"; + sha256 = "1f0pcpcjjj60whqc5sc5jd0dd7z3si4fnp268w4ykmcjini03s2d"; }; - propagatedBuildInputs = [ IOCompress ]; }; ConfigAny = buildPerlPackage rec { - name = "Config-Any-0.26"; + name = "Config-Any-0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRICAS/${name}.tar.gz"; - sha256 = "155521bxiim3dv8d8f69fqd9zxm615fd4pfmv5fki17hq7ai5bpr"; + url = mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz; + sha256 = "0l31sg7dwh4dwwnql42hp7arkhcm15bhsgfg4i6xvbjzy9f2mnk8"; }; propagatedBuildInputs = [ ModulePluggable ]; meta = { @@ -2284,10 +2456,10 @@ let self = _self // overrides; _self = with self; { }; ConfigAutoConf = buildPerlPackage rec { - name = "Config-AutoConf-0.311"; + name = "Config-AutoConf-0.315"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "1zk2xfvxd3yn3299i13vn5wm1c7jxgr7z3h0yh603xs2h9cg79wc"; + url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.315.tar.gz; + sha256 = "0h39x9rzrhhilpg8yxlzpka269qrzsjg0iy0c1b9xflqlvhx2g2b"; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { @@ -2297,10 +2469,10 @@ let self = _self // overrides; _self = with self; { }; ConfigGeneral = buildPerlPackage rec { - name = "Config-General-2.60"; + name = "Config-General-2.63"; src = fetchurl { url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; - sha256 = "1biqzrvxr9cc8m5jaldnqzmj44q07y4pv6izgb7irsij0rn18m2i"; + sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2308,10 +2480,10 @@ let self = _self // overrides; _self = with self; { }; ConfigGitLike = buildPerlPackage { - name = "Config-GitLike-1.16"; + name = "Config-GitLike-1.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.16.tar.gz; - sha256 = "48c7f7e71405219582a96e5266cbec51c0ff3ec4bf0bb6db1fd12725ee23fe8f"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz; + sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; @@ -2349,14 +2521,28 @@ let self = _self // overrides; _self = with self; { }; }; - ConfigIniFiles = buildPerlPackage rec { - name = "Config-IniFiles-2.94"; + ConfigIdentity = buildPerlPackage rec { + name = "Config-Identity-0.0019"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz; + sha256 = "1a0jx12pxwpbnkww4xg4lav8j6ls89hrdimhj4a697k56zdhnli9"; + }; + propagatedBuildInputs = [ FileHomeDir IPCRun ]; + buildInputs = [ TestDeep ]; + meta = { + description = "Load (and optionally decrypt via GnuPG) user/pass identity information "; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/dagolden/Config-Identity"; + }; + }; + + ConfigIniFiles = buildPerlModule rec { + name = "Config-IniFiles-2.95"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "d6d38a416da79de874c5f1825221f22e972ad500b6527d190cc6e9ebc45194b4"; + sha256 = "414a19f98cc745769ce762aefce01fa52d031bc244403cd32fd1f6257f2dedc2"; }; - buildInputs = [ ModuleBuild perl ]; - propagatedBuildInputs = [ IOstringy ]; + propagatedBuildInputs = [ IOStringy ]; meta = { description = "A module for reading .ini-style configuration files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2370,7 +2556,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz; sha256 = "a932477b43ae5fb04a16f071a891da7bd2086c10c680592f2888fa9d9972cccf"; }; - buildInputs = [ ConfigAny YAML ]; + buildInputs = [ YAML ]; propagatedBuildInputs = [ ConfigAny ]; meta = { description = "Load a configuration directory tree containing YAML, JSON, XML, Perl, INI or Config::General files"; @@ -2385,7 +2571,7 @@ let self = _self // overrides; _self = with self; { sha256 = "bfb5870452a12ead4d3fd485045d1fa92b2a11741c3b93b61eb43f3dcbd6099b"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ClassLoad ModulePluggable Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ]; + propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ]; meta = { homepage = https://github.com/rjbs/Config-MVP; description = "Multivalue-property package-oriented configuration"; @@ -2400,7 +2586,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "0iflnsh0sgihff3ra8sr7awiiscmqvrp1anaskkwksqi6yzidab9"; }; - propagatedBuildInputs = [ ConfigINI ConfigMVP Moose ]; + propagatedBuildInputs = [ ConfigINI ConfigMVP ]; meta = { homepage = https://github.com/rjbs/Config-MVP-Reader-INI; description = "An MVP config reader for .ini files"; @@ -2408,11 +2594,11 @@ let self = _self // overrides; _self = with self; { }; }; - ConfigStd = buildPerlPackage { - name = "Config-Std-0.901"; + ConfigStd = buildPerlModule { + name = "Config-Std-0.903"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.901.tar.gz; - sha256 = "c5c57eb82a37cc41ea152098fc8e5548acfea8861140fbac8fc3beccbb09c243"; + url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.903.tar.gz; + sha256 = "b7709ff663bd279d264ab9c2f51e9e9588479a3367a8c4cfc18659c2a11480fe"; }; propagatedBuildInputs = [ ClassStd ]; meta = { @@ -2434,8 +2620,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz; sha256 = "bc9a4ae3738bd89f86a07bca673627ca3c92ba969737cd6dbc7ab7ad17cd2348"; }; - buildInputs = [ DateTime PathClass ]; - propagatedBuildInputs = [ ConfigStd GitPurePerl Moose ]; + propagatedBuildInputs = [ ConfigStd GitPurePerl ]; doCheck = false; meta = { description = "Simple, versioned access to configuration data"; @@ -2444,12 +2629,12 @@ let self = _self // overrides; _self = with self; { }; Connector = buildPerlPackage rec { - name = "Connector-1.22"; + name = "Connector-1.26"; src = fetchurl { url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/${name}.tar.gz"; - sha256 = "aa178d1865817ad2dea5c79645c8e6420ca2cfb951f20c98b5154307de219016"; + sha256 = "9852c2b43a8201996530deb1d3aa7fda18abe1ce24c80fbdebd7981cd2f05c45"; }; - buildInputs = [ ConfigMerge ConfigStd ConfigVersioned CryptSSLeay DBDSQLite DBI IOSocketSSL LWPProtocolhttps LWPUserAgent TemplateToolkit YAML ]; + buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; prePatch = '' # Attempts to use network. @@ -2461,6 +2646,20 @@ let self = _self // overrides; _self = with self; { }; }; + ConstFast = buildPerlModule rec { + name = "Const-Fast-0.014"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz; + sha256 = "1nwlldgrx86yn7y6a53cqgvzm2ircsvxg1addahlcy6510x9a1gq"; + }; + propagatedBuildInputs = [ SubExporterProgressive ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; + meta = { + description = "Facility for creating read-only scalars, arrays, and hashes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConvertASN1 = buildPerlPackage rec { name = "Convert-ASN1-0.27"; src = fetchurl { @@ -2469,7 +2668,7 @@ let self = _self // overrides; _self = with self; { }; }; - ConvertColor = buildPerlPackage { + ConvertColor = buildPerlModule { name = "Convert-Color-0.11"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz; @@ -2489,11 +2688,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/constant-1.33.tar.gz; sha256 = "015my616h5l2fswh52x4dp3n007gk5lax83ww9q6cmzb610mv5kr"; }; - propagatedBuildInputs = [ TestSimple13 ]; - buildInputs = [ ExtUtilsMakeMaker ]; }; - constantboolean = buildPerlPackage { + constantboolean = buildPerlModule { name = "constant-boolean-0.02"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz; @@ -2506,6 +2703,18 @@ let self = _self // overrides; _self = with self; { }; }; + curry = buildPerlPackage rec { + name = "curry-1.001000"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz; + sha256 = "1m2n3w67cskh8ic6vf6ik0fmap9zma875kr5rhyznr1041wn064b"; + }; + meta = { + description = "Create automatic curried method call closures for any class or object"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + constantdefer = pkgs.perlPackages.constant-defer; constant-defer = buildPerlPackage rec { @@ -2517,21 +2726,21 @@ let self = _self // overrides; _self = with self; { }; ContextPreserve = buildPerlPackage rec { - name = "Context-Preserve-0.01"; + name = "Context-Preserve-0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JR/JROCKWAY/${name}.tar.gz"; - sha256 = "0gssillawjknqks81x7fg7w2x94bnyklgd8ry2pr1k6ifkjhwz46"; + url = mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz; + sha256 = "07zxgmb11bn4zj3w9g1zwbb9iv4jyk5q7hc0nv59knvv5i64m489"; }; - buildInputs = [ TestException Testuseok ]; + buildInputs = [ TestException TestSimple13 ]; }; CookieBaker = buildPerlModule rec { - name = "Cookie-Baker-0.06"; + name = "Cookie-Baker-0.09"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "4b1fb173d6977af902fa018242a0b28099e5612a2fa43e0160380781f5d76ea0"; + sha256 = "be020a634162b319cab55b6e2bf10556a33a210a2eee8a2f1aa1b19b5e33aa4f"; }; - buildInputs = [ ModuleBuild TestTime ]; + buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; meta = { homepage = https://github.com/kazeburo/Cookie-Baker; @@ -2546,28 +2755,54 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz"; sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3"; }; - buildInputs = [ TestMore ]; propagatedBuildInputs = [ CGICookieXS ]; }; + Coro = buildPerlPackage rec { + name = "Coro-6.514"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.514.tar.gz; + sha256 = "0qndvq74knyra9r98pyllsxz0s80dzc1ljx10arjv9whja1l6cyq"; + }; + propagatedBuildInputs = [ AnyEvent Guard commonsense ]; + buildInputs = [ CanaryStability ]; + meta = { + }; + }; + + Corona = buildPerlPackage rec { + name = "Corona-0.1004"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz; + sha256 = "0g5gpma3998rn61qfjv5csv2nrdi4sc84ipkb4k6synyhfgd3xgz"; + }; + propagatedBuildInputs = [ NetServerCoro Plack ]; + buildInputs = [ TestSharedFork TestTCP ]; + meta = { + description = "Coro based PSGI web server"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CPAN = buildPerlPackage rec { - name = "CPAN-2.10"; + name = "CPAN-2.16"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "090e9e3d9fca83b89341a75c514c7411b743c887743723dbfe80f30d4ee5f3ad"; + sha256 = "7dbd61c172b99b05c16a2fce790140489494c744190f6c4f80c162d5ae3ccc2c"; }; - propagatedBuildInputs = [ ArchiveZip CompressBzip2 Expect FileHomeDir FileWhich JSONPP LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ Expect FileWhich LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ArchiveZip ]; }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.01"; + name = "Cpanel-JSON-XS-4.02"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "c8cfd32a8a9508ab7f280452428582c3e46d0bed4ea863c3ec27c34f6920de60"; + sha256 = "e9fe45a0b5bf553076bd395ed04766d58683557f818af559cd82d33409846d20"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -2588,13 +2823,24 @@ let self = _self // overrides; _self = with self; { }; }; + CPANDistnameInfo = buildPerlPackage rec { + name = "CPAN-DistnameInfo-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz; + sha256 = "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"; + }; + meta = { + description = "Extract distribution name and version from a distribution filename"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CPANMeta = buildPerlPackage rec { - name = "CPAN-Meta-2.150005"; + name = "CPAN-Meta-2.150010"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "04g7cfbx7vi8kqc9pwv7n3z95vimkbv0h7v6p1ky37gzz3nsw66j"; + sha256 = "1mm3dfw3ffyzb2ikpqn9l6zyqrxijb4vyywmbx2l21ryqwp0zy74"; }; - propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements JSONPP ]; meta = { homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta; description = "The distribution metadata for a CPAN dist"; @@ -2603,13 +2849,12 @@ let self = _self // overrides; _self = with self; { }; CPANMetaCheck = buildPerlPackage rec { - name = "CPAN-Meta-Check-0.012"; + name = "CPAN-Meta-Check-0.014"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "1rymh4l6sdh8l1q2q25lncmi4afbh2il0bpk8gxmd13qmjidjk2b"; + sha256 = "07rmdbz1rbnb7w33vswn1wixlyh947sqr93xrvcph1hwzhmmg818"; }; - buildInputs = [ TestDeep ModuleMetadata ]; - propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; + buildInputs = [ TestDeep ]; meta = { description = "Verify requirements in a CPAN::Meta object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2617,10 +2862,10 @@ let self = _self // overrides; _self = with self; { }; CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.128"; + name = "CPAN-Meta-Requirements-2.140"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.128.tar.gz; - sha256 = "ff0ae309ed76d8c7381fdb8436659a594e6884eeac1c9a742ba9aa7ee2a1d52d"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.140.tar.gz; + sha256 = "0898645e8e86f0922f0f0502b503f592a8eb3d3176b4fd87adcc7ba51e751fa9"; }; meta = { homepage = https://github.com/dagolden/CPAN-Meta-Requirements; @@ -2630,12 +2875,11 @@ let self = _self // overrides; _self = with self; { }; CPANMetaYAML = buildPerlPackage rec { - name = "CPAN-Meta-YAML-0.016"; + name = "CPAN-Meta-YAML-0.018"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "195v3lrfjzqxfiqi1zp02xmhp6mg9y3p7abmlfk2nj1rb28p0yrl"; + sha256 = "150jh9l7baddl2587m23qs2l0pb395qsx9bhsgdsnn6y9k4zgjik"; }; - buildInputs = [ JSONPP ]; doCheck = true; meta = { homepage = https://github.com/dagolden/CPAN-Meta-YAML; @@ -2645,10 +2889,10 @@ let self = _self // overrides; _self = with self; { }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-2.36"; + name = "CPAN-Perl-Releases-3.50"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "092nr3x2bs0lb3k8vk0mkghqzcw05s0gyyvfnmvx4fwwza8kya85"; + sha256 = "1nr739rnrw58p9r9z26pr4sc4s5z7wbhgyva3r2b2spyaylp5qkz"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -2658,12 +2902,11 @@ let self = _self // overrides; _self = with self; { }; CPANPLUS = buildPerlPackage rec { - name = "CPANPLUS-0.9154"; + name = "CPANPLUS-0.9172"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1mz20qlk0wjl4mwi4b9nji4hyh9a0l7m1v5bmypwwmhzpac5rq5c"; + sha256 = "1q4b0fkdn4sh8ym9dig21w96p7kzrhq66lqhn0dy1l3pgx413zlc"; }; - propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ]; doCheck = false; meta = { homepage = https://github.com/jib/cpanplus-devel; @@ -2673,12 +2916,12 @@ let self = _self // overrides; _self = with self; { }; CPANUploader = buildPerlPackage rec { - name = "CPAN-Uploader-0.103010"; + name = "CPAN-Uploader-0.103013"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1n57d61q9g37s0pp7sriq8vvqj2cvp3s9v0grpv277s9idvm37x8"; + sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq"; }; - propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive HTTPMessage LWP LWPProtocolhttps TermReadKey ]; + propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { homepage = https://github.com/rjbs/cpan-uploader; description = "Upload things to the CPAN"; @@ -2708,7 +2951,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz"; sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"; }; - buildInputs = [CryptCBC]; }; CryptDH = buildPerlPackage rec { @@ -2717,7 +2959,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MITHALDU/${name}.tar.gz"; sha256 = "0pvzlgwpx8fzdy64ki15155vhsj30i9zxmw6i4p7irh17d1g7368"; }; - buildInputs = [ MathBigInt MathBigIntGMP ]; + propagatedBuildInputs = [ MathBigIntGMP ]; }; CryptDHGMP = buildPerlPackage rec { @@ -2726,26 +2968,25 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DM/DMAKI/${name}.tar.gz"; sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi"; }; - buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; + buildInputs = [ pkgs.gmp DevelChecklib TestRequires ]; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; - CryptEksblowfish = buildPerlPackage rec { + CryptEksblowfish = buildPerlModule rec { name = "Crypt-Eksblowfish-0.009"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ClassMix]; + propagatedBuildInputs = [ ClassMix ]; }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.020"; + name = "Crypt-JWT-0.021"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "0587fc11435aecbbdc19b33f774d05ff31f19750b26a3588af93f33e8000d464"; + sha256 = "7227a10d185d6550fea855ef44bb8fb927d8c8644cfb16e0b674959bf103df5f"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { @@ -2754,7 +2995,7 @@ let self = _self // overrides; _self = with self; { }; }; - CryptPasswdMD5 = buildPerlPackage { + CryptPasswdMD5 = buildPerlModule { name = "Crypt-PasswdMD5-1.40"; src = fetchurl { url = mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz; @@ -2762,27 +3003,27 @@ let self = _self // overrides; _self = with self; { }; }; - CryptPKCS10 = buildPerlPackage { - name = "Crypt-PKCS10-1.0"; + CryptPKCS10 = buildPerlModule { + name = "Crypt-PKCS10-1.9"; src = fetchurl { - url = mirror://cpan/authors/id/G/GK/GKNOCKE/Crypt-PKCS10-1.0.zip; - sha256 = "08de199411056df1a1e6374b503574d21089913daa3823ebb21aa399dc59bdb6"; + url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-1.9.tar.gz; + sha256 = "ee0ce58cc17e9a8d7a6f33f3f26aca5be7edfc054204f7946370b3a8d291f0fd"; }; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ pkgs.unzip ModuleBuildTiny ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - CryptRandomSource = buildPerlPackage { - name = "Crypt-Random-Source-0.07"; + CryptRandomSource = buildPerlModule { + name = "Crypt-Random-Source-0.12"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/Crypt-Random-Source-0.07.tar.gz; - sha256 = "0kxcqcpknh9hhfnpiymxrjg74yj7nfr7k4fgrfmd9s2cw9p9mqdv"; + url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.12.tar.gz; + sha256 = "00mw5m52sbz9nqp3f6axyrgcrihqxn7k8gv0vi1kvm1j1nc9g29h"; }; - buildInputs = [ Testuseok TestException ]; - propagatedBuildInputs = [ AnyMoose CaptureTiny ModuleFind namespaceclean SubExporter ]; + buildInputs = [ ModuleBuildTiny TestException TestSimple13 ]; + propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ]; meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; @@ -2808,13 +3049,13 @@ let self = _self // overrides; _self = with self; { }; }; - CryptMySQL = buildPerlPackage rec { + CryptMySQL = buildPerlModule rec { name = "Crypt-MySQL-0.04"; src = fetchurl { url = "mirror://cpan/authors/id/I/IK/IKEBE/${name}.tar.gz"; sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; - propagatedBuildInputs = [DigestSHA1]; + propagatedBuildInputs = [ DigestSHA1 ]; }; CryptRijndael = buildPerlPackage rec { @@ -2826,10 +3067,10 @@ let self = _self // overrides; _self = with self; { }; CryptUnixCryptXS = buildPerlPackage rec { - name = "Crypt-UnixCrypt_XS-0.10"; + name = "Crypt-UnixCrypt_XS-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; - sha256 = "1d3xamq2mm3v2bfb1ay66crljm0bigfbhay1fqglcsrb75b7ls7r"; + sha256 = "1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2"; }; }; @@ -2859,10 +3100,10 @@ let self = _self // overrides; _self = with self; { }; CryptOpenSSLBignum = buildPerlPackage rec { - name = "Crypt-OpenSSL-Bignum-0.04"; + name = "Crypt-OpenSSL-Bignum-0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IR/IROBERTS/${name}.tar.gz"; - sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk"; + url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz; + sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; @@ -2896,23 +3137,23 @@ let self = _self // overrides; _self = with self; { sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; - buildInputs = [ PathClass TryTiny ]; + buildInputs = [ PathClass ]; + propagatedBuildInputs = [ LWPProtocolHttps ]; }; CSSDOM = buildPerlPackage rec { - name = "CSS-DOM-0.16"; + name = "CSS-DOM-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/S/SP/SPROUT/${name}.tar.gz"; - sha256 = "0s1gg6jvcxlj87sbbbcn9riw7rrh2n85hkbaim9civki8vj8vg9z"; + sha256 = "09phb6c9czpcp9imq06khm54kspsx6hnvfrjxramx663ygmpifb5"; }; - - buildInputs = [ Clone ]; + propagatedBuildInputs = [ Clone ]; }; - CSSMinifierXP = buildPerlPackage rec { + CSSMinifierXP = buildPerlModule rec { name = "CSS-Minifier-XS-0.09"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; + url = mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; meta = { @@ -2935,11 +3176,11 @@ let self = _self // overrides; _self = with self; { }; }; - Curses = let version = "1.33"; in buildPerlPackage { + Curses = let version = "1.36"; in buildPerlPackage { name = "Curses-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-${version}.tar.gz"; - sha256 = "126fhcyb822vqhszdrr7nmhrnshf06076shxdr7la0fwqzsfn7zb"; + sha256 = "0r6xd9wr0c25rr28zixhqipak575zqsfb7r7f2693i9il1dpj554"; }; propagatedBuildInputs = [ pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lncurses"; @@ -2951,12 +3192,11 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.057"; + name = "CryptX-0.059"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "b85fffbc8ecc0b8f1f768926c6b31e755e6df15556462d101d45ef5c48f9d025"; + sha256 = "3ef0d6493f332b6a2e1b0d20eda034d060d66f19f48d47244c788c26dca09d27"; }; - propagatedBuildInputs = [ JSONMaybeXS ]; meta = { description = "Crypto toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2964,22 +3204,23 @@ let self = _self // overrides; _self = with self; { }; CwdGuard = buildPerlModule rec { - name = "Cwd-Guard-0.04"; + name = "Cwd-Guard-0.05"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "071k50n1yr48122jjjg50i1s2kwp06dmrisv35f3wjry8m6cqchm"; + sha256 = "0xwf4rmii55k3lp19mpbh00mbgby7rxdk2lk84148bjhp6i7rz3s"; }; meta = { description = "Temporary changing working directory (chdir)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestRequires ]; }; DataClone = buildPerlPackage { - name = "Data-Clone-0.003"; + name = "Data-Clone-0.004"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.003.tar.gz; - sha256 = "16ldkjfag4dc3gssj051j212rzr2mawy7d001jflcab9g8hg3f1g"; + url = mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.004.tar.gz; + sha256 = "0g1qhi5qyk4fp0pwyaw90vxiyyn8las0i8ghzrnr4srai1wy3r9g"; }; buildInputs = [ TestRequires ]; meta = { @@ -2991,10 +3232,10 @@ let self = _self // overrides; _self = with self; { }; DataCompare = buildPerlPackage rec { - name = "Data-Compare-1.2102"; + name = "Data-Compare-1.25"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; - sha256 = "0v1997gnq3gpcr7f64jmyay2l60s5z6gsiy5hbpn1p2l2hrfnwlj"; + sha256 = "0wzasidg9yjcfsi2gdiaw6726ikqda7n24n0v2ngpaazakdkcjqx"; }; propagatedBuildInputs = [ FileFindRule ]; }; @@ -3035,23 +3276,21 @@ let self = _self // overrides; _self = with self; { }; }; - DataEntropy = buildPerlPackage rec { + DataEntropy = buildPerlModule rec { name = "Data-Entropy-0.007"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ParamsClassify DataFloat CryptRijndael HTTPLite]; + propagatedBuildInputs = [ CryptRijndael DataFloat HTTPLite ParamsClassify ]; }; - DataFloat = buildPerlPackage rec { - name = "Data-Float-0.012"; + DataFloat = buildPerlModule rec { + name = "Data-Float-0.013"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "698ecb092a3284e260cd3c3208408feb791d7d0f06a02673f9125ab2d51cc2d8"; + sha256 = "e2b1523d858930b8bbdbd196f08235f5e678b84919ba87712e26313b9c27518a"; }; - buildInputs = [ ModuleBuild ]; }; DataFormValidator = buildPerlPackage rec { @@ -3065,6 +3304,7 @@ let self = _self // overrides; _self = with self; { description = "Validates user input (usually from an HTML form) based on input profile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CGI ]; }; DataGUID = buildPerlPackage rec { @@ -3073,7 +3313,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq"; }; - propagatedBuildInputs = [ DataUUID SubExporter SubInstall ]; + propagatedBuildInputs = [ DataUUID SubExporter ]; meta = { homepage = https://github.com/rjbs/Data-GUID; description = "Globally unique identifiers"; @@ -3099,7 +3339,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz; sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k"; }; - propagatedBuildInputs = [TestException]; + buildInputs = [ TestException ]; }; DataICal = buildPerlPackage { @@ -3109,27 +3349,26 @@ let self = _self // overrides; _self = with self; { sha256 = "8ae9d20af244e5a6f606c7325e9d145dd0002676a178357af860a5e156925720"; }; buildInputs = [ TestLongString TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ ClassAccessor ClassReturnValue TextvFileasData ]; + propagatedBuildInputs = [ ClassReturnValue TextvFileasData ]; meta = { description = "Generates iCalendar (RFC 2445) calendar files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - DataInteger = buildPerlPackage rec { - name = "Data-Integer-0.005"; + DataInteger = buildPerlModule rec { + name = "Data-Integer-0.006"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "1dk04jf78sv63lww1qzagxlywcc04cfd3cfvzz168d24db9cr5bz"; + sha256 = "0m53zxhx9sn49yqh7azlpyy9m65g54v8cd2ha98y77337gg7xdv3"; }; - buildInputs = [ ModuleBuild ]; }; DataOptList = buildPerlPackage { - name = "Data-OptList-0.109"; + name = "Data-OptList-0.110"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.109.tar.gz; - sha256 = "1j44rm2spprlq3bc80cxni3dzs3gfjiqv1qc9q7820n1qj0wgmqw"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz; + sha256 = "1hzmgr2imdg1fc3hmwx0d56fhsdfyrgmgx7jb4jkyiv6575ifq9n"; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { @@ -3139,23 +3378,23 @@ let self = _self // overrides; _self = with self; { }; }; - DataPage = buildPerlPackage { + DataPage = buildPerlModule { name = "Data-Page-2.02"; src = fetchurl { url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz; sha256 = "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554"; }; - propagatedBuildInputs = [TestException ClassAccessorChained]; + propagatedBuildInputs = [ ClassAccessorChained ]; + buildInputs = [ TestException ]; }; - DataPagePageset = buildPerlPackage rec { + DataPagePageset = buildPerlModule rec { name = "Data-Page-Pageset-1.02"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz; sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f"; }; - buildInputs = [ TestPod TestPodCoverage ]; - propagatedBuildInputs = [ DataPage ]; + buildInputs = [ ClassAccessor DataPage TestException ]; meta = { description = "change long page list to be shorter and well navigate"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3186,26 +3425,26 @@ let self = _self // overrides; _self = with self; { }; DataSection = buildPerlPackage rec { - name = "Data-Section-0.200006"; + name = "Data-Section-0.200007"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0psvsfn5q9y1qkzkq62dr1c6bfrckkkz8hr1sgkdn2mbkpwh319l"; + sha256 = "1pmlxca0a8sv2jjwvhwgqavq6iwys6kf457lby4anjp3f1dpx4yd"; }; - propagatedBuildInputs = [ MROCompat SubExporter TestFailWarnings ]; + propagatedBuildInputs = [ MROCompat SubExporter ]; meta = { homepage = https://github.com/rjbs/data-section; description = "Read multiple hunks of data out of your DATA section"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestFailWarnings ]; }; - DataSerializer = buildPerlPackage { + DataSerializer = buildPerlModule { name = "Data-Serializer-0.60"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz; sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; }; - buildInputs = [ ModuleBuild ]; meta = { description = "Modules that serialize data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3231,7 +3470,7 @@ let self = _self // overrides; _self = with self; { sha256 = "06e08432a6b97705606c925709b99129ad926516e477d58e4461e4b3d9f30917"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ Moose PathClass SubExporter namespaceclean ]; + propagatedBuildInputs = [ Moose PathClass namespaceclean ]; meta = { homepage = https://metacpan.org/release/Data-Stream-Bulk; description = "N at a time iteration API"; @@ -3254,11 +3493,11 @@ let self = _self // overrides; _self = with self; { DataTaxi = buildPerlPackage { name = "Data-Taxi-0.96"; - propagatedBuildInputs = [DebugShowStuff]; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz; sha256 = "0y4wls4jlwd6prvd77szymddhq9sfj06kaqnk4frlvd0zh83djxb"; }; + buildInputs = [ DebugShowStuff ]; }; DataUniqid = buildPerlPackage rec { @@ -3281,10 +3520,10 @@ let self = _self // overrides; _self = with self; { }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.220"; + name = "Data-UUID-1.221"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; - sha256 = "0q7rfi7firwcvkhh9bym3c56hlm63badfli27m77139lwh33nlwr"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz; + sha256 = "0rw60wib0mj5z0v909mplh750y40hzyzf4z0b6h4ajxplyiv5irw"; }; }; @@ -3311,7 +3550,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421"; }; - buildInputs = [ Test2Suite ]; + buildInputs = [ Test2Suite TestSimple13 ]; propagatedBuildInputs = [ NetDomainTLD ]; meta = { homepage = https://metacpan.org/release/Data-Validate-Domain; @@ -3358,17 +3597,16 @@ let self = _self // overrides; _self = with self; { sha256 = "0m7d1505af9z2hj5aw020grcmjjlvnkjpvjam457d7k5qfy4m8lf"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = - [ ClassLoad Moose TaskWeaken TieToObject namespaceclean ]; + propagatedBuildInputs = [ Moose TaskWeaken TieToObject namespaceclean ]; }; DateCalc = buildPerlPackage { - name = "Date-Calc-6.3"; + name = "Date-Calc-6.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz; - sha256 = "14yvbgy9n8icwlm5zi86lskvxd6nsl42i1g9f5dwdaw9my463diy"; + url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz; + sha256 = "1barz0jgdaan3jm7ciphs5n3ahwkl42imprs3y8c1dwpwyr3gqbw"; }; - propagatedBuildInputs = [CarpClan BitVector]; + propagatedBuildInputs = [ BitVector ]; doCheck = false; # some of the checks rely on the year being <2015 meta = { maintainers = with maintainers; [ ]; @@ -3377,29 +3615,29 @@ let self = _self // overrides; _self = with self; { }; DateExtract = buildPerlPackage { - name = "Date-Extract-0.05"; + name = "Date-Extract-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHARYANTO/Date-Extract-0.05.tar.gz; - sha256 = "ef866b4d596e976a6f4e4b266a6ad7fe4513fad9ae761d7a9ef66f672695fe6d"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz; + sha256 = "bc7658d5c50c3525ec0efcb55236a5de2d5d4fc06fc147fa3929c8f0953cda2b"; }; - buildInputs = [TestMockTime]; - propagatedBuildInputs = [DateTimeFormatNatural ClassDataInheritable]; + buildInputs = [ TestMockTime ]; + propagatedBuildInputs = [ DateTimeFormatNatural ]; }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.51"; + name = "Date-Manip-6.70"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0afvr2q2hspd807d6wd7kmrr7ypxdlh8bcnqsqbfwcwd74qadg13"; + sha256 = "0r4k4ypb09xwhvq6das0vpx2c0xbhhhx83knq6jfpf8m55h8qi9r"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' sed -i "s#/bin/date#${pkgs.coreutils}/bin/date#" lib/Date/Manip/TZ.pm ''; - propagatedBuildInputs = [ TestInter ]; meta = { description = "Date manipulation routines"; }; + buildInputs = [ TestInter ]; }; DateSimple = buildPerlPackage { @@ -3413,14 +3651,14 @@ let self = _self // overrides; _self = with self; { }; }; - DateTime = buildPerlModule rec { - name = "DateTime-1.21"; + DateTime = buildPerlPackage rec { + name = "DateTime-1.48"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1cgnscbh40f783znpq15rkvbfflfm8azdl0v6yqr7minmq6899d3"; + sha256 = "0glcsvgldrmbwbaps6hssjzipzghhx4jh3g4jdncjspdmdp481ah"; }; - buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; + buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; + propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; meta = { description = "A date and time object"; license = stdenv.lib.licenses.artistic2; @@ -3433,11 +3671,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PI/PIJLL/${name}.tar.gz"; sha256 = "03h0llkwsiw2d2ci1ah5x9sp8xrvnbgd471i5hnpgl5w32nnhndv"; }; - propagatedBuildInputs = [ DateTime ]; meta = { description = "Dates in the Julian calendar"; license = stdenv.lib.licenses.artistic2; }; + buildInputs = [ DateTime ]; }; DateTimeEventICal = buildPerlPackage rec { @@ -3446,7 +3684,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/F/FG/FGLOCK/${name}.tar.gz"; sha256 = "1skmykxbrf98ldi72d5s1v6228gfdr5iy4y0gpl0xwswxy247njk"; }; - propagatedBuildInputs = [ DateTime DateTimeEventRecurrence ]; + propagatedBuildInputs = [ DateTimeEventRecurrence ]; meta = { description = "DateTime rfc2445 recurrences"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3454,12 +3692,12 @@ let self = _self // overrides; _self = with self; { }; DateTimeEventRecurrence = buildPerlPackage { - name = "DateTime-Event-Recurrence-0.16"; + name = "DateTime-Event-Recurrence-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.16.tar.gz; - sha256 = "3872e0126cd9527a918d3e537f85342d1fbb1e6a9ae5833262201b31879f8609"; + url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz; + sha256 = "f9408789a461107766ca1a232bb3ec1e702eec7ca8167401ea6ec3f4b6d0b5a5"; }; - propagatedBuildInputs = [ DateTime DateTimeSet ]; + propagatedBuildInputs = [ DateTimeSet ]; }; DateTimeFormatBuilder = buildPerlPackage { @@ -3468,21 +3706,20 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz; sha256 = "7cd58a8cb53bf698407cc992f89e4d49bf3dc55baf4f3f00f1def63a0fff33ef"; }; - propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ]; + propagatedBuildInputs = [ ClassFactoryUtil DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; license = stdenv.lib.licenses.artistic2; }; }; - DateTimeFormatDateParse = buildPerlPackage { + DateTimeFormatDateParse = buildPerlModule { name = "DateTime-Format-DateParse-0.05"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz; sha256 = "f6eca4c8be66ce9992ee150932f8fcf07809fd3d1664caf200b8a5fd3a7e5ebc"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ DateTime DateTimeTimeZone TimeDate ]; + propagatedBuildInputs = [ DateTime TimeDate ]; meta = { description = "Parses Date::Parse compatible formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3490,19 +3727,20 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatFlexible = buildPerlPackage { - name = "DateTime-Format-Flexible-0.26"; + name = "DateTime-Format-Flexible-0.30"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.26.tar.gz; - sha256 = "436efbc5e87cc385112e1c44336427fea32df670caf2b7d6dbb7a113ac6e693d"; + url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.30.tar.gz; + sha256 = "e7974e0492d7801682b400dd8e9a6fbfd8a56602942883cd7867a2008734cca4"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils ModulePluggable TestMockTime ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; meta = { description = "Flexibly parse strings and turn them into DateTime objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException TestMockTime TestNoWarnings ]; }; - DateTimeFormatHTTP = buildPerlPackage rec { + DateTimeFormatHTTP = buildPerlModule rec { name = "DateTime-Format-HTTP-0.42"; src = fetchurl { url = "mirror://cpan/authors/id/C/CK/CKRAS/${name}.tar.gz"; @@ -3515,27 +3753,26 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatICal = buildPerlPackage { + DateTimeFormatICal = buildPerlModule { name = "DateTime-Format-ICal-0.09"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ]; + propagatedBuildInputs = [ DateTimeEventICal ]; meta = { description = "Parse and format iCal datetime and duration strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - DateTimeFormatISO8601 = buildPerlPackage { + DateTimeFormatISO8601 = buildPerlModule { name = "DateTime-Format-ISO8601-0.08"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz; sha256 = "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ModuleBuild ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3545,10 +3782,10 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatMail = buildPerlPackage { - name = "DateTime-Format-Mail-0.402"; + name = "DateTime-Format-Mail-0.403"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.402.tar.gz; - sha256 = "d788c883969e1647ed0524cc130d897276de23eaa3261f3616458ddd3a4a88fb"; + url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz; + sha256 = "8df8e35c4477388ff5c7ce8b3e8b6ae4ed30209c7a5051d41737bd14d755fcb0"; }; propagatedBuildInputs = [ DateTime ParamsValidate ]; meta = { @@ -3557,27 +3794,27 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatNatural = buildPerlPackage { - name = "DateTime-Format-Natural-1.03"; + DateTimeFormatNatural = buildPerlModule { + name = "DateTime-Format-Natural-1.05"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.03.tar.gz; - sha256 = "1m3bmv90kww8xr4dda75isvzigy8y3clgvk58zp0bxc5d7k4qdxi"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.05.tar.gz; + sha256 = "10ldrhz5rnpsd8qmqn1a4s0w5hhfbjrr13a93yx7kpp89g85pxqv"; }; buildInputs = [ ModuleUtil TestMockTime ]; - propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; + propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - DateTimeFormatMySQL = buildPerlPackage rec { + DateTimeFormatMySQL = buildPerlModule rec { name = "DateTime-Format-MySQL-0.06"; src = fetchurl { url = "mirror://cpan/authors/id/X/XM/XMIKEW/${name}.tar.gz"; sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ModuleBuild ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format MySQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3585,29 +3822,30 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatPg = buildPerlPackage { - name = "DateTime-Format-Pg-0.16008"; + DateTimeFormatPg = buildPerlModule { + name = "DateTime-Format-Pg-0.16013"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16008.tar.gz; - sha256 = "0mvh4wp54vh7mnhfd2lndzjfikjify98vaav6vwbraxlhjvwyn3x"; + url = mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz; + sha256 = "16siw0f3a0ilzv5fnfas5s9n92drjy271yf6qvmmpm0vwnjjx1kz"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format PostgreSQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ ModuleBuildTiny ]; }; DateTimeFormatStrptime = buildPerlPackage rec { - name = "DateTime-Format-Strptime-1.68"; + name = "DateTime-Format-Strptime-1.75"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "d0f97e282b4de61390b5c3a498d3b9ee553f728c169c0845c6de02102d823929"; + sha256 = "4fcfb2ac4f79d7ff2855a405f39050d2ea691ee098ce54ede8af79c8d6ab3c19"; }; buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone PackageDeprecationManager ParamsValidate TryTiny ]; + propagatedBuildInputs = [ DateTime PackageDeprecationManager ]; meta = { homepage = https://metacpan.org/release/DateTime-Format-Strptime; description = "Parse and format strp and strf time patterns"; @@ -3621,7 +3859,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CF/CFAERBER/${name}.tar.gz"; sha256 = "cc1f4e0ae1d39b0d4c3dddccfd7423c77c67a70950c4b5ecabf8ca553ab294b4"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format SQLite dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3629,10 +3867,10 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatW3CDTF = buildPerlPackage { - name = "DateTime-Format-W3CDTF-0.06"; + name = "DateTime-Format-W3CDTF-0.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.06.tar.gz; - sha256 = "b9a542bed9c52b0a89dd590a5184e38ee334c824bbe6bac842dd7dd1f88fbd7a"; + url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz; + sha256 = "69a02b661bbf1daa14a4813cb6786eaa66dbdf2743f0b3f458e30234c3a26268"; }; propagatedBuildInputs = [ DateTime ]; meta = { @@ -3643,13 +3881,13 @@ let self = _self // overrides; _self = with self; { }; DateTimeLocale = buildPerlPackage rec { - name = "DateTime-Locale-1.03"; + name = "DateTime-Locale-1.17"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "3100568a62a91ca1c09c0aac8e1e4ba34e6f82047ec64f714733a647c040f511"; + sha256 = "0ca6598b3f89e92e3d1140e5685c69f6f795f6eed158fa482f33ce2122b35cc9"; }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires TestWarnings ]; - propagatedBuildInputs = [ DistCheckConflicts ListMoreUtils ParamsValidate ]; + buildInputs = [ CPANMetaCheck FileShareDirInstall TestFatal TestFileShareDir TestRequires TestWarnings ]; + propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/DateTime-Locale; description = "Localization support for DateTime.pm"; @@ -3657,13 +3895,13 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeSet = buildPerlPackage rec { - name = "DateTime-Set-0.3600"; + DateTimeSet = buildPerlModule rec { + name = "DateTime-Set-0.3900"; src = fetchurl { url = "mirror://cpan/authors/id/F/FG/FGLOCK/${name}.tar.gz"; - sha256 = "83503960c773efadfe2b0255e61bc1eb531bb6f497463d3b3880d7a516bc2f13"; + sha256 = "94f41c3924aafde4ef7fa6b58e0595d4038d8ac5ffd62ba111b13c5f4dbc0946"; }; - propagatedBuildInputs = [ DateTime SetInfinite ]; + propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ]; meta = { description = "DateTime set objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3671,13 +3909,13 @@ let self = _self // overrides; _self = with self; { }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-1.97"; + name = "DateTime-TimeZone-2.18"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "68a5f4b0a77074f9cc96b2c1d2282e2110db74f55e43fbad72926cee0fd434c8"; + sha256 = "b7f74295650bde3f378017113dcc504cefecc054cf6ef31133dc76940e15453a"; }; buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassSingleton ListAllUtils ModuleRuntime ParamsValidate TryTiny ]; + propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/DateTime-TimeZone; description = "Time zone object base class and factory"; @@ -3691,8 +3929,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; }; - buildInputs = [ TestMost ModuleBuild ]; - propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; + buildInputs = [ TestMost ]; + propagatedBuildInputs = [ DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; doCheck = false; meta = { description = "Parse a date/time string using the best method available"; @@ -3700,7 +3938,7 @@ let self = _self // overrides; _self = with self; { }; }; - DebugShowStuff = buildPerlPackage { + DebugShowStuff = buildPerlModule { name = "Debug-ShowStuff-1.16"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz; @@ -3726,29 +3964,56 @@ let self = _self // overrides; _self = with self; { }; }; + DevelCheckBin = buildPerlPackage rec { + name = "Devel-CheckBin-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz; + sha256 = "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm"; + }; + meta = { + description = "check that a command is available"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tokuhirom/Devel-CheckBin"; + }; + }; + + DevelCheckCompiler = buildPerlModule rec { + name = "Devel-CheckCompiler-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz; + sha256 = "1db973a4dbyknjxq608hywil5ai6vplnayshqxrd7m5qnjbpd2vn"; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + description = "Check the compiler's availability"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tokuhirom/Devel-CheckCompiler"; + }; + }; + DevelChecklib = buildPerlPackage rec { - name = "Devel-CheckLib-1.05"; + name = "Devel-CheckLib-1.11"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; - sha256 = "0qs7c8jffar2rpvscrd8rcds75zsc46cizp5fi5369821jl4fw3a"; + sha256 = "1h9jna2d83kpckkm87xwqx84kwd83d2dsynky3hnvgl0gqc1qvdx"; }; - propagatedBuildInputs = [ IOCaptureOutput ]; + buildInputs = [ IOCaptureOutput MockConfig ]; }; DevelCheckOS = buildPerlPackage rec { - name = "Devel-CheckOS-1.76"; + name = "Devel-CheckOS-1.81"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; - sha256 = "f83fb4cb8de060f607214b1e88c98ac6c4e065371e646fe896f16ea887aecb0c"; + sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10"; }; - propagatedBuildInputs = [ DataCompare FileFindRule ]; + propagatedBuildInputs = [ DataCompare ]; }; DevelPatchPerl = buildPerlPackage rec { - name = "Devel-PatchPerl-1.38"; + name = "Devel-PatchPerl-1.48"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0997ms4ksvxy0x0bnhrm7mhx3d2rbmgdiv3xdsawb17r2695vrgk"; + sha256 = "1zlh1pmlihzcabj2zyfdnrqj6kfl3n9769yfrs296wxgaa7bra96"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { @@ -3759,10 +4024,10 @@ let self = _self // overrides; _self = with self; { }; DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.32"; + name = "Devel-PPPort-3.36"; src = fetchurl { url = "mirror://cpan/authors/id/W/WO/WOLFSAGE/${name}.tar.gz"; - sha256 = "257801ef441f317bc79d20cdc72344e5b4ff6f685d65bdf79ff153e733fa3856"; + sha256 = "b70fb1b4e2d48983ad20052fd7ae6df4c10ceffdedbacb2d691ddc9c957afa52"; }; meta = { description = "Perl/Pollution/Portability"; @@ -3811,13 +4076,14 @@ let self = _self // overrides; _self = with self; { }; }; - DBDMock = buildPerlPackage { + DBDMock = buildPerlModule { name = "DBD-Mock-1.45"; src = fetchurl { url = mirror://cpan/authors/id/D/DI/DICHI/DBD-Mock/DBD-Mock-1.45.tar.gz; sha256 = "40a80c37b31ef14536b58b4a8b483e65953b00b8fa7397817c7eb76d540bd00f"; }; - propagatedBuildInputs = [ DBI TestException ]; + propagatedBuildInputs = [ DBI ]; + buildInputs = [ TestException ]; }; DBDSQLite = import ../development/perl-modules/DBD-SQLite { @@ -3842,10 +4108,10 @@ let self = _self // overrides; _self = with self; { DBI = buildPerlPackage rec { name = "DBI-${version}"; - version = "1.6.36"; + version = "1.641"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c"; + sha256 = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' mkdir -p $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI @@ -3877,7 +4143,7 @@ let self = _self // overrides; _self = with self; { \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h - \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi + \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi # --- '; @@ -3899,8 +4165,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; - buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; + buildInputs = [ DBDSQLite TestDeep TestException TestWarn ]; + propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage ModuleFind PathClass SQLAbstract ScopeGuard SubName namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; @@ -3909,13 +4175,13 @@ let self = _self // overrides; _self = with self; { }; DBIxClassCandy = buildPerlPackage rec { - name = "DBIx-Class-Candy-0.005002"; + name = "DBIx-Class-Candy-0.005003"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "fb109e765674a52e9eac03f52403bb3cf717254b8b9fa46f06a6f205392f987d"; + sha256 = "b8a229a7b15f559095d4561cf8220460128541ba7fc3545ed35869923d46565c"; }; buildInputs = [ TestDeep TestFatal ]; - propagatedBuildInputs = [ DBIxClass LinguaENInflect MROCompat StringCamelCase SubExporter namespaceclean ]; + propagatedBuildInputs = [ DBIxClass LinguaENInflect SubExporter ]; meta = { homepage = https://github.com/frioux/DBIx-Class-Candy; description = "Sugar for your favorite ORM, DBIx::Class"; @@ -3924,10 +4190,10 @@ let self = _self // overrides; _self = with self; { }; DBIxClassCursorCached = buildPerlPackage { - name = "DBIx-Class-Cursor-Cached-1.001002"; + name = "DBIx-Class-Cursor-Cached-1.001004"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001002.tar.gz; - sha256 = "19r7jr6pknxiirrybq0cd0lnr76xiw05arnfqgk9nrhp6c7vvil0"; + url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001004.tar.gz; + sha256 = "09b2jahn2x12qm4f7qm1jzsxbz7qn1czp6a3fnl5l2i3l4r5421p"; }; buildInputs = [ CacheCache DBDSQLite ]; propagatedBuildInputs = [ CarpClan DBIxClass ]; @@ -3943,17 +4209,17 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AN/ANDREMAR/${name}.tar.gz"; sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1"; }; - propagatedBuildInputs = [DBIxClass HTMLWidget]; + propagatedBuildInputs = [ DBIxClass HTMLWidget ]; }; DBIxClassHelpers = buildPerlPackage rec { - name = "DBIx-Class-Helpers-2.032001"; + name = "DBIx-Class-Helpers-2.033004"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "c7af96d17e11f0957b7187bb6002341a7b130bb79b61f6d91b39178ef000eff5"; + sha256 = "14bc7adda3b30867311717faa11a4534bceda3061229dc2533647c1906d8784c"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; - propagatedBuildInputs = [ CarpClan DBIxClass DBIxClassCandy DBIxIntrospector LinguaENInflect ModuleRuntime Moo SafeIsa StringCamelCase SubExporterProgressive TextBrew TryTiny namespaceclean ]; + propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ]; meta = { homepage = https://github.com/frioux/DBIx-Class-Helpers; description = "Simplify the common case stuff for DBIx::Class"; @@ -3975,13 +4241,13 @@ let self = _self // overrides; _self = with self; { }; DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.07047"; + name = "DBIx-Class-Schema-Loader-0.07049"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "6671fb3afbb1b4f3eb5905f34fb47ce18b29af3e055e479b06c09424bbc1421b"; + sha256 = "e869cdde1378cfebccf229b0cde58d2746dc6080b75f56d072aa5f1fce76a764"; }; - buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ]; - propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ]; + buildInputs = [ DBDSQLite TestDeep TestDifferences TestException TestWarn ]; + propagatedBuildInputs = [ CarpClan ClassUnload DBIxClass DataDump StringToIdentifierEN curry ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -4028,13 +4294,13 @@ let self = _self // overrides; _self = with self; { }; DBIxSearchBuilder = buildPerlPackage { - name = "DBIx-SearchBuilder-1.66"; + name = "DBIx-SearchBuilder-1.67"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/DBIx-SearchBuilder-1.66.tar.gz; - sha256 = "e2703c3f4b38cf232dec48be98aeab6d2dbee077dcf059369b825629c4be702e"; + url = mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz; + sha256 = "453179c22a61af573e502c8396f3f28daea03dfdc162094b90f9b3c331d563da"; }; buildInputs = [ DBDSQLite ]; - propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBI DBIxDBSchema Want ]; + propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBIxDBSchema Want capitalization ]; meta = { description = "Encapsulate SQL queries and rows in simple perl objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -4042,10 +4308,10 @@ let self = _self // overrides; _self = with self; { }; DBIxSimple = buildPerlPackage { - name = "DBIx-Simple-1.35"; + name = "DBIx-Simple-1.37"; src = fetchurl { - url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.35.tar.gz; - sha256 = "445535b3dfab88140c7a0d2776b1e78f254dc7e9c81072d5a01afc95a5db499a"; + url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz; + sha256 = "46d311aa2ce08907401c56119658426dbb044c5a40de73d9a7b79bf50390cae3"; }; propagatedBuildInputs = [ DBI ]; meta = { @@ -4062,14 +4328,15 @@ let self = _self // overrides; _self = with self; { sha256 = "0fp6h71xv4pgb8l815rs6ad4camzhjqf64s1sf7zmhchqqn4vacn"; }; - propagatedBuildInputs = [ TestFatal TestRoo Moo DBI DBDSQLite ]; + propagatedBuildInputs = [ DBI Moo ]; + buildInputs = [ DBDSQLite TestFatal TestRoo ]; }; DevelCycle = buildPerlPackage { - name = "Devel-Cycle-1.11"; + name = "Devel-Cycle-1.12"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.11.tar.gz; - sha256 = "17c73yx9r32xvrsh8y7q24y0m3b98yihjyf3q4y68j869nh2b4rs"; + url = mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz; + sha256 = "1hhb77kz3dys8yaik452j22cm3510zald2mpvfyv5clqv326aczx"; }; meta = { description = "Find memory cycles in objects"; @@ -4079,12 +4346,12 @@ let self = _self // overrides; _self = with self; { }; DevelDeclare = buildPerlPackage rec { - name = "Devel-Declare-0.006018"; + name = "Devel-Declare-0.006019"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "bb3607bc7546bcf8d9ac57acd8de4e4ca5567ace836ab823d5f5b450216f466a"; + sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808"; }; - buildInputs = [ BHooksOPCheck ExtUtilsDepends TestRequires ]; + buildInputs = [ ExtUtilsDepends TestRequires ]; propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; @@ -4099,8 +4366,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; sha256 = "0ns95dsgmr8s0f1dfwd1cyv32vmd22w0vs51ppnnzp5zyi499581"; }; - buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Find the path to your perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -4108,10 +4373,10 @@ let self = _self // overrides; _self = with self; { }; DevelGlobalDestruction = buildPerlPackage rec { - name = "Devel-GlobalDestruction-0.13"; + name = "Devel-GlobalDestruction-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "0qn4iszgylnxjdkb6430f6a3ci7bcx9ih1az6bd5cbij1pf2965j"; + sha256 = "1aslj6myylsvzr0vpqry1cmmvzbmpbdcl4v9zrl18ccik7rabf1l"; }; propagatedBuildInputs = [ SubExporterProgressive ]; meta = { @@ -4120,6 +4385,18 @@ let self = _self // overrides; _self = with self; { }; }; + DevelGlobalPhase = buildPerlPackage rec { + name = "Devel-GlobalPhase-0.003003"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz; + sha256 = "1x9jzy3l7gwikj57swzl94qsq03j9na9h1m69azzs7d7ghph58wd"; + }; + meta = { + description = "Detect perl's global phase on older perls."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelHide = buildPerlPackage rec { name = "Devel-Hide-0.0009"; src = fetchurl { @@ -4129,37 +4406,53 @@ let self = _self // overrides; _self = with self; { }; DevelNYTProf = buildPerlPackage rec { - name = "Devel-NYTProf-6.04"; + name = "Devel-NYTProf-6.05"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "c04c9f03663b7e4e9cc159f30bcdc0bab5652889c88c425ec157e831318d4891"; + sha256 = "b2a9f8b49afb9be8d087ddb50ef77a53f3796481b37eb5a965e1d4055445db1c"; }; - propagatedBuildInputs = [ FileWhich JSONMaybeXS TestDifferences ]; + propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; meta = { homepage = https://github.com/timbunce/devel-nytprof; description = "Powerful fast feature-rich Perl source code profiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDifferences ]; + }; + + DevelOverloadInfo = buildPerlPackage rec { + name = "Devel-OverloadInfo-0.005"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz; + sha256 = "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"; + }; + propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; + buildInputs = [ TestFatal ]; + meta = { + description = "introspect overloaded operators"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; DevelPartialDump = buildPerlPackage { - name = "Devel-PartialDump-0.15"; + name = "Devel-PartialDump-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Devel-PartialDump-0.15.tar.gz; - sha256 = "0xm42030qlbimay5x72sjj0na43ciniai2xdcdx8zf191jw5dz7n"; + url = mirror://cpan/authors/id/E/ET/ETHER/Devel-PartialDump-0.20.tar.gz; + sha256 = "01yrsdpn9ns9iwwc92bhjn2605b7ys7i3198gjb935lsllzgzw5f"; }; - propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ]; + propagatedBuildInputs = [ ClassTiny SubExporter namespaceclean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestSimple13 TestWarnings ]; }; DevelStackTrace = buildPerlPackage { - name = "Devel-StackTrace-1.34"; + name = "Devel-StackTrace-2.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.34.tar.gz; - sha256 = "e882ccd7f4cbab0d0cdad53897f3f3bf29bdcf47d2bdfde1ac07f1bc7d7ebd16"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.03.tar.gz; + sha256 = "7618cd4ebe24e254c17085f4b418784ab503cb4cb3baf8f48a7be894e59ba848"; }; meta = { homepage = https://metacpan.org/release/Devel-StackTrace; @@ -4169,10 +4462,10 @@ let self = _self // overrides; _self = with self; { }; DevelStackTraceAsHTML = buildPerlPackage { - name = "Devel-StackTrace-AsHTML-0.14"; + name = "Devel-StackTrace-AsHTML-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.14.tar.gz; - sha256 = "0yl296y0qfwybwjgqjzd4j2w2bj5a2nz342qqgxchnf5bqynl1c9"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz; + sha256 = "0iri5nb2lb76qv5l9z0vjpfrq5j2fyclkd64kh020bvy37idp0v2"; }; propagatedBuildInputs = [ DevelStackTrace ]; meta = { @@ -4182,10 +4475,10 @@ let self = _self // overrides; _self = with self; { }; DevelSymdump = buildPerlPackage rec { - name = "Devel-Symdump-2.15"; + name = "Devel-Symdump-2.18"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41"; + sha256 = "826f81a107f5592a2516766ed43beb47e10cc83edc9ea48090b02a36040776c0"; }; meta = { description = "Dump symbol names or the symbol table"; @@ -4265,10 +4558,10 @@ let self = _self // overrides; _self = with self; { }; DigestMD5 = buildPerlPackage { - name = "Digest-MD5-2.54"; + name = "Digest-MD5-2.55"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.54.tar.gz; - sha256 = "90de11e3743ef1c753a5c2032b434e09472046fbcf346996cbe5d135b217f390"; + url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.55.tar.gz; + sha256 = "03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c"; }; meta = { description = "Perl interface to the MD-5 algorithm"; @@ -4322,8 +4615,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; sha256 = "1i7dr9jpdiy2nijl2p4q5zg2q2s9ckbj2hs4kmnnckf9hsb4p17a"; }; - buildInputs = [ TestFatal ModuleRuntime ]; - propagatedBuildInputs = [ SubExporter ListMoreUtils ]; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ModuleRuntime ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Declare version conflicts for your dist"; @@ -4332,13 +4625,13 @@ let self = _self // overrides; _self = with self; { }; DistZilla = buildPerlPackage { - name = "Dist-Zilla-4.300039"; + name = "Dist-Zilla-6.011"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-4.300039.tar.gz; - sha256 = "10cighwsqp53kbk2gwlnl9m18sbs7ijr2v37vwca9qxbscy2yr21"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.011.tar.gz; + sha256 = "0cai08gzrvf9mkqsj3b8vhcwxaxs30h4gx0wffq8c5dja9fhzjxs"; }; - buildInputs = [ FileShareDirInstall SoftwareLicense TestFatal TestFileShareDir TestScript ]; - propagatedBuildInputs = [ AppCmd CPANUploader ClassLoad ConfigINI ConfigMVP ConfigMVPReaderINI DataSection DateTime FileCopyRecursive FileFindRule FileHomeDir FileShareDir FileShareDirInstall Filepushd HashMergeSimple JSON ListAllUtils ListMoreUtils LogDispatchouli Moose MooseAutobox MooseXLazyRequire MooseXRoleParameterized MooseXSetOnce MooseXTypes MooseXTypesPathClass MooseXTypesPerl PPI ParamsUtil PathClass PerlPrereqScanner PerlVersion PodEventual SoftwareLicense StringFormatter StringRewritePrefix SubExporter SubExporterForMethods TermReadKey TestDeep TextGlob TextTemplate TryTiny YAMLTiny autobox namespaceautoclean CPANMetaRequirements ]; + buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; + propagatedBuildInputs = [ AppCmd ArchiveTarWrapper CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ]; meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; @@ -4347,46 +4640,49 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; - DistZillaPluginBundleTestingMania = buildPerlPackage { - name = "Dist-Zilla-PluginBundle-TestingMania-0.21"; + DistZillaPluginBundleTestingMania = buildPerlModule { + name = "Dist-Zilla-PluginBundle-TestingMania-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.21.tar.gz; - sha256 = "1cbq7v799bf93iqp19v1ln6bcf6gvmc0qw3gf4bq445wsm7w62wy"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.25.tar.gz; + sha256 = "072rsilh88xnk18ldbr8d0svji72r79sabyird6xc3ql1z0b42sy"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox perl ]; - propagatedBuildInputs = [ DistZilla DistZillaPluginMojibakeTests DistZillaPluginNoTabsTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion JSONPP ListMoreUtils Moose PodCoverageTrustPod TestCPANMeta TestPerlCritic TestVersion namespaceautoclean ]; + buildInputs = [ MooseAutobox TestCPANMeta TestPerlCritic TestVersion ]; + propagatedBuildInputs = [ DistZillaPluginMojibakeTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestNoTabs DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion PodCoverageTrustPod ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; description = "Test your dist with every testing plugin conceivable"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; DistZillaPluginCheckChangeLog = buildPerlPackage { - name = "Dist-Zilla-Plugin-CheckChangeLog-0.01"; + name = "Dist-Zilla-Plugin-CheckChangeLog-0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.01.tar.gz; - sha256 = "153dbe5ff8cb3c060901e003237a0515d7b9b5cc870eebfd417a6c91e28edec2"; + url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.05.tar.gz; + sha256 = "b0b34d6d70b56f1944d03c5f0dc3b8f6f24474c816d07b657a116c692c2e052a"; }; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ PathClass PodCoverage PodCoverageTrustPod PodMarkdown TestDeep TestException TestPod TestPodCoverage ]; }; DistZillaPluginMojibakeTests = buildPerlPackage { - name = "Dist-Zilla-Plugin-MojibakeTests-0.5"; + name = "Dist-Zilla-Plugin-MojibakeTests-0.8"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.5.tar.gz; - sha256 = "0630acc9bcb415feba49b55a1b70da6e49a740673b4a483fc8058d03c6a21676"; + url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.8.tar.gz; + sha256 = "f1fff547ea24a8f7a483406a72ed6c4058d746d9dae963725502ddba025ab380"; }; - propagatedBuildInputs = [ DistZilla Moose TestMojibake UnicodeCheckUTF8 ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; description = "Release tests for source encoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestMojibake ]; }; DistZillaPluginNoTabsTests = buildPerlPackage { @@ -4404,13 +4700,12 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginPodWeaver = buildPerlPackage { - name = "Dist-Zilla-Plugin-PodWeaver-3.102000"; + name = "Dist-Zilla-Plugin-PodWeaver-4.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-3.102000.tar.gz; - sha256 = "0xayy50fgfc7wlsnygz28ka2ax9pmr0rn845i8d6p40amrkzzlml"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz; + sha256 = "0ff1i26s54z292j8w8vm3gw3p7w1yq35wi8g978c84ia7y1y7n8z"; }; - buildInputs = [ FileFindRule ]; - propagatedBuildInputs = [ DistZilla ListMoreUtils Moose PPI PodElementalPerlMunger PodWeaver namespaceautoclean ]; + propagatedBuildInputs = [ DistZilla PodElementalPerlMunger PodWeaver ]; meta = { homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; description = "Weave your Pod together from configuration and Dist::Zilla"; @@ -4419,13 +4714,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginReadmeAnyFromPod = buildPerlPackage { - name = "Dist-Zilla-Plugin-ReadmeAnyFromPod-0.131500"; + name = "Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.131500.tar.gz; - sha256 = "4d02ce5f185e0d9061019c1925a410931d0c1848db7e5ba5f8e676f04634b06e"; + url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250.tar.gz; + sha256 = "d44f2799922f78b2a7961ed89123e11bdd77abfe85ba2040d82b80ad72ed13bc"; }; - buildInputs = [ DistZilla TestMost ]; - propagatedBuildInputs = [ DistZilla FileSlurp IOstringy Moose MooseAutobox MooseXHasSugar PodMarkdown ]; + buildInputs = [ TestDeep TestDifferences TestException TestFatal TestMost TestRequires TestSharedFork TestWarn ]; + propagatedBuildInputs = [ DistZillaRoleFileWatcher MooseXHasSugar PodMarkdownGithub ]; meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; description = "Automatically convert POD to a README in any format for Dist::Zilla"; @@ -4434,13 +4729,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginReadmeMarkdownFromPod = buildPerlPackage { - name = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.120120"; + name = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.120120.tar.gz; - sha256 = "5a3346daab4e2bba850ee4a7898467da9f80bc93cc10d2d625f9880a46092160"; + url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140.tar.gz; + sha256 = "9caad7b366ea59119ad73cdd99dcdd53f877a515bd0164fc28b339c01739a801"; }; - buildInputs = [ DistZilla TestMost ]; - propagatedBuildInputs = [ DistZillaPluginReadmeAnyFromPod Moose ]; + buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; + propagatedBuildInputs = [ DistZillaPluginReadmeAnyFromPod ]; meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; @@ -4454,8 +4749,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOHERTY/${name}.tar.gz"; sha256 = "215b3a5c3c58c8bab0ea27130441bbdaec737eecc00f0670937f608bdbf64806"; }; - buildInputs = [ CPANChanges DistZilla ]; - propagatedBuildInputs = [ CPANChanges DataSection DistZilla Moose ]; + buildInputs = [ CPANChanges TestDeep ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; description = "Release tests for your changelog"; @@ -4463,14 +4758,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestCPANMetaJSON = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.003"; + DistZillaPluginTestCPANMetaJSON = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.003.tar.gz; - sha256 = "c76b9f5745f4626969bb9c60e1330ebd0d8b197f8dd33f9a6e6fce63877b4883"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004.tar.gz; + sha256 = "0a573e1d5640374e6ee4d56d4fb94a3c67d4e75d52b3ddeae70cfa6450e1af22"; }; - buildInputs = [ DistZilla ]; - propagatedBuildInputs = [ DistZilla Moose MooseAutobox ]; + buildInputs = [ MooseAutobox TestCPANMetaJSON TestDeep ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; description = "Release tests for your META.json"; @@ -4478,14 +4773,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestCompile = buildPerlPackage rec { - name = "Dist-Zilla-Plugin-Test-Compile-2.054"; + DistZillaPluginTestCompile = buildPerlModule rec { + name = "Dist-Zilla-Plugin-Test-Compile-2.058"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "363fc251785a36a0b2028fda3b38d71d30c7048b09145362bbfac13fc41eab7e"; + sha256 = "d0cf93e525f102eca0f7f3967124d2e59d0a212f738ce54c1ddd91dda268d88a"; }; - buildInputs = [ CPANMetaCheck DistZilla Filepushd ModuleBuildTiny PerlPrereqScanner TestDeep TestMinimumVersion TestWarnings self."if" ]; - propagatedBuildInputs = [ DataSection DistZilla Moose PathTiny SubExporterForMethods namespaceautoclean ]; + buildInputs = [ CPANMetaCheck ModuleBuildTiny TestDeep TestMinimumVersion TestWarnings ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile; description = "Common tests to check syntax of your modules, only using core modules"; @@ -4493,14 +4788,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestDistManifest = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-DistManifest-2.000004"; + DistZillaPluginTestDistManifest = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-DistManifest-2.000005"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000004.tar.gz; - sha256 = "a832d9d04f85e9dd09f30af67c5d636efe79847ec3790939de081ee5e412fb68"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz; + sha256 = "4f0af27bb38745d2dec7d941bcf749e6d7fbeaf8e7bcf8a79a1310a9639b0f65"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestDistManifest ]; + buildInputs = [ TestDeep TestDistManifest TestOutput ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; description = "Release tests for the manifest"; @@ -4508,14 +4803,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestEOL = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-EOL-0.10"; + DistZillaPluginTestEOL = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-EOL-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-EOL-0.10.tar.gz; - sha256 = "1sl7zvjzpwf7wl188a3j13k1qcb63hawx82iy6r3dx2gns8nc0nw"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-EOL-0.19.tar.gz; + sha256 = "0f23g931azz1k41xdfxw7kayy4snhw4qdr9ysknk5k1cl33mkfd2"; }; - buildInputs = [ DistZilla TestScript ]; - propagatedBuildInputs = [ DistZilla Moose TestEOL namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestEOL TestWarnings ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/; description = "Author tests making sure correct line endings are used"; @@ -4523,14 +4818,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestKwalitee = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Kwalitee-2.06"; + DistZillaPluginTestKwalitee = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-Kwalitee-2.12"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.06.tar.gz; - sha256 = "1723beb96d4048fd4fb0fea2ed36c0c6f3ea4648ce7f93d4cb73e5d49e274bf6"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.12.tar.gz; + sha256 = "bddbcfcc75e8eb2d2d9c8611552f00cdc1b051f0f00798623b8692ff5030af2f"; }; - buildInputs = [ CaptureTiny DistZilla PathClass perl ]; - propagatedBuildInputs = [ DataSection DistZilla Moose SubExporterForMethods namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestKwalitee ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee; description = "Release tests for kwalitee"; @@ -4539,13 +4834,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestMinimumVersion = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-MinimumVersion-2.000005"; + name = "Dist-Zilla-Plugin-Test-MinimumVersion-2.000008"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000005.tar.gz; - sha256 = "988c71a3158e94e7a0b23f346f19af4a0ed67e101a2653c3185c5ae49981132b"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000008.tar.gz; + sha256 = "d924ce79aaaa1885510ca6ecfcb4d8bc250fb6995bc96627f1536cb589e3b660"; }; - buildInputs = [ DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestMinimumVersion ]; + buildInputs = [ TestDeep TestMinimumVersion TestOutput ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; description = "Release tests for minimum required versions"; @@ -4553,14 +4848,29 @@ let self = _self // overrides; _self = with self; { }; }; + DistZillaPluginTestNoTabs = buildPerlModule rec { + name = "Dist-Zilla-Plugin-Test-NoTabs-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz; + sha256 = "196hchmn8y591533v3p7kl75nlhpaygbfdiw2iqbnab9j510qq8v"; + }; + propagatedBuildInputs = [ DistZilla ]; + buildInputs = [ ModuleBuildTiny TestDeep TestNoTabs TestRequires ]; + meta = { + description = "Author tests that ensure hard tabs are not used"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-NoTabs"; + }; + }; + DistZillaPluginTestPerlCritic = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-Perl-Critic-2.112410"; + name = "Dist-Zilla-Plugin-Test-Perl-Critic-3.001"; src = fetchurl { - url = mirror://cpan/authors/id/J/JQ/JQUELIN/Dist-Zilla-Plugin-Test-Perl-Critic-2.112410.tar.gz; - sha256 = "3ce59ce3ef6cf56d7de0debb33c26f899492d9742c8b82073e257787fd85630f"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz; + sha256 = "9250b59d5dc1ae4c6893ba783bd3f05131b14ff9e91afb4555314f55268a3825"; }; - buildInputs = [ DistZilla MooseAutobox ]; - propagatedBuildInputs = [ DataSection DistZilla Moose namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestPerlCritic ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/; description = "Tests to check your code against best practices"; @@ -4569,13 +4879,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestPodLinkCheck = buildPerlPackage rec { - name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.002"; + name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004"; src = fetchurl { url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz"; - sha256 = "26f3b257d5037aeec8335910cfdaf76fc8612f38f5d3134f46cd433e116947b0"; + sha256 = "325d236da0940388d2aa86ec5c1326516b4ad45adef8e7a4f83bb91d5ee15490"; }; -# buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ DistZilla Moose TestPodLinkCheck ]; +# buildInputs = [ TestPodLinkCheck ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; description = "Add release tests for POD links"; @@ -4583,14 +4893,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestPortability = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Portability-2.000005"; + DistZillaPluginTestPortability = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-Portability-2.001000"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Portability-2.000005.tar.gz; - sha256 = "b32d0a4b1d78ba76fabedd299c1a11efed05c3ce9752d7da6babe06d3515242b"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz; + sha256 = "e08ff5bd9e24cf9503055330148913808d91a3dfe320a2bdf8b0fc638719b179"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestPortabilityFiles ]; + buildInputs = [ ModuleBuildTiny TestDeep TestPortabilityFiles TestWarnings ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; description = "Release tests for portability"; @@ -4599,13 +4909,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestSynopsis = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Synopsis-2.000004"; + name = "Dist-Zilla-Plugin-Test-Synopsis-2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000004.tar.gz; - sha256 = "d073de3206c5e588f60f55e4be64fab4c2595f5bc3013cd91307993691598d59"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000007.tar.gz; + sha256 = "e7d5e2530cd8a5bb5aadf3e1669a653aaa96e32cad7bd6b9caba6b425ceab563"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestSynopsis ]; + buildInputs = [ TestDeep TestOutput TestSynopsis ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; description = "Release tests for synopses"; @@ -4613,14 +4923,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestUnusedVars = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-UnusedVars-2.000005"; + DistZillaPluginTestUnusedVars = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-UnusedVars-2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000005.tar.gz; - sha256 = "37ec462dc82f45cfd9d6d92ee59b8fd215a9a14b18d179b05912baee77359804"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz; + sha256 = "ea0199a3a0043213ddc132508b9ed9b131ef717735b8f93d78291191d04b43c2"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestVars namespaceautoclean ]; + buildInputs = [ TestDeep TestOutput TestVars ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; description = "Release tests for unused variables"; @@ -4629,13 +4939,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestVersion = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Version-0.002004"; + name = "Dist-Zilla-Plugin-Test-Version-1.09"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-Version-0.002004.tar.gz; - sha256 = "4ae5055071e07442223d07d818e9484430368b59c15966b90b18c8abc06f8e36"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-Test-Version-1.09.tar.gz; + sha256 = "7240508731bc1bf6dfad7701ec65450a18ef9245a521ab26ebd6acb39a9ebe17"; }; - buildInputs = [ DistZilla TestNoTabs TestScript ]; - propagatedBuildInputs = [ DistZilla Moose TestVersion namespaceautoclean ]; + buildInputs = [ Filechdir TestDeep TestEOL TestNoTabs TestScript TestVersion ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/; description = "Release Test::Version tests"; @@ -4643,6 +4953,21 @@ let self = _self // overrides; _self = with self; { }; }; + DistZillaRoleFileWatcher = buildPerlModule rec { + name = "Dist-Zilla-Role-FileWatcher-0.006"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz; + sha256 = "15jfpr257xxp27gz156npgpj7kh2dchzgfmvzivi5bvdb2wl8fpy"; + }; + propagatedBuildInputs = [ DistZilla SafeIsa ]; + buildInputs = [ ModuleBuildTiny TestDeep TestFatal ]; + meta = { + description = "Receive notification when something changes a file's contents"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Role-FileWatcher"; + }; + }; + EmailAbstract = buildPerlPackage rec { name = "Email-Abstract-3.008"; src = fetchurl { @@ -4659,10 +4984,10 @@ let self = _self // overrides; _self = with self; { }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.908"; + name = "Email-Address-1.909"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.908.tar.gz; - sha256 = "0i6ljdvpy279hpbqf6lgv4figr376rb2sh4yphj86xkdzsyn1y75"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.909.tar.gz; + sha256 = "0l7x6sl06j9ffgfz5f9vgms2b5axd4cgp5fj03ivb3kia4km6b3g"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -4685,6 +5010,18 @@ let self = _self // overrides; _self = with self; { }; }; + EmailAddressXS = buildPerlPackage rec { + name = "Email-Address-XS-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.03.tar.gz; + sha256 = "1knf1i9rr20bpzscbvaqsqjgw51pnnga4zlnkgsvw7jpqh4cyj6i"; + }; + meta = { + description = "Parse and format RFC 2822 email addresses and groups"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailDateFormat = buildPerlPackage rec { name = "Email-Date-Format-1.005"; src = fetchurl { @@ -4702,7 +5039,7 @@ let self = _self // overrides; _self = with self; { EmailReply = buildPerlPackage rec { name = "Email-Reply-1.204"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz; sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0"; }; propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ]; @@ -4714,12 +5051,11 @@ let self = _self // overrides; _self = with self; { }; EmailMessageID = buildPerlPackage { - name = "Email-MessageID-1.404"; + name = "Email-MessageID-1.406"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.404.tar.gz; - sha256 = "0lyq9r3x7cs7cncf0yiazbi7aq4c5d4m3wxwgqdd4r5p9gxdjj4n"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz; + sha256 = "1f22sdnfq169qw1l0lg7y74pmiam7j9v95bggjnf3q4mygdmshpc"; }; - propagatedBuildInputs = [ EmailAddress ]; meta = { description = "Generate world unique message-ids"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -4729,12 +5065,12 @@ let self = _self // overrides; _self = with self; { }; EmailMIME = buildPerlPackage rec { - name = "Email-MIME-1.936"; + name = "Email-MIME-1.946"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "4c0934284da84b8e9ed48ff1060c9719273fac18e776f4c8e888a47c863ee661"; + sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c"; }; - propagatedBuildInputs = [ EmailAddress EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ]; + propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { homepage = https://github.com/rjbs/Email-MIME; description = "Easy MIME message handling"; @@ -4745,11 +5081,11 @@ let self = _self // overrides; _self = with self; { EmailMIMEAttachmentStripper = buildPerlPackage rec { name = "Email-MIME-Attachment-Stripper-1.317"; - buildInputs = [ CaptureTiny TestPod ]; + buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailMIME ]; src = fetchurl { - url = "http://www.cpan.org/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz; sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789"; }; meta = { @@ -4760,10 +5096,10 @@ let self = _self // overrides; _self = with self; { }; EmailMIMEContentType = buildPerlPackage rec { - name = "Email-MIME-ContentType-1.018"; + name = "Email-MIME-ContentType-1.022"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "7508cd1227b8f150a403ca49658cb4a0892836dd8f01ff95f049957b2abf10f9"; + sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310"; }; meta = { homepage = https://github.com/rjbs/Email-MIME-ContentType; @@ -4771,6 +5107,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ rycee ]; }; + propagatedBuildInputs = [ Encode ]; }; EmailMIMEEncodings = buildPerlPackage rec { @@ -4809,27 +5146,24 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "4bbec933558d7cc9b8152bad86dd313de277a21a89b4ea83d84e61587e95dbc6"; }; - propagatedBuildInputs = [ EmailAbstract EmailAddress EmailSimple ModulePluggable ReturnValue ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress ReturnValue ]; meta = { homepage = https://github.com/rjbs/Email-Send; description = "Simply Sending Email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; + buildInputs = [ MIMETools MailTools ]; }; - EmailOutlookMessage = buildPerlPackage rec { + EmailOutlookMessage = buildPerlModule rec { name = "Email-Outlook-Message-${version}"; - version = "0.918"; + version = "0.919"; src = fetchurl { url = "mirror://cpan/authors/id/M/MV/MVZ/${name}.tar.gz"; - sha256 = "1w1s858xzp3vbi91qa01qnmk4n78fmvl4a7axrx2r15vr3s2k2pv"; + sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; }; - propagatedBuildInputs = [ - Carp Encode EmailMIME EmailMIMEContentType EmailSender - EmailSimple GetoptLong IOString OLEStorage_Lite PodUsage - ]; - buildInputs = [ TestMore IOAll ]; + propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; meta = with stdenv.lib; { homepage = http://www.matijs.net/software/msgconv/; description = "A .MSG to mbox converter"; @@ -4839,13 +5173,13 @@ let self = _self // overrides; _self = with self; { }; EmailSender = buildPerlPackage rec { - name = "Email-Sender-1.300028"; + name = "Email-Sender-1.300031"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "4a1cb9386a6b58b589b3183c807e533547a28e596fb15aa4cfd614947ad8ad30"; + sha256 = "c412372938510283d8c850127895e09c2b670f892e1c3992fd54c0c1a9064f14"; }; buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ libnet EmailAbstract EmailAddress EmailSimple ListMoreUtils ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike ScalarListUtils SubExporter Throwable TryTiny libnet ]; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; @@ -4855,10 +5189,10 @@ let self = _self // overrides; _self = with self; { }; EmailSimple = buildPerlPackage rec { - name = "Email-Simple-2.210"; + name = "Email-Simple-2.214"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "c8633fa462538967c036e3077617de9e5e8f6acc68d25546ba1d5bb1e12bd319"; + sha256 = "b2f02b37441ea60efbddebbd675017d26bb767e9a4de3e0fc30b5410a1416b92"; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { @@ -4870,12 +5204,12 @@ let self = _self // overrides; _self = with self; { }; EmailValid = buildPerlPackage rec { - name = "Email-Valid-1.200"; + name = "Email-Valid-1.202"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0nnvbqz0ls451b5p0w6lgqm6kklm115db2p2xf89lw0r5pvmkw54"; + sha256 = "18hkmhddzbd23s6ak64d4j6q8ijykjyp5nxbr2hfcq1acsdhh8fh"; }; - propagatedBuildInputs = [MailTools NetDNS]; + propagatedBuildInputs = [ IOCaptureOutput MailTools NetDNS NetDomainTLD ]; doCheck = false; }; @@ -4904,14 +5238,13 @@ let self = _self // overrides; _self = with self; { }; }; - EncodeDetect = buildPerlPackage rec { + EncodeDetect = buildPerlModule rec { name = "Encode-Detect-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/J/JG/JGMYERS/${name}.tar.gz"; sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; - propagatedBuildInputs = [ ModuleBuild ]; meta = { description = "An Encode::Encoding subclass that detects the encoding of data"; license = stdenv.lib.licenses.free; @@ -4945,10 +5278,10 @@ let self = _self // overrides; _self = with self; { }; EncodeJIS2K = buildPerlPackage { - name = "Encode-JIS2K-0.02"; + name = "Encode-JIS2K-0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz; - sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz; + sha256 = "1ec84d72db39deb4dad6fca95acfcc21033f45a24d347c20f9a1a696896c35cc"; }; outputs = [ "out" ]; meta = { @@ -4958,7 +5291,7 @@ let self = _self // overrides; _self = with self; { EncodeLocale = buildPerlPackage rec { name = "Encode-Locale-1.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz; sha256 = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1"; }; preCheck = if stdenv.isCygwin then '' @@ -5009,11 +5342,11 @@ let self = _self // overrides; _self = with self; { }; }; - Error = buildPerlPackage rec { - name = "Error-0.17022"; + Error = buildPerlModule rec { + name = "Error-0.17025"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "1vzpz6syb82ir8svp2wjh95x6lpf01lgkxn2xy60ixrszc24zdya"; + sha256 = "1bzgzmf1v4md02vadm46b4j4ilqxrcrfasvbzymhrznlsd54g7vc"; }; }; @@ -5031,13 +5364,12 @@ let self = _self // overrides; _self = with self; { }; EvalClosure = buildPerlPackage { - name = "Eval-Closure-0.11"; + name = "Eval-Closure-0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.11.tar.gz; - sha256 = "1b3rc9smdyyi0janckfiyg1kwph893sqwx7dr5n4mky0x8x3v4m1"; + url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz; + sha256 = "1bcc47r6zm3hfr6ccsrs72kgwxm3wkk07mgnpsaxi67cypr482ga"; }; buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ SubExporter TryTiny ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Safely and cleanly create closures via string eval"; @@ -5045,7 +5377,7 @@ let self = _self // overrides; _self = with self; { }; }; - ExceptionBase = buildPerlPackage rec { + ExceptionBase = buildPerlModule rec { name = "Exception-Base-0.2501"; src = fetchurl { url = "mirror://cpan/authors/id/D/DE/DEXTER/${name}.tar.gz"; @@ -5060,29 +5392,29 @@ let self = _self // overrides; _self = with self; { }; ExceptionClass = buildPerlPackage rec { - name = "Exception-Class-1.37"; + name = "Exception-Class-1.44"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1p6f20fi82mr5bz7d2c7nqh0322r8n2kszfw37c77g8b1b4r72w3"; + sha256 = "03gf4cdgrjnljgrlxkvbh2cahsyzn0zsh2zcli7b1lrqn7wgpwrk"; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; }; - ExceptionDied = buildPerlPackage { + ExceptionDied = buildPerlModule { name = "Exception-Died-0.06"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz; sha256 = "1dcajw2m3x5m76fpi3fvy9fjkmfrd171pnx087i5fkgx5ay41i1m"; }; buildInputs = [ TestAssert TestUnitLite ]; - propagatedBuildInputs = [ constantboolean ExceptionBase ]; + propagatedBuildInputs = [ ExceptionBase constantboolean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; - ExceptionWarning = buildPerlPackage { + ExceptionWarning = buildPerlModule { name = "Exception-Warning-0.0401"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz; @@ -5097,10 +5429,10 @@ let self = _self // overrides; _self = with self; { }; ExporterDeclare = buildPerlModule { - name = "Exporter-Declare-0.113"; + name = "Exporter-Declare-0.114"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.113.tar.gz; - sha256 = "724de5e982c8477df14a360c82233f9e0c26b4af9191647f750f5e465ea42dce"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.114.tar.gz; + sha256 = "4bd70d6ca76f6f6ba7e4c618d4ac93b8593a58f1233ccbe18b10f5f204f1d4e4"; }; buildInputs = [ FennecLite TestException ]; propagatedBuildInputs = [ MetaBuilder aliased ]; @@ -5114,10 +5446,10 @@ let self = _self // overrides; _self = with self; { }; ExporterLite = buildPerlPackage { - name = "Exporter-Lite-0.04"; + name = "Exporter-Lite-0.08"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.04.tar.gz; - sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir"; + url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz; + sha256 = "1hns15imih8z2h6zv3m1wwmv9fiysacsb52y94v6zf2cmw4kjny0"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -5125,10 +5457,10 @@ let self = _self // overrides; _self = with self; { }; ExporterTiny = buildPerlPackage { - name = "Exporter-Tiny-0.042"; + name = "Exporter-Tiny-1.000000"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-0.042.tar.gz; - sha256 = "8f1622c5ebbfbcd519ead81df7917e48cb16cc527b1c46737b0459c3908a023f"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.000000.tar.gz; + sha256 = "ffdd77d57de099e8f64dd942ef12a00a3f4313c2531f342339eeed2d366ad078"; }; meta = { homepage = https://metacpan.org/release/Exporter-Tiny; @@ -5151,12 +5483,11 @@ let self = _self // overrides; _self = with self; { }; Expect = buildPerlPackage { - name = "Expect-1.32"; + name = "Expect-1.35"; src = fetchurl { - url = mirror://cpan/authors/id/S/SZ/SZABGAB/Expect-1.32.tar.gz; - sha256 = "d1f96842a5c7dd8516b202b530d87a70b65e7054d3bf975c34f6a42084e54e25"; + url = mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz; + sha256 = "09d92761421decd495853103379165a99efbf452c720f30277602cf23679fd06"; }; - buildInputs = [ TestException ]; propagatedBuildInputs = [ IOTty ]; meta = { description = "Automate interactions with command line programs that expose a text terminal interface"; @@ -5177,21 +5508,20 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsCBuilder = buildPerlPackage rec { - name = "ExtUtils-CBuilder-0.280216"; + name = "ExtUtils-CBuilder-0.280230"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils/${name}.tar.gz"; - sha256 = "09d5sq9mgcnmjf2yp8rwd0cc1fa8kq7nbwjqxiqdykwmavmgm5ml"; + url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280230.tar.gz; + sha256 = "1mcwvic01x0flcz3jsny5j8j5zz96r63qjwq75hs42cpf3by3ahx"; }; - buildInputs = [ PerlOSType ]; }; - ExtUtilsCChecker = buildPerlPackage rec { + ExtUtilsCChecker = buildPerlModule rec { name = "ExtUtils-CChecker-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz"; sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; }; - buildInputs = [ ModuleBuild TestFatal ]; + buildInputs = [ TestFatal ]; meta = { description = "Configure-time utilities for using C headers,"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -5199,10 +5529,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsConfig = buildPerlPackage { - name = "ExtUtils-Config-0.007"; + name = "ExtUtils-Config-0.008"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.007.tar.gz; - sha256 = "2c1465078b876fd16a90507092805265528c2532d4937b03547a6dbdb8ac0eef"; + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz; + sha256 = "ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c"; }; meta = { description = "A wrapper for perl's configuration"; @@ -5211,28 +5541,29 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsConstant = buildPerlPackage { - name = "ExtUtils-Constant-0.23"; + name = "ExtUtils-Constant-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.23.tar.gz; - sha256 = "23b77025c8a5d3b93c586d4f0e712bcca3ef934edbee00a78c3fad4285f48eab"; + url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.24.tar.gz; + sha256 = "aa9e8c0b564576195a7508374f4a80b97fe3cf4a4c13efe4c949ece3e76b217d"; }; }; - ExtUtilsCppGuess = buildPerlModule rec { - name = "ExtUtils-CppGuess-0.07"; + ExtUtilsCppGuess = buildPerlPackage rec { + name = "ExtUtils-CppGuess-0.12"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "1a77hxf2pa8ia9na72rijv1yhpn2bjrdsybwk2dj2l938pl3xn0w"; + url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.12.tar.gz; + sha256 = "0sqq8vadch633cx7w7i47fca49pxzyh82n5kwxdgvsg32mdppi1i"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; + buildInputs = [ ModuleBuild ]; }; ExtUtilsDepends = buildPerlPackage { - name = "ExtUtils-Depends-0.306"; + name = "ExtUtils-Depends-0.405"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.306.tar.gz; - sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5"; + url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz; + sha256 = "0b4ab9qmcihsfs2ajhn5qzg7nhazr68v3r0zvb7076smswd41mla"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -5242,10 +5573,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsHelpers = buildPerlPackage { - name = "ExtUtils-Helpers-0.022"; + name = "ExtUtils-Helpers-0.026"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz; - sha256 = "15dalfwmpfmifw312i5pwiai8134pxf7b2804shlqhdk1xqczy6k"; + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz; + sha256 = "05ilqcj1rg5izr09dsqmy5di4fvq6ph4k0chxks7qmd4j1kip46y"; }; meta = { description = "Various portability utilities for module builders"; @@ -5254,10 +5585,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsInstall = buildPerlPackage { - name = "ExtUtils-Install-2.04"; + name = "ExtUtils-Install-2.14"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.04.tar.gz; - sha256 = "1b2e5370bc63d93cf99a75feb2b9b67227b693d16ebfb730ca90a483145de3b6"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz; + sha256 = "35412305cbae979aac3b6e2c70cb301ae461979a1d848a8a043f74518eb96aea"; }; meta = { homepage = https://metacpan.org/release/ExtUtils-Install; @@ -5267,10 +5598,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsInstallPaths = buildPerlPackage { - name = "ExtUtils-InstallPaths-0.010"; + name = "ExtUtils-InstallPaths-0.011"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz; - sha256 = "0mi1px42in7i442jqncg3gmxd5zn7sw5b2s85h690rz433qvyk6i"; + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.011.tar.gz; + sha256 = "0z06y0fhx9hy9x01abb7s2xdbqrh9x4ps7avmlf4bwfwih2gl2bn"; }; propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { @@ -5293,10 +5624,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsMakeMaker = buildPerlPackage { - name = "ExtUtils-MakeMaker-7.32"; + name = "ExtUtils-MakeMaker-7.34"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.32.tar.gz; - sha256 = "9a269f52ab59b125eb80b968271d9f49da0975d43e51363dbfd1695000ed69de"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.34.tar.gz; + sha256 = "95f1eb44de480d00b28d031b574ec868f7aeeee199eb5abe5666f6bcbbf68480"; }; meta = { homepage = https://metacpan.org/release/ExtUtils-MakeMaker; @@ -5305,11 +5636,24 @@ let self = _self // overrides; _self = with self; { }; }; + ExtUtilsMakeMakerCPANfile = buildPerlPackage rec { + name = "ExtUtils-MakeMaker-CPANfile-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.08.tar.gz; + sha256 = "0yg2z4six807lraqh8ncsq6l62vj7zi0a38ha9nvmhd6lbipmsql"; + }; + propagatedBuildInputs = [ ModuleCPANfile ]; + meta = { + description = "cpanfile support for EUMM"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.63"; + name = "ExtUtils-Manifest-1.70"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0p4hj03nb5n6mk7pskpw066n1i3hr80nq7k7rc3fgl329v6syfmg"; + url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.70.tar.gz; + sha256 = "159bypwl8xpq1yi39prr49hl7x2xww5aj97nv169c8xja0h0dzzf"; }; }; @@ -5349,19 +5693,17 @@ let self = _self // overrides; _self = with self; { ExtUtilsTypemap = buildPerlPackage rec { name = "ExtUtils-Typemap-1.00"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz; sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i"; }; - buildInputs = [ ExtUtilsParseXS ]; }; ExtUtilsTypemapsDefault = buildPerlModule rec { name = "ExtUtils-Typemaps-Default-1.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz; sha256 = "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix"; }; - propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ]; }; ExtUtilsXSBuilder = buildPerlPackage { @@ -5376,20 +5718,20 @@ let self = _self // overrides; _self = with self; { ExtUtilsXSpp = buildPerlModule rec { name = "ExtUtils-XSpp-0.18"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz; sha256 = "1zx84f93lkymqz7qa4d63gzlnhnkxm5i3gvsrwkvvqr9cxjasxli"; }; - buildInputs = [ Spiffy TestBase TestDifferences ]; + buildInputs = [ TestBase TestDifferences ]; }; - FatalException = buildPerlPackage { - name = "Fatal-Exception-0.0204"; + FatalException = buildPerlModule { + name = "Fatal-Exception-0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.0204.tar.gz; - sha256 = "10a9j0fa83s3apv0xgi01l2h6s43my031097hg72wa80n07rgs2c"; + url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz; + sha256 = "0kzfwc44vpxla3j637kfmnwmv57g6x4899ijqb4ljamk7whms298"; }; buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; - propagatedBuildInputs = [ ExceptionBase ExceptionDied ]; + propagatedBuildInputs = [ ExceptionDied ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -5397,19 +5739,31 @@ let self = _self // overrides; _self = with self; { }; FCGI = buildPerlPackage rec { - name = "FCGI-0.74"; + name = "FCGI-0.78"; src = fetchurl { - url = "mirror://cpan/modules/by-module/FCGI/${name}.tar.gz"; - sha256 = "0m089q07kpsk8y8g2wmi3d8i1jzn5m5m00shs7vnf2lnvvv4d7pm"; + url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz; + sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa"; }; - buildInputs = [ ]; + }; + + FCGIClient = buildPerlPackage rec { + name = "FCGI-Client-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.08.tar.gz; + sha256 = "1rvhfnyhib1aslr06x8s0yfykaf44j5glj0rxz9ani7z6l0p2vqa"; + }; + propagatedBuildInputs = [ AnyMoose ]; + meta = { + description = "client library for fastcgi protocol"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; FCGIProcManager = buildPerlPackage { - name = "FCGI-ProcManager-0.25"; + name = "FCGI-ProcManager-0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.25.tar.gz; - sha256 = "b9ae1146e2638f3aa477c9ab3ceb728f92c5e36e4cce8f0b5847efad601d024d"; + url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.28.tar.gz; + sha256 = "e1c958c042427a175e051e0008f2025e8ec80613d3c7750597bf8e529b04420e"; }; meta = { description = "A perl-based FastCGI process manager"; @@ -5432,16 +5786,14 @@ let self = _self // overrides; _self = with self; { }; }; - FileChangeNotify = buildPerlModule { - name = "File-ChangeNotify-0.24"; + FileChangeNotify = buildPerlPackage { + name = "File-ChangeNotify-0.28"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.24.tar.gz; - sha256 = "3c8180169de0f97ad852a55942f74e520cbe433aa0889d0b65548ee38a111124"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.28.tar.gz; + sha256 = "e00fe809d481131a08dca26e851cf0ffce8d9e9d03d58c58f15aa62e28aa2f05"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = - [ ClassLoad ListMoreUtils ModulePluggable Moose MooseXParamsValidate MooseXSemiAffordanceAccessor namespaceautoclean ] - ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; + buildInputs = [ TestException TestRequires TestWithoutModule ]; + propagatedBuildInputs = [ ClassLoad ModulePluggable Moo TypeTiny namespaceautoclean ]; meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; license = licenses.artistic2; @@ -5449,34 +5801,35 @@ let self = _self // overrides; _self = with self; { }; Filechdir = buildPerlPackage rec { - name = "File-chdir-0.1008"; + name = "File-chdir-0.1010"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "0n8dz80fgk3shfxncyr4aff5hnsd846c5np6d68kc0mxqj2g0flr"; + sha256 = "009b8p2fzj4nhl03fpkhrn0rsh7myxqbrf69iqpzd86p1gs23hgg"; }; }; - FileBaseDir = buildPerlPackage rec { - version = "0.03"; + FileBaseDir = buildPerlModule rec { + version = "0.08"; name = "File-BaseDir-${version}"; src = fetchurl { - url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; - sha256 = "0029cba7a3b5d8aa5f7d03cb1b7ba2bcf2829382f7f26aa3bee06fce8611a886"; + url = mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz; + sha256 = "c065fcd3e2f22ae769937bcc971b91f80294d5009fac140bfba83bf7d35305e3"; }; configurePhase = '' preConfigure || true perl Build.PL PREFIX="$out" prefix="$out" ''; - propagatedBuildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ IPCSystemSimple ]; + buildInputs = [ FileWhich ]; }; - FileBOM = buildPerlPackage rec { + FileBOM = buildPerlModule rec { name = "File-BOM-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz"; sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1"; }; - buildInputs = [ ModuleBuild TestException ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ Readonly ]; meta = { description = "Utilities for handling Byte Order Marks"; @@ -5490,7 +5843,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz; sha256 = "66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a"; }; - propagatedBuildInputs = [ if_ ]; meta = { homepage = http://search.cpan.org/dist/File-CheckTree; description = "Run many filetest checks on a tree"; @@ -5499,11 +5851,13 @@ let self = _self // overrides; _self = with self; { }; FileCopyRecursive = buildPerlPackage rec { - name = "File-Copy-Recursive-0.38"; + name = "File-Copy-Recursive-0.40"; src = fetchurl { url = "mirror://cpan/authors/id/D/DM/DMUEY/${name}.tar.gz"; - sha256 = "1syyyvylr51iicialdmv0dw06q49xzv8zrkb5cn8ma4l73gvvk44"; + sha256 = "18amrqvdjlb4hc7mblbwb63q96ql1rnlb5saknsvrxqfjcxr5f78"; }; + propagatedBuildInputs = [ PathTiny ]; + buildInputs = [ TestDeep TestException TestFile TestWarn ]; }; FileDesktopEntry = buildPerlPackage rec { @@ -5531,13 +5885,12 @@ let self = _self // overrides; _self = with self; { }; }; - FileFindObject = buildPerlPackage rec { - name = "File-Find-Object-v0.3.2"; + FileFindObject = buildPerlModule rec { + name = "File-Find-Object-0.3.2"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-v0.3.2.tar.gz; sha256 = "7c467b6b7752bff46b7b8b84c9aabeac45bbfdab1e2224108a2e2170adb9f2b7"; }; - buildInputs = [ ModuleBuild perl ]; propagatedBuildInputs = [ ClassXSAccessor ]; meta = { description = "An object oriented File::Find replacement"; @@ -5551,8 +5904,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "2ce55766b25fb8799d37b95bca61e8a71d8a437e28541e1cd06b7eb89f7739d1"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ ClassXSAccessor FileFindObject NumberCompare TextGlob ]; + propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; meta = { homepage = http://www.shlomifish.org/open-source/projects/File-Find-Object/; description = "Alternative interface to File::Find::Object"; @@ -5561,19 +5913,19 @@ let self = _self // overrides; _self = with self; { }; FileFindRule = buildPerlPackage rec { - name = "File-Find-Rule-0.33"; + name = "File-Find-Rule-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; - sha256 = "0w73b4jr2fcrd74a1w3b2jryq3mqzc8z5mk7ia9p85xn3qmpa5r4"; + sha256 = "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy"; }; propagatedBuildInputs = [ NumberCompare TextGlob ]; }; FileFindRulePerl = buildPerlPackage { - name = "File-Find-Rule-Perl-1.13"; + name = "File-Find-Rule-Perl-1.15"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/File-Find-Rule-Perl-1.13.tar.gz; - sha256 = "d2ecb270778ddf54c536a78d02fe6ee7a675f7dcb7f3497ba1a76493f1bd2476"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz; + sha256 = "9a48433f86e08ce18e03526e2982de52162eb909d19735460f07eefcaf463ea6"; }; propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { @@ -5600,7 +5952,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MJ/MJP/File-FnMatch-0.02.tar.gz"; sha256 = "05p9m7kpmjv8bmmbs5chb5fqyshcgmskbbzq5c9qpskbx2w5894n"; }; - buildInputs = [ ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "simple filename and pathname matching"; @@ -5624,10 +5975,10 @@ let self = _self // overrides; _self = with self; { }; FileHomeDir = buildPerlPackage { - name = "File-HomeDir-1.00"; + name = "File-HomeDir-1.002"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/File-HomeDir-1.00.tar.gz; - sha256 = "85b94f3513093ec0a25b91f9f2571918519ae6f2b7a1e8546f8f78d09a877143"; + url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz; + sha256 = "eb4c0c85775138460cd4013d8117232f08e88381c95c6a93b3d11e969185c274"; }; propagatedBuildInputs = [ FileWhich ]; meta = { @@ -5647,13 +5998,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CryptRijndael ]; }; - Filelchown = buildPerlPackage rec { + Filelchown = buildPerlModule rec { name = "File-lchown-0.02"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz"; sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; - buildInputs = [ ExtUtilsCChecker ModuleBuild ]; + buildInputs = [ ExtUtilsCChecker ]; meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -5666,7 +6017,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; }; - buildInputs = [ TestFatal pkgs.file ]; + buildInputs = [ pkgs.file TestFatal ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; preCheck = '' substituteInPlace t/oo-api.t \ @@ -5683,20 +6034,20 @@ let self = _self // overrides; _self = with self; { FileListing = buildPerlPackage rec { name = "File-Listing-6.04"; src = fetchurl { - url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz; sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y"; }; propagatedBuildInputs = [ HTTPDate ]; }; FileMimeInfo = buildPerlPackage rec { - name = "File-MimeInfo-0.27"; + name = "File-MimeInfo-0.28"; src = fetchurl { - url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; - sha256 = "0d3jcs2fgrrfwl3rxk8xg0varjah2llm66jk6rk2gznpzqkgi72p"; + url = mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.28.tar.gz; + sha256 = "1ipbh63bkh1r2gy5g7q4bzhki8j29mm1jkhbv60p9vwsdys5s91a"; }; doCheck = false; # Failed test 'desktop file is the right one' - propagatedBuildInputs = [ FileBaseDir FileDesktopEntry ]; + buildInputs = [ FileBaseDir ]; }; FileMMagic = buildPerlPackage rec { @@ -5733,10 +6084,10 @@ let self = _self // overrides; _self = with self; { }; FileNFSLock = buildPerlPackage { - name = "File-NFSLock-1.21"; + name = "File-NFSLock-1.27"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.21.tar.gz; - sha256 = "1kclhmyha2xijq49darlz82f3bn7gq3saycxpfiz3dndqhr5i9iz"; + url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.27.tar.gz; + sha256 = "0hhh3cmbby98b1xh64dvj31wqcr9hsk1zqrq3ci8fjd4xb7xch8g"; }; meta = { maintainers = with maintainers; [ ]; @@ -5745,10 +6096,10 @@ let self = _self // overrides; _self = with self; { }; FilePath = buildPerlPackage rec { - name = "File-Path-2.12"; + name = "File-Path-2.15"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RICHE/${name}.tar.gz"; - sha256 = "bbf61a0d37c135c694e80f4ea344932bdc5474c213025ae307ea52cb6886d17e"; + url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.15.tar.gz; + sha256 = "1570f3c1cdf93c50f65c2072e8f20ee121550771dfb7f6e563f503a2a7050744"; }; meta = { description = "Create or remove directory trees"; @@ -5756,11 +6107,25 @@ let self = _self // overrides; _self = with self; { }; }; + FilePid = buildPerlPackage rec { + name = "File-Pid-1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CW/CWEST/${name}.tar.gz"; + sha256 = "bafeee8fdc96eb06306a0c58bbdb7209b6de45f850e75fdc6b16db576e05e422"; + }; + propagatedBuildInputs = [ ClassAccessor ]; + meta = { + license = stdenv.lib.licenses.free; # Same as Perl + description = "Pid File Manipulation"; + maintainers = [ maintainers.limeytexan ]; + }; + }; + Filepushd = buildPerlPackage { - name = "File-pushd-1.005"; + name = "File-pushd-1.014"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.005.tar.gz; - sha256 = "50fdcc33e69a50bab1e32d1a7c96753938f6d95a06015e34e662958c58687842"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.014.tar.gz; + sha256 = "b5ab37ffe3acbec53efb7c77b4423a2c79afa30a48298e751b9ebee3fdc6340b"; }; meta = { homepage = https://metacpan.org/release/File-pushd; @@ -5785,18 +6150,18 @@ let self = _self // overrides; _self = with self; { }; FileRemove = buildPerlPackage rec { - name = "File-Remove-1.52"; + name = "File-Remove-1.57"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "1p8bal9qhwkjbghivxn1d5m3qdj2qwm1agrjbmakm6la9dbxqm21"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.57.tar.gz; + sha256 = "1b814lw181kkqh6c1n4p2zlzzsq6ic5pfpr831nphf2w2rhcvgmk"; }; }; FileShare = buildPerlPackage { - name = "File-Share-0.03"; + name = "File-Share-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JOENIO/File-Share-0.03.tar.gz; - sha256 = "0siy9p6b7zbln5yq6g8z1nwm76ia23kkdj1k5pywsh3n6dn2lxa2"; + url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz; + sha256 = "0w3h800qqcf1sn79h84zngnn788rg2jx4jjb70l44f6419p2b7cf"; }; propagatedBuildInputs = [ FileShareDir ]; meta = { @@ -5809,10 +6174,10 @@ let self = _self // overrides; _self = with self; { }; FileShareDir = buildPerlPackage { - name = "File-ShareDir-1.03"; + name = "File-ShareDir-1.104"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/File-ShareDir-1.03.tar.gz; - sha256 = "0fczaqjxyzmzgrmn3ib84cj6pd2085wsvni3wf5b018i21j2wi2r"; + url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.104.tar.gz; + sha256 = "1bqwhk3qfg60bkpi5b83bh93sng8jx20i3ka5sixc0prrppjidh7"; }; propagatedBuildInputs = [ ClassInspector ]; meta = { @@ -5821,11 +6186,11 @@ let self = _self // overrides; _self = with self; { }; }; - FileShareDirInstall = buildPerlPackage { - name = "File-ShareDir-Install-0.08"; + FileShareDirInstall = buildPerlModule { + name = "File-ShareDir-Install-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWYN/File-ShareDir-Install-0.08.tar.gz; - sha256 = "188pgn43wa6hgpcrv997lp3bad50030p4wmrcdzvfrqxj0bx2amf"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz; + sha256 = "1j0cw1aq9fdv9kl1a6fnfa4zihsvmcqzy9sb0xk0i9pyx5r8ggrj"; }; meta = { description = "Install shared files"; @@ -5833,33 +6198,20 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ ModuleBuildTiny ]; }; FilesysNotifySimple = buildPerlPackage { - name = "Filesys-Notify-Simple-0.08"; + name = "Filesys-Notify-Simple-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.08.tar.gz; - sha256 = "042klyvi8fbkhmyg1h7883bbjdhiclmky9w2wfga7piq5il6nxgi"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.13.tar.gz; + sha256 = "18jv96k1pf8wqf4vn2ahs7dv44lc9cyqj0bja9z17qici3dx7qxd"; }; meta = { description = "Simple and dumb file system watcher"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - }; - - FileTemp = null; - - FileType = buildPerlPackage { - name = "File-Type-0.22"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; - sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; - }; - meta = { - description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; + buildInputs = [ TestSharedFork ]; }; FileSlurp = buildPerlPackage { @@ -5878,10 +6230,10 @@ let self = _self // overrides; _self = with self; { }; FileSlurper = buildPerlPackage rec { - name = "File-Slurper-0.011"; + name = "File-Slurper-0.012"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "f6494844b9759b3d1dd8fc4ffa790f8e6e493c4eb58e88831a51e085f2e76010"; + sha256 = "4efb2ea416b110a1bda6f8133549cc6ea3676402e3caf7529fce0313250aa578"; }; buildInputs = [ TestWarnings ]; meta = { @@ -5902,13 +6254,55 @@ let self = _self // overrides; _self = with self; { }; }; + FileTail = buildPerlPackage rec { + name = "File-Tail-1.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MG/MGRABNAR/${name}.tar.gz"; + sha256 = "1ixg6kn4h330xfw3xgvqcbzfc3v2wlzjim9803jflhvfhf0rzl16"; + }; + meta = { + description = "Perl extension for reading from continously updated files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + + FileTemp = null; + + FileTouch = buildPerlPackage rec { + name = "File-Touch-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "e379a5ff89420cf39906e5ceff309b8ce958f99f9c3e57ad52b5002a3982d93c"; + }; + meta = { + homepage = https://github.com/neilb/File-Touch; + description = "Update file access and modification times, optionally creating files if needed"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + + FileType = buildPerlModule { + name = "File-Type-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; + sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; + }; + meta = { + description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; + }; + FileUtil = buildPerlPackage rec { name = "File-Util-4.161950"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TOMMY/${name}.tar.gz"; sha256 = "88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee"; }; - buildInputs = [ ModuleBuild TestNoWarnings ]; + buildInputs = [ TestNoWarnings ]; meta = { homepage = https://github.com/tommybutler/file-util/wiki; description = "Easy, versatile, portable file handling"; @@ -5918,10 +6312,10 @@ let self = _self // overrides; _self = with self; { }; FileWhich = buildPerlPackage rec { - name = "File-Which-1.21"; + name = "File-Which-1.22"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "9def5f10316bfd944e56b7f8a2501be1d44c288325309462aa9345e340854bcc"; + sha256 = "e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4"; }; meta = { homepage = http://perl.wdlabs.com/File-Which; @@ -5930,11 +6324,23 @@ let self = _self // overrides; _self = with self; { }; }; + FileZglob = buildPerlPackage rec { + name = "File-Zglob-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz; + sha256 = "16v61rn0yimpv5kp6b20z2f1c93n5kpsyjvr0gq4w2dc43gfvc8w"; + }; + meta = { + description = "Extended globs."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Filter = buildPerlPackage { - name = "Filter-1.55"; + name = "Filter-1.58"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.55.tar.gz; - sha256 = "7855f5f5f16777c14614b5d907794a170ed4cdeb4382bf03ffca825c8c6bc4a0"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.58.tar.gz; + sha256 = "6de91cb4cbfe08d0ccffbca39aed57f9237be602b8183f13fd163fc8cb657f3d"; }; meta = { description = "Source Filters"; @@ -5960,9 +6366,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7"; }; - propagatedBuildInputs = [ - CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP LWPProtocolHttps MozillaCA - DateCalc DateTime JSON ]; + propagatedBuildInputs = [ CGI DateTime HTMLTableExtract JSON LWPProtocolHttps ]; meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; @@ -5984,18 +6388,18 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BH/BHALLISSY/${name}.tar.gz"; sha256 = "4b697d444259759ea02d2c442c9bffe5ffe14c9214084a01f743693a944cc293"; }; - propagatedBuildInputs = [ IOString ]; meta = { description = "TTF font support for Perl"; license = stdenv.lib.licenses.artistic2; }; + buildInputs = [ IOString ]; }; ForksSuper = buildPerlPackage { - name = "Forks-Super-0.72"; + name = "Forks-Super-0.93"; src = fetchurl { - url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.72.tar.gz; - sha256 = "0zyqwyndb3gnbsh43b6xyl3wmlnyi18vz3yrbsvp3lccz4d0v7qp"; + url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.93.tar.gz; + sha256 = "1blkhi3kpkqv6dlnbxz5r9j9lbr58vag3aa2c9yqpkqk59hivbgg"; }; doCheck = false; meta = { @@ -6003,6 +6407,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; + propagatedBuildInputs = [ URI ]; }; FormValidatorSimple = buildPerlPackage rec { @@ -6011,12 +6416,13 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/L/LY/LYOKATO/${name}.tar.gz"; sha256 = "fc3a63dc54b962d74586070176adaf5be869f09b561bb30f5fd32ef531792666"; }; - propagatedBuildInputs = [ CGI ClassAccessor ClassDataAccessor ClassDataInheritable ClassInspector DateCalc DateTimeFormatStrptime EmailValid EmailValidLoose ListMoreUtils MailTools TieIxHash UNIVERSALrequire YAML ]; + propagatedBuildInputs = [ ClassAccessor ClassDataAccessor DateCalc DateTimeFormatStrptime EmailValidLoose ListMoreUtils TieIxHash UNIVERSALrequire YAML ]; meta = { description = "Validation with simple chains of constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; + buildInputs = [ CGI ]; }; FreezeThaw = buildPerlPackage { @@ -6029,13 +6435,13 @@ let self = _self // overrides; _self = with self; { }; GamesSolitaireVerify = buildPerlModule { - name = "Games-Solitaire-Verify-0.1400"; + name = "Games-Solitaire-Verify-0.1701"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1400.tar.gz; - sha256 = "0c897c17f23ed6710d0e3ddfb54cce0f00f5b68c55277181adc94a03b7d8c659"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1701.tar.gz; + sha256 = "71383f9c44a344aa92eca6ad999103b05809f19b3e078cf01651f2298bc435c1"; }; buildInputs = [ TestDifferences ]; - propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils MooXlate ]; + propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ]; meta = { description = "Verify solutions for solitaire games"; license = stdenv.lib.licenses.mit; @@ -6049,8 +6455,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1ampz82kf0ixybncfgpvq2bp9nq5sjsmmw4c8srsv0g5jpz02pfh"; }; - buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype - pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm GetoptLong ]; + buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ]; # Patch needed to get arguments past the first GetOptions call # and to specify libfontconfig search path. @@ -6066,22 +6471,22 @@ let self = _self // overrides; _self = with self; { GDGraph = buildPerlPackage rec { name = "GDGraph-1.54"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz; sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr"; }; - propagatedBuildInputs = [ GD GDText ]; - buildInputs = [ TestException CaptureTiny ]; + propagatedBuildInputs = [ GDText ]; + buildInputs = [ CaptureTiny TestException ]; meta = { description = "Graph Plotting Module for Perl 5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - GDSecurityImage = buildPerlPackage { - name = "GD-SecurityImage-1.72"; + GDSecurityImage = buildPerlModule { + name = "GD-SecurityImage-1.73"; src = fetchurl { - url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.72.tar.gz; - sha256 = "07a025krdaml5ls7gyssfdcsif6cnsnksrxkqk48n9dmv7rz7q1r"; + url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.73.tar.gz; + sha256 = "1kaxs67rfd4w46lxgcg3pa05a596l0h1k8n4zk2gwrrar4022wpx"; }; propagatedBuildInputs = [ GD ]; meta = { @@ -6093,7 +6498,7 @@ let self = _self // overrides; _self = with self; { GDText = buildPerlPackage rec { name = "GDTextUtil-0.86"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz"; + url = mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz; sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8"; }; propagatedBuildInputs = [ GD ]; @@ -6103,28 +6508,28 @@ let self = _self // overrides; _self = with self; { }; GeoIP = buildPerlPackage rec { - name = "Geo-IP-1.45"; + name = "Geo-IP-1.51"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MAXMIND/${name}.tar.gz"; - sha256 = "0qinkq2br1cjicbgqb5bvrhm73h7f9f4fgc6bjfs5r6x7316bdqf"; + sha256 = "1fka8fr7fw6sh3xa9glhs1zjg3s2gfkhi7n7da1l2m2wblqj0c0n"; }; makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; doCheck = false; # seems to access the network }; GetoptLong = buildPerlPackage rec { - name = "Getopt-Long-2.42"; + name = "Getopt-Long-2.50"; src = fetchurl { url = "mirror://cpan/authors/id/J/JV/JV/${name}.tar.gz"; - sha256 = "12c5pvmx0jxx0mls8qll9ixb1lbacs7p1rwvmciv0dvw3w25dmr7"; + sha256 = "0rsb7ri8210xv09mnxykw5asbcqivd0v38x0z4jkis3k5gdim210"; }; }; GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.101"; + name = "Getopt-Long-Descriptive-0.102"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "752e898ea6eb8706ceb836668ca645704f5dcbc3124b6d1b21d04007dbc46948"; + sha256 = "9ad4b98f294aa0515cc3150a1ae878d39e470762b78d8bd9df055eba9dea2846"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -6150,7 +6555,7 @@ let self = _self // overrides; _self = with self; { sha256 = "987c74366cc4c37ee084050f985fa254359c89c12507f5b8bfc6607de538d5a8"; }; buildInputs = [ Testutf8 ]; - propagatedBuildInputs = [ ArchiveExtract ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest Moose MooseXStrictConstructor MooseXTypesPathClass namespaceautoclean ]; + propagatedBuildInputs = [ ArchiveExtract ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest MooseXStrictConstructor MooseXTypesPathClass ]; doCheck = false; meta = { description = "A Pure Perl interface to Git repositories"; @@ -6159,27 +6564,28 @@ let self = _self // overrides; _self = with self; { }; Glib = buildPerlPackage rec { - name = "Glib-1.321"; + name = "Glib-1.326"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "0h4cfxrxcf1mrdab5n5kk0smsi8vcrfnmcw1k6xw87r4vbifnxdr"; + sha256 = "0prn9kkdpwjq9qmzqashbhk3pq4gvlrmvm3b10xf1dhc48406382"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ]; + buildInputs = [ pkgs.glib ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; Gnome2 = buildPerlPackage rec { - name = "Gnome2-1.046"; + name = "Gnome2-1.047"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "a6c787232ab7e82a423a9ff5a49cec6bf586c1bb3c04c2052a91cdda5b66ae40"; + sha256 = "ccc85c5dc3c14f915ed1a186d238681d83fef3d17eed1c20001499ff56b6390c"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 Pango pkgs.gnome2.libgnomeui ]; + propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; meta = { homepage = http://gtk2-perl.sourceforge.net; description = "Perl interface to the 2.x series of the GNOME libraries"; @@ -6193,19 +6599,20 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; sha256 = "47a34204cd5f3a0ef5c8b9e1c9c96f41740edab7e9abf1d0560fa8666ba1916e"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gnome2.libgnomecanvas ]; + buildInputs = [ pkgs.gnome2.libgnomecanvas ]; meta = { license = stdenv.lib.licenses.lgpl2Plus; }; + propagatedBuildInputs = [ Gtk2 Pango ]; }; Gnome2VFS = buildPerlPackage rec { - name = "Gnome2-VFS-1.082"; + name = "Gnome2-VFS-1.083"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "19dacfedef8770300861cb75f98ca5402e6e56501a888af3c18266a0790911b7"; + sha256 = "eca974669df4e7f21b4fcedb96c8a328422369c68b8c2cd99b9ce9cc5d7a7979"; }; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib pkgs.gnome2.gnome_vfs ]; + propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; meta = { description = "Perl interface to the 2.x series of the GNOME VFS library"; license = stdenv.lib.licenses.lgpl21Plus; @@ -6218,8 +6625,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.libwnck pkgs.glib pkgs.gtk2 ]; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 ]; + buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; + propagatedBuildInputs = [ Gtk2 Pango ]; meta = { description = "Perl interface to the Window Navigator Construction Kit"; license = stdenv.lib.licenses.lgpl21Plus; @@ -6245,8 +6652,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AL/ALEXMV/${name}.tar.gz"; sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; }; - buildInputs = with pkgs; [ which gnupg1compat ]; - propagatedBuildInputs = [ Moo MooXHandlesVia MooXlate ]; + buildInputs = [ pkgs.which pkgs.gnupg1compat ]; + propagatedBuildInputs = [ MooXHandlesVia MooXlate ]; doCheck = false; meta = { description = "Supply object methods for interacting with GnuPG"; @@ -6273,7 +6680,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Y/YE/YEWENBIN/${name}.tar.gz"; sha256 = "0c588c507eed5e62d12ed1cc1e491c6ff3a1f59c4fb3d435e14214b37ab39251"; }; - propagatedBuildInputs = [ Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.goocanvas pkgs.gtk2 ]; + propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 Pango ]; meta = { description = "Perl interface to the GooCanvas"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6281,10 +6688,10 @@ let self = _self // overrides; _self = with self; { }; GoogleProtocolBuffers = buildPerlPackage rec { - name = "Google-ProtocolBuffers-0.11"; + name = "Google-ProtocolBuffers-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/${name}.tar.gz"; - sha256 = "0k2skcbfzn2aw1f218l47h4kgq5rj9qsam3sd6zw4qq3zyp0amb1"; + sha256 = "0wad56n12h9yhnrq1m1z3jna1ch3mg3mqj41wkfi49ws1g34k15k"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; patches = @@ -6296,25 +6703,23 @@ let self = _self // overrides; _self = with self; { }; Graph = buildPerlPackage rec { - name = "Graph-0.96"; + name = "Graph-0.9704"; src = fetchurl { url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; - sha256 = "09wpiz7v0gv07zb7h8gwgjrwj16cdycs60d08cjlyj1s926zlbl3"; + sha256 = "099a1gca0wj5zs0cffncjqp2mjrdlk9i6325ks89ml72gfq8wpij"; }; - - buildInputs = [ TestPod TestPodCoverage ]; }; GraphViz = buildPerlPackage rec { - name = "GraphViz-2.18"; + name = "GraphViz-2.24"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; - sha256 = "1zdgdd42ywg7bklysd8p8dra66q64vlm4fmnj5gjslp98cm02p9h"; + sha256 = "1bgm4a8kan53r30qiknr4kasvhar1khf7vq064l1inzfrp2glpnr"; }; # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz. - buildInputs = [ pkgs.graphviz ]; - propagatedBuildInputs = [ IPCRun TestMore ]; + buildInputs = [ pkgs.graphviz TestPod ]; + propagatedBuildInputs = [ FileWhich IPCRun ParseRecDescent XMLTwig XMLXPath ]; meta = with stdenv.lib; { description = "Perl interface to the GraphViz graphing tool"; @@ -6330,7 +6735,7 @@ let self = _self // overrides; _self = with self; { sha256 = "7969e569ec54b2f569a5af56ac4d884c630ad850974658219b0b6953e97b5d3d"; }; buildInputs = [ FileSlurp URI ]; - propagatedBuildInputs = [ DateManip DigestMD5 MailMboxMessageParser TimeDate ]; + propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; outputs = [ "out" ]; meta = { homepage = https://github.com/coppit/grepmail; @@ -6341,12 +6746,13 @@ let self = _self // overrides; _self = with self; { }; GrowlGNTP = buildPerlModule rec { - name = "Growl-GNTP-0.20"; + name = "Growl-GNTP-0.21"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Growl/${name}.tar.gz"; - sha256 = "150x65lwf7pfsygcpmvj3679lhlfwx87xylwnrmwll67f9dpkjdi"; + url = mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz; + sha256 = "0gq8ypam6ifp8f3s2mf5d6sw53m7h3ki1zfahh2p41kl8a77yy98"; }; - buildInputs = [ DataUUID CryptCBC ]; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CryptCBC DataUUID ]; }; GSSAPI = buildPerlPackage rec { @@ -6366,12 +6772,12 @@ let self = _self // overrides; _self = with self; { }; Gtk2 = buildPerlPackage rec { - name = "Gtk2-1.2498"; + name = "Gtk2-1.24992"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "0gs6lr4clz86838s3klrl37lf48j24zv0p37jlsvsnr927whpq3j"; + sha256 = "1044rj3wbfmgaif2jb0k28m2aczli6ai2n5yvn6pr7zjyw16kvd2"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ]; + buildInputs = [ pkgs.gtk2 Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Pango ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; @@ -6386,7 +6792,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; }; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gnome2.libglade pkgs.gtk2 ]; + propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 Pango ]; meta = { homepage = https://metacpan.org/pod/Gtk2::GladeXML; description = "Create user interfaces directly from Glade XML files"; @@ -6400,7 +6806,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BORUP/${name}.tar.gz"; sha256 = "cbb7632b75d7f41554dfe8ee9063dbfd1d8522291077c65d0d82e9ceb5e94ae2"; }; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gtk2 ]; + propagatedBuildInputs = [ pkgs.gtk2 Gtk2 Pango ]; meta = { license = stdenv.lib.licenses.gpl2; }; @@ -6412,7 +6818,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/O/OE/OESTERHOL/${name}.tar.gz"; sha256 = "a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a"; }; - propagatedBuildInputs = [ Gtk2 pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Glib Pango ]; + propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Gtk2 ]; # Tests fail due to no display: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. doCheck = false; @@ -6428,8 +6834,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/${name}.tar.gz"; sha256 = "087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gtkimageview pkgs.gtk2 ]; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 ]; + buildInputs = [ pkgs.gtkimageview pkgs.gtk2 ]; + propagatedBuildInputs = [ Gtk2 Pango ]; # Tests fail due to no display server: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. # t/animview.t ........... @@ -6446,7 +6852,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PO/POTYL/${name}.tar.gz"; sha256 = "ae8dfb0f6844ddaa2ce7b5b44553419490c8e83c24fd35c431406a58f6be0f4f"; }; - propagatedBuildInputs = [ Gtk2 Glib ExtUtilsDepends ExtUtilsPkgConfig pkgs.libunique pkgs.gtk2 Cairo Pango ]; + propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 Pango ]; meta = { description = "Use single instance applications"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6468,22 +6874,24 @@ let self = _self // overrides; _self = with self; { HashFlatten = buildPerlPackage rec { name = "Hash-Flatten-1.19"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BB/BBC/Hash-Flatten-1.19.tar.gz; sha256 = "162b9qgkr19f97w4pic6igyk3zd0sbnrhl3s8530fikciffw9ikh"; }; - buildInputs = [ TestAssertions LogTrace ]; + buildInputs = [ TestAssertions ]; + propagatedBuildInputs = [ LogTrace ]; }; HashMerge = buildPerlPackage rec { - name = "Hash-Merge-0.200"; + name = "Hash-Merge-0.300"; src = fetchurl { url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; - sha256 = "0r1a2axz85wn6573zrl9rk8mkfl2cvf1gp9vwya5qndp60rz1ya7"; + sha256 = "0h3wfnpv5d4d3f9xzmwkchay6251nhzngdv3f6xia56mj4hxabs0"; }; - propagatedBuildInputs = [ Clone ]; + propagatedBuildInputs = [ CloneChoose ]; meta = { description = "Merges arbitrarily deep hashes into a single hash"; }; + buildInputs = [ Clone ClonePP ]; }; HashMergeSimple = buildPerlPackage { @@ -6492,7 +6900,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz; sha256 = "1c56327873d2f04d5722777f044863d968910466997740d55a754071c6287b73"; }; - buildInputs = [ TestMost ]; + buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; @@ -6514,10 +6922,10 @@ let self = _self // overrides; _self = with self; { }; HashMultiValue = buildPerlPackage { - name = "Hash-MultiValue-0.15"; + name = "Hash-MultiValue-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Hash-MultiValue-0.15.tar.gz; - sha256 = "1jc37kwpa1fl88va8bd1p95h0vjv1gsvmn7pc2pxj62ga6x0wpc0"; + url = mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz; + sha256 = "1x3k7h542xnigz0b8vsfiq580p5r325wi5b8mxppiqk8mbvis636"; }; meta = { description = "Store multiple values per key"; @@ -6526,12 +6934,11 @@ let self = _self // overrides; _self = with self; { }; HashUtilFieldHashCompat = buildPerlPackage { - name = "Hash-Util-FieldHash-Compat-0.07"; + name = "Hash-Util-FieldHash-Compat-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.07.tar.gz; - sha256 = "1fbqcjvp5slkfyf63g8scrbdpkpw3g9z9557xvfaxn09aki7g1bn"; + url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz; + sha256 = "06vlygjyk7rkkw0di3252mma141w801qn3xk40aa2yskbfklcbk4"; }; - propagatedBuildInputs = [ Testuseok ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -6539,7 +6946,7 @@ let self = _self // overrides; _self = with self; { }; HeapFibonacci = buildPerlPackage { - name = "Heap-Fibonacci-0.80"; + name = "Heap-0.80"; src = fetchurl { url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; @@ -6551,12 +6958,12 @@ let self = _self // overrides; _self = with self; { }; HookLexWrap = buildPerlPackage rec { - name = "Hook-LexWrap-0.25"; + name = "Hook-LexWrap-0.26"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "08ab9af6bd9b4560702d9d994ad9d905af0c2fd24090d1480ff640f137c1430d"; + sha256 = "b60bdc5f98f94f9294b06adef82b1d996da192d5f183f9f434b610fd1137ec2d"; }; - buildInputs = [ ModuleBuildTiny pkgs.unzip ]; + buildInputs = [ pkgs.unzip ]; meta = { homepage = https://github.com/chorny/Hook-LexWrap; description = "Lexically scoped subroutine wrappers"; @@ -6591,7 +6998,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; }; - buildInputs = [ ModuleBuild ModuleBuildPluggablePPPort TestRequires ]; + buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; meta = { homepage = https://github.com/tokuhirom/HTML-Escape; description = "Extremely fast HTML escaping"; @@ -6605,7 +7012,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz; sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359"; }; - propagatedBuildInputs = [ HTMLParser TermVT102Boundless Testuseok ]; + propagatedBuildInputs = [ HTMLParser TermVT102Boundless ]; meta = { }; }; @@ -6616,20 +7023,20 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz; sha256 = "0dpwr7yz6hjc3bcqgcbdzjjk9l58ycdjmbam9nfcmm85y2a1vh38"; }; - propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; + propagatedBuildInputs = [ HTMLParser HTTPMessage ]; meta = { description = "Class that represents an HTML form element"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - HTMLFormatter = buildPerlModule { - name = "HTML-Formatter-2.14"; + HTMLFormatter = buildPerlPackage { + name = "HTML-Formatter-2.16"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.14.tar.gz; - sha256 = "d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e"; + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz; + sha256 = "cb0a0dd8aa5e8ba9ca214ce451bf4df33aa09c13e907e8d3082ddafeb30151cc"; }; - buildInputs = [ FileSlurper TestCPANMeta TestEOL TestNoTabs perl ]; + buildInputs = [ FileSlurper TestWarnings ]; propagatedBuildInputs = [ FontAFM HTMLTree ]; meta = { homepage = https://metacpan.org/release/HTML-Formatter; @@ -6638,13 +7045,13 @@ let self = _self // overrides; _self = with self; { }; }; - HTMLFormatTextWithLinks = buildPerlPackage { + HTMLFormatTextWithLinks = buildPerlModule { name = "HTML-FormatText-WithLinks-0.15"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz; sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1"; }; - propagatedBuildInputs = [ HTMLFormatter HTMLTree URI ]; + propagatedBuildInputs = [ HTMLFormatter URI ]; meta = { description = "HTML to text conversion with links as footnotes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6652,12 +7059,12 @@ let self = _self // overrides; _self = with self; { }; HTMLFormatTextWithLinksAndTables = buildPerlPackage { - name = "HTML-FormatText-WithLinks-AndTables-0.06"; + name = "HTML-FormatText-WithLinks-AndTables-0.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz; - sha256 = "e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa"; + url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz; + sha256 = "809ee2f11705706b33c54312b5c7bee674838f2beaaedaf8cb945e702aae39b6"; }; - propagatedBuildInputs = [ HTMLFormatTextWithLinks HTMLFormatter HTMLTree ]; + propagatedBuildInputs = [ HTMLFormatTextWithLinks ]; meta = { description = "Converts HTML to Text with tables intact"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6665,17 +7072,13 @@ let self = _self // overrides; _self = with self; { }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-2.01"; + name = "HTML-FormFu-2.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "0fvilng85wc65pna898x7mp4hx73mhahl7j2s10gj76avmxdizsw"; + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-2.05.tar.gz; + sha256 = "0xz41ap0vyw9yfjci84i5ixc6jshjrd2swhiv8dsy5xx9x71iw1q"; }; - buildInputs = [ FileShareDirInstall TestAggregate TestException ]; - propagatedBuildInputs = [ CGI Clone ConfigAny DataVisitor DateTime - DateTimeFormatBuilder DateTimeFormatNatural DateTimeFormatStrptime - DateTimeLocale EmailValid FileShareDir HTMLScrubber HTMLTokeParserSimple - HTTPMessage HashFlatten ListMoreUtils ModulePluggable Moose MooseXAliases - NumberFormat PathClass Readonly RegexpCommon TaskWeaken YAMLLibYAML ]; + buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle ]; + propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten MooseXAliases NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ]; meta = { description = "HTML Form Creation, Rendering and Validation Framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6683,15 +7086,15 @@ let self = _self // overrides; _self = with self; { }; HTMLFormHandler = buildPerlPackage { - name = "HTML-FormHandler-0.40057"; + name = "HTML-FormHandler-0.40068"; src = fetchurl { - url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40057.tar.gz; - sha256 = "1hn9shhbsi4pdp396ia2hky3i0imnxgwvhy57gp0jjhy5qyvafvm"; + url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40068.tar.gz; + sha256 = "09z8rpb3avdd8984rm6j6gd2igbzjz9rc0ycig654mqjlgfphyzb"; }; # a single test is failing on perl 5.20 doCheck = false; - buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle ]; - propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ]; + buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle TestWarn ]; + propagatedBuildInputs = [ CryptBlowfish CryptCBC DataClone DateTimeFormatStrptime EmailValid HTMLTree JSONMaybeXS MooseXGetopt MooseXTypesCommon MooseXTypesLoadableClass aliased ]; meta = { description = "HTML forms using Moose"; maintainers = with maintainers; [ ]; @@ -6701,13 +7104,13 @@ let self = _self // overrides; _self = with self; { }; HTMLMason = buildPerlPackage { - name = "HTML-Mason-1.56"; + name = "HTML-Mason-1.58"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz; - sha256 = "84ac24fb1d551f998145435265e5b6fd4a52ec61e4fadd3d7755eb648be2c4b2"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz; + sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ CacheCache CGI ClassContainer ExceptionClass HTMLParser LogAny ParamsValidate ]; + propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ]; meta = { homepage = https://metacpan.org/release/HTML-Mason; description = "High-performance, dynamic web site authoring system"; @@ -6743,6 +7146,18 @@ let self = _self // overrides; _self = with self; { }; }; + HTMLTagCloud = buildPerlModule rec { + name = "HTML-TagCloud-0.38"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROBERTSD/${name}.tar.gz"; + sha256 = "05bhnrwwlwd6cj3cn91zw5r99xddvy142bznid26p1pg5m3rk029"; + }; + meta = { + description = "Generate An HTML Tag Cloud"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLQuoted = buildPerlPackage { name = "HTML-Quoted-0.04"; src = fetchurl { @@ -6762,7 +7177,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz; sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c"; }; - propagatedBuildInputs = [ HTMLParser HTMLTagset URI ]; + propagatedBuildInputs = [ HTMLParser URI ]; meta = { description = "Concise attribute rewriting"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6770,10 +7185,10 @@ let self = _self // overrides; _self = with self; { }; HTMLSelectorXPath = buildPerlPackage { - name = "HTML-Selector-XPath-0.16"; + name = "HTML-Selector-XPath-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.16.tar.gz; - sha256 = "0v12plal866ifcv7m8x22abrddd6cf12gn55qclk53qqa6c8f8m6"; + url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.23.tar.gz; + sha256 = "0vvvdrccypwv3qpf9hq5h2b6k0p5qrmz60p2swjh009dvr601h7j"; }; buildInputs = [ TestBase ]; meta = { @@ -6783,12 +7198,13 @@ let self = _self // overrides; _self = with self; { }; HTMLScrubber = buildPerlPackage rec { - name = "HTML-Scrubber-0.15"; + name = "HTML-Scrubber-0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/PODMASTER/${name}.tar.gz"; - sha256 = "0xb5zj67y2sjid9bs3yfm81rgi91fmn38wy1ryngssw6vd92ijh2"; + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.17.tar.gz; + sha256 = "06p7w4zd42b2yh541mlzyqj40lwmvvn3fyqi8big4mf34la7m2jm"; }; propagatedBuildInputs = [ HTMLParser ]; + buildInputs = [ PodCoverageTrustPod TestCPANMeta TestDifferences TestEOL TestKwalitee TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage ]; }; HTMLTableExtract = buildPerlPackage rec { @@ -6797,39 +7213,39 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MS/MSISK/${name}.tar.gz"; sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; - propagatedBuildInputs = [ HTMLElementExtended HTMLParser ]; + propagatedBuildInputs = [ HTMLElementExtended ]; }; HTMLTagset = buildPerlPackage rec { name = "HTML-Tagset-3.20"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz; sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd"; }; }; HTMLTemplate = buildPerlPackage rec { - name = "HTML-Template-2.95"; + name = "HTML-Template-2.97"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WONKO/${name}.tar.gz"; - sha256 = "07ahpfgidxsw2yb7y8i7bbr8s64aq6qgq832h9jswmksxbd0l43q"; + url = mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz; + sha256 = "17qjw8swj2q4b1ic285pndgrkmvpsqw0j68nhqzpk1daydhsyiv5"; }; propagatedBuildInputs = [ CGI ]; + buildInputs = [ TestPod ]; }; HTMLTidy = buildPerlPackage rec { - name = "HTML-Tidy-1.56"; + name = "HTML-Tidy-1.60"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "1zp4wndvr9vadbqjmd8d8ck6hlmr0dqg20vpa8cqfdflqkzqf208"; + sha256 = "1iyp2fd6j75cn1xvcwl2lxr8qpjxssy2360cyqn6g3kzd1fzdyxw"; }; - propagatedBuildInputs = [ TextDiff ]; - patchPhase = '' sed -i "s#/usr/include/tidyp#${pkgs.tidyp}/include/tidyp#" Makefile.PL sed -i "s#/usr/lib#${pkgs.tidyp}/lib#" Makefile.PL ''; + buildInputs = [ TestException ]; }; HTMLTiny = buildPerlPackage rec { @@ -6844,24 +7260,23 @@ let self = _self // overrides; _self = with self; { }; }; - HTMLTokeParserSimple = buildPerlPackage rec { + HTMLTokeParserSimple = buildPerlModule rec { name = "HTML-TokeParser-Simple-3.16"; src = fetchurl { url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd"; }; - propagatedBuildInputs = [HTMLParser SubOverride]; - buildInputs = [TestPod]; + propagatedBuildInputs = [ HTMLParser SubOverride ]; }; HTMLTree = buildPerlModule { - name = "HTML-Tree-5.03"; + name = "HTML-Tree-5.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CJ/CJM/HTML-Tree-5.03.tar.gz; - sha256 = "13qlqbpixw470gnck0xgny8hyjj576m8y24bba2p9ai2lvy76vbx"; + url = mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz; + sha256 = "1gyvm4qlwm9y6hczkpnrdfl303ggbybr0nqxdjw09hii8yw4sdzh"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ HTMLParser HTMLTagset ]; + propagatedBuildInputs = [ HTMLParser ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Work with HTML in a DOM-like tree structure"; @@ -6891,11 +7306,8 @@ let self = _self // overrides; _self = with self; { sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy"; }; doCheck = false; - propagatedBuildInputs = [ - TestNoWarnings ClassAccessor ClassAccessorChained - ClassDataAccessor ModulePluggableFast HTMLTree - HTMLScrubber EmailValid DateCalc - ]; + propagatedBuildInputs = [ ClassAccessorChained ClassDataAccessor DateCalc EmailValid HTMLScrubber HTMLTree ModulePluggableFast ]; + buildInputs = [ TestNoWarnings ]; }; HTTPBody = buildPerlPackage rec { @@ -6904,7 +7316,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz"; sha256 = "fc0d2c585b3bd1532d92609965d589e0c87cd380e7cca42fb9ad0a1311227297"; }; - buildInputs = [ HTTPMessage TestDeep ]; + buildInputs = [ TestDeep ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; @@ -6913,12 +7325,12 @@ let self = _self // overrides; _self = with self; { }; HTTPCookies = buildPerlPackage { - name = "HTTP-Cookies-6.01"; + name = "HTTP-Cookies-6.04"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Cookies-6.01.tar.gz; - sha256 = "087bqmg22dg3vj7gssh3pcsh9y1scimkbl5h1kc8jqyfhgisvlzm"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz; + sha256 = "1m0kxcirbvbkrm2c59p1bkbvzlcdymg8fdpa7wlxijlx0xwz1iqc"; }; - propagatedBuildInputs = [ HTTPDate HTTPMessage ]; + propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP cookie jars"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6931,7 +7343,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz; sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; }; - propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; + propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6950,16 +7362,31 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPEntityParser = buildPerlModule rec { + name = "HTTP-Entity-Parser-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.21.tar.gz; + sha256 = "1n7qhyscllialds5jsk1k8x2vmfbjvisa3342as5x15hpm13wkf1"; + }; + propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; + buildInputs = [ HTTPMessage ModuleBuildTiny ]; + meta = { + description = "PSGI compliant HTTP Entity Parser"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/HTTP-Entity-Parser"; + }; + }; + HTTPDAV = buildPerlPackage rec { - name = "HTTP-DAV-0.44"; + name = "HTTP-DAV-0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OP/OPERA/${name}.tar.gz"; - sha256 = "1pp7xbfn6yr87cqy2m2kl2v5zgvmmikhl7wmaw6c5nksj4wi9xq1"; + url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz; + sha256 = "1fnw3wd9zrkxq54jqgi4iw48ndysgy73glva4129s8243pn05a86"; }; - buildInputs = [ LWP XMLDOM ]; meta = { description = "WebDAV client library."; }; + propagatedBuildInputs = [ XMLDOM ]; }; HTTPHeaderParserXS = buildPerlPackage rec { @@ -6971,12 +7398,12 @@ let self = _self // overrides; _self = with self; { }; HTTPHeadersFast = buildPerlModule rec { - name = "HTTP-Headers-Fast-0.20"; + name = "HTTP-Headers-Fast-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; - sha256 = "d2f4c9724618e74f300fc746498fb5849692ef0cfc4af47fe499c4063969e520"; + sha256 = "5e68ed8e3e67531e1d43c6a2cdfd0ee2daddf2e5b94c1a2648f3a6500a6f12d5"; }; - buildInputs = [ ModuleBuild TestRequires ]; + buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ HTTPDate ]; meta = { homepage = https://github.com/tokuhirom/HTTP-Headers-Fast; @@ -6986,19 +7413,19 @@ let self = _self // overrides; _self = with self; { }; HTTPLite = buildPerlPackage rec { - name = "HTTP-Lite-2.43"; + name = "HTTP-Lite-2.44"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; - sha256 = "10svyy8r5ca86spz21r0k2mdy8g2slzssin4qbg101zc9kr5r65a"; + sha256 = "0z77nflj8zdcfg70kc93glq5kmd6qxn2nf7h70x4xhfg25wkvr1q"; }; - buildInputs = [ ModuleBuild ]; + buildInputs = [ CGI ]; }; HTTPMessage = buildPerlPackage rec { - name = "HTTP-Message-6.14"; + name = "HTTP-Message-6.16"; src = fetchurl { url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; - sha256 = "71aab9f10eb4b8ec6e8e3a85fc5acb46ba04db1c93eb99613b184078c5cf2ac9"; + sha256 = "46790ae127946d5cfea5a1e05c1b9f4a045a7c5094fe81f086bbf3341290ebd0"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; @@ -7009,6 +7436,19 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPMultiPartParser = buildPerlPackage rec { + name = "HTTP-MultiPartParser-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz; + sha256 = "04hbs0b1lzv2c8dqfcc9qjm5akh25fn40903is36zlalkwaxmpay"; + }; + buildInputs = [ TestDeep ]; + meta = { + description = "HTTP MultiPart Parser"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPNegotiate = buildPerlPackage { name = "HTTP-Negotiate-6.01"; src = fetchurl { @@ -7023,12 +7463,11 @@ let self = _self // overrides; _self = with self; { }; HTTPParserXS = buildPerlPackage rec { - name = "HTTP-Parser-XS-0.16"; + name = "HTTP-Parser-XS-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; - sha256 = "1sp9vllf012paslmn11b7z7fbk3hhkcp7gj59yp6qzh11xzpxlai"; + sha256 = "02d84xq1mm53c7jl33qyb7v5w4372vydp74z6qj0vc96wcrnhkkr"; }; - buildInputs = [ TestMore ]; }; HTTPProxy = buildPerlPackage rec { @@ -7037,8 +7476,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d"; }; - buildInputs = [ HTMLParser ]; - propagatedBuildInputs = [ HTTPDaemon HTTPDate HTTPMessage LWP ]; + propagatedBuildInputs = [ LWP ]; meta = { description = "A pure Perl HTTP proxy"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -7050,10 +7488,10 @@ let self = _self // overrides; _self = with self; { HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FL/FLORA/HTTP-Request-AsCGI-1.2.tar.gz; sha256 = "1smwmiarwcgq7vjdblnb6ldi2x1s5sk5p15p7xvm5byiqq3znnwl"; }; - propagatedBuildInputs = [ ClassAccessor LWP ]; + propagatedBuildInputs = [ ClassAccessor HTTPMessage ]; }; HTTPResponseEncoding = buildPerlPackage { @@ -7062,22 +7500,24 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz; sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh"; }; - propagatedBuildInputs = [ LWPUserAgent HTTPMessage ]; + propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Adds encoding() to HTTP::Response"; }; + buildInputs = [ LWP ]; }; HTTPServerSimple = buildPerlPackage { - name = "HTTP-Server-Simple-0.44"; + name = "HTTP-Server-Simple-0.52"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-0.44.tar.gz; - sha256 = "05klpfkss2a6i5ihmvcm27fyar0f2v4ispg2f49agab3va1gix6g"; + url = mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz; + sha256 = "0k6bg7k6mjixfzxdkkdrhqvaqmdhjszx0zsk8g0bimiby6j9z4yq"; }; doCheck = false; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ CGI ]; }; HTTPServerSimpleAuthen = buildPerlPackage rec { @@ -7105,6 +7545,20 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPServerSimplePSGI = buildPerlPackage rec { + name = "HTTP-Server-Simple-PSGI-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz; + sha256 = "1fhx2glycd66m4l4m1gja81ixq8nh4r5g9wjhhkrffq4af2cnz2z"; + }; + propagatedBuildInputs = [ HTTPServerSimple ]; + meta = { + description = "PSGI handler for HTTP::Server::Simple"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/HTTP-Server-Simple-PSGI"; + }; + }; + I18NCollate = buildPerlPackage { name = "I18N-Collate-1.02"; src = fetchurl { @@ -7124,12 +7578,12 @@ let self = _self // overrides; _self = with self; { if_ = self."if"; ImageInfo = buildPerlPackage rec { - name = "Image-Info-1.39"; + name = "Image-Info-1.41"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; - sha256 = "af155264667a2c22e3e2225195b8f6589329f9567e1789b7ce439ee21178713d"; + sha256 = "c546d27414686660dbc3cd8501537128c5285a8db0faf742c2dc12b9a29ba3db"; }; - propagatedBuildInputs = [ IOstringy ]; + propagatedBuildInputs = [ IOStringy ]; meta = { description = "Extract meta information from image files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -7137,13 +7591,13 @@ let self = _self // overrides; _self = with self; { }; ImageScale = buildPerlPackage rec { - name = "Image-Scale-0.13"; + name = "Image-Scale-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "5b2c92dc2dd635b488879461760cd251aa2b1feef41b64f17914a6e4bbe3e442"; + sha256 = "f09c5f0663b87738365ac2819e186b909abeb9ed85d83bc15ee76872c947cdf8"; }; - buildInputs = [ pkgs.libpng pkgs.libjpeg ]; - propagatedBuildInputs = [ TestNoWarnings pkgs.zlib ]; + buildInputs = [ pkgs.libpng pkgs.libjpeg TestNoWarnings ]; + propagatedBuildInputs = [ pkgs.zlib ]; makeMakerFlags = "--with-jpeg-includes=${pkgs.libjpeg.dev}/include --with-jpeg-libs=${pkgs.libjpeg.out}/lib --with-png-includes=${pkgs.libpng.dev}/include --with-png-libs=${pkgs.libpng.out}/lib"; meta = { description = "Fast, high-quality fixed-point image resizing"; @@ -7152,13 +7606,12 @@ let self = _self // overrides; _self = with self; { }; ImageSize = buildPerlPackage rec { - name = "Image-Size-3.232"; + name = "Image-Size-3.300"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJRAY/${name}.tar.gz"; - sha256 = "1mx065134gy75pgdldh65118bpcs6yfbqmr7bf9clwq44zslxhxc"; + sha256 = "0sq2kwdph55h4adx50fmy86brjkkv8grsw33xrhf1k9icpwb3jak"; }; - buildInputs = [ TestMore ]; - propagatedBuildInputs = [ ModuleRuntime ]; + buildInputs = [ ModuleBuild ]; meta = { description = "Read the dimensions of an image in several popular formats"; license = with stdenv.lib.licenses; [ artistic1 lgpl21Plus ]; @@ -7171,7 +7624,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz; sha256 = "15fa4hpw2rqg2iadyz10rnv99hns78wph5qlh3257a3mbfjjyyla"; }; - propagatedBuildInputs = [IOSocketSSL URIIMAP]; doCheck = false; # nondeterministic }; @@ -7189,10 +7641,10 @@ let self = _self // overrides; _self = with self; { }; ImportInto = buildPerlPackage { - name = "Import-Into-1.002004"; + name = "Import-Into-1.002005"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Import-Into-1.002004.tar.gz; - sha256 = "110hifk3cj14lxgjq2vaa2qfja21gll4lpn8vbimy0gzqadjbjyy"; + url = mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz; + sha256 = "0rq5kz7c270q33jq6hnrv3xgkvajsc62ilqq7fs40av6zfipg7mx"; }; propagatedBuildInputs = [ ModuleRuntime ]; meta = { @@ -7215,12 +7667,11 @@ let self = _self // overrides; _self = with self; { }; IOAll = buildPerlPackage { - name = "IO-All-0.60"; + name = "IO-All-0.87"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.60.tar.gz; - sha256 = "1bwsd2f5rlivcqyd7rb0ap5vrzv8s8fappi3b1v553yr5vl5pyq9"; + url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz; + sha256 = "0nsd9knlbd7if2v6zwj4q978axq0w5hk8ymp61z14a821hjivqjl"; }; - propagatedBuildInputs = [ IOString ]; meta = { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; @@ -7255,10 +7706,10 @@ let self = _self // overrides; _self = with self; { }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.070"; + name = "IO-Compress-2.074"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "3e761b833c8e55eb811a5eeab07831bb380dcdce256cc45cfe8816602a3574ff"; + sha256 = "b4bd68ce895a6578e5be96ade36449461becc328cc7ab900ae4e362380f097f2"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { @@ -7277,7 +7728,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz; sha256 = "14kz7z4xw179aya3116wxac29l4y2wmwrba087lya4v2gxdgiz4g"; }; - propagatedBuildInputs = [PerlIOviadynamic]; + propagatedBuildInputs = [ PerlIOviadynamic ]; }; IOHTML = buildPerlPackage { @@ -7293,11 +7744,22 @@ let self = _self // overrides; _self = with self; { }; }; + IOHandleUtil = buildPerlPackage rec { + name = "IO-Handle-Util-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/IO-Handle-Util-0.01.tar.gz; + sha256 = "1g7746gh3y9a9df3xb3l504czgwrrzr7lp87j7jwm2mklarrig6k"; + }; + propagatedBuildInputs = [ IOString SubExporter asa ]; + meta = { + }; + }; + IOInteractive = buildPerlPackage { - name = "IO-Interactive-0.0.6"; + name = "IO-Interactive-1.022"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-0.0.6.tar.gz; - sha256 = "9cc016cbd94b500027e137cb5070d19487e4431bf822f0cb534c38b6b2c1038c"; + url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz; + sha256 = "0ed53b8ae93ae877e98e0d89b7b429e29ccd1ee4c28e952c4ea9aa73d01febdc"; }; meta = { description = "Utilities for interactive I/O"; @@ -7308,7 +7770,7 @@ let self = _self // overrides; _self = with self; { IOLockedFile = buildPerlPackage rec { name = "IO-LockedFile-0.23"; src = fetchurl { - url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz; sha256 = "1dgq8zfkaszisdb5hz8jgcl0xc3qpv7bbv562l31xgpiddm7xnxi"; }; }; @@ -7328,14 +7790,14 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-${version}.tgz"; sha256 = "0ksldcw0hydfy9k70i6q6fm1wgbc54kx0lbwlkrszsbd7q72dlfg"; }; - propagatedBuildInputs = [pkgs.utillinux.bin]; # `more` used in tests + propagatedBuildInputs = [ pkgs.more FileWhich ]; # `more` used in tests }; - IOPrompt = buildPerlPackage { - name = "IO-Prompt-0.997002"; + IOPrompt = buildPerlModule { + name = "IO-Prompt-0.997004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997002.tar.gz; - sha256 = "08ad24f58335ce9696666e4411b2f3cd9c2e1fb72b306b6018c1a13971361ced"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz; + sha256 = "f17bb305ee6ac8b5b203e6d826eb940c4f3f6d6f4bfe719c3b3a225f46f58615"; }; propagatedBuildInputs = [ TermReadKey Want ]; doCheck = false; # needs access to /dev/tty @@ -7344,11 +7806,11 @@ let self = _self // overrides; _self = with self; { }; }; - IOSocketIP = buildPerlPackage { - name = "IO-Socket-IP-0.37"; + IOSocketIP = buildPerlModule { + name = "IO-Socket-IP-0.39"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.37.tar.gz; - sha256 = "2adc5f0b641d41f662b4d99c0795780c62f9af9119884d053265fc8858ae6f7b"; + url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.39.tar.gz; + sha256 = "11950da7636cb786efd3bfb5891da4c820975276bce43175214391e5c32b7b96"; }; meta = { description = "Family-neutral IP socket supporting both IPv4 and IPv6"; @@ -7367,12 +7829,12 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.050"; + name = "IO-Socket-SSL-2.056"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "54e6716e40df8b1c168d8f54a0b8f215313739bd99dda17adb7c00fe94656692"; + sha256 = "91451ecc28b243a78b438f0a42db24c4b60a86f088879b38e40bdbd697818259"; }; - propagatedBuildInputs = [ NetSSLeay URI ]; + propagatedBuildInputs = [ NetSSLeay ]; # Fix path to default certificate store. postPatch = '' substituteInPlace lib/IO/Socket/SSL.pm \ @@ -7386,13 +7848,13 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to connect to facebook.com etc. }; - IOSocketTimeout = buildPerlPackage rec { + IOSocketTimeout = buildPerlModule rec { name = "IO-Socket-Timeout-0.32"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; sha256 = "edf915d6cc66bee43503aa6dc2b373366f38eaff701582183dad10cb8adf2972"; }; - buildInputs = [ ModuleBuildTiny TestTCP ]; + buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; propagatedBuildInputs = [ PerlIOviaTimeout ]; meta = { description = "IO::Socket with read/write timeout"; @@ -7412,26 +7874,26 @@ let self = _self // overrides; _self = with self; { IOstringy = pkgs.perlPackages.IOStringy; IOStringy = buildPerlPackage rec { - name = "IO-stringy-2.110"; + name = "IO-stringy-2.111"; src = fetchurl { url = "mirror://cpan/authors/id/D/DS/DSKOLL/${name}.tar.gz"; - sha256 = "1vh4n0k22hx20rwvf6h7lp25wb7spg0089shrf92d2lkncwg8g3y"; + sha256 = "178rpx0ym5l2m9mdmpnr92ziscvchm541w94fd7ygi6311kgsrwc"; }; }; IOTee = buildPerlPackage rec { - name = "IO-Tee-0.64"; + name = "IO-Tee-0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KE/KENSHAN/${name}.tar.gz"; - sha256 = "1mjy6hmwrzipzxcm33qs7ja89ljk6zkk499wclw16lfkqaqpdliy"; + url = mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz; + sha256 = "04hc94fk6qlazrarcznw2d8wiqw289js4za0czw65296kc8csgf6"; }; }; IOTieCombine = buildPerlPackage { - name = "IO-TieCombine-1.004"; + name = "IO-TieCombine-1.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.004.tar.gz; - sha256 = "0awyyjdbjjawdkzs08rfjhfkkm7pni523x3ddmq9ixa82ibnn430"; + url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz; + sha256 = "1bv9ampayf4bvyxg4ivy18l8k79jvq55x6gl68b2fg8b62w4sba0"; }; meta = { homepage = https://github.com/rjbs/io-tiecombine; @@ -7477,10 +7939,10 @@ let self = _self // overrides; _self = with self; { IPCRun = buildPerlPackage { - name = "IPC-Run-0.92"; + name = "IPC-Run-0.98"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.92.tar.gz; - sha256 = "1lj6kmr8rs6na77b3v673vvw6qsr511bmhgf257x4xqmvxnv91p1"; + url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.98.tar.gz; + sha256 = "018r6jb8h0danyd3g8k03ziaf4w2d31qi9x876gn21js8l232spl"; }; doCheck = false; /* attempts a network connection to localhost */ meta = { @@ -7489,6 +7951,8 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; + propagatedBuildInputs = [ IOTty ]; + buildInputs = [ Readonly ]; }; IPCRun3 = buildPerlPackage rec { @@ -7502,7 +7966,7 @@ let self = _self // overrides; _self = with self; { IPCShareLite = buildPerlPackage rec { name = "IPC-ShareLite-0.17"; src = fetchurl { - url = "mirror://cpan/modules/by-module/IPC/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz; sha256 = "1gz7dbwxrzbzdsjv11kb49jlf9q6lci2va6is0hnavd93nwhdm0l"; }; }; @@ -7520,10 +7984,10 @@ let self = _self // overrides; _self = with self; { }; IPCSysV = buildPerlPackage { - name = "IPC-SysV-2.04"; + name = "IPC-SysV-2.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.04.tar.gz; - sha256 = "93248930e667034899bf2b09b9a23348e2b800a5437fbb9b4f34c37316da3fcc"; + url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz; + sha256 = "d01a367af771d35e3b11a21366ad6405f8d28e8cbca4c0cf08ab78bf157d052d"; }; meta = { description = "System V IPC constants and system calls"; @@ -7570,7 +8034,6 @@ let self = _self // overrides; _self = with self; { sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6"; }; buildInputs = [ TestWarn ]; - propagatedBuildInputs = [ ParseRecDescent ]; meta = { homepage = https://github.com/ingydotnet/inline-pm; description = "Write Perl Subroutines in Other Programming Languages"; @@ -7605,11 +8068,11 @@ let self = _self // overrides; _self = with self; { }; InlineJava = buildPerlPackage rec { - name = "Inline-Java-0.52"; + name = "Inline-Java-0.53"; src = fetchurl { url = "mirror://cpan/authors/id/P/PA/PATL/${name}.tar.gz"; - sha256 = "0xdx1nnjvsih2njcncmwxwdi3w2zf74vqb9wpn1va8ii93mlakff"; + sha256 = "1d9hq09nv3l6m015ws08b3gbfp8daxryqr7p0yi0xhqr44j9qcj8"; }; propagatedBuildInputs = [ Inline ]; @@ -7644,19 +8107,31 @@ let self = _self // overrides; _self = with self; { }; }; - JavaScriptMinifierXS = buildPerlPackage rec { + JavaScriptMinifierXS = buildPerlModule rec { name = "JavaScript-Minifier-XS-0.11"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; + url = mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; }; - propagatedBuildInputs = [ ]; meta = { description = "XS based JavaScript minifier"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; + JavaScriptValueEscape = buildPerlModule rec { + name = "JavaScript-Value-Escape-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz; + sha256 = "1p5365lvnax8kbcfrj169lx05af3i3qi5wg5x9mizqgd10vxmjws"; + }; + meta = { + description = "Avoid XSS with JavaScript value interpolation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/JavaScript-Value-Escape"; + }; + }; + JSON = buildPerlPackage { name = "JSON-2.90"; @@ -7671,34 +8146,32 @@ let self = _self // overrides; _self = with self; { postConfigure = '' cp lib/JSON/backportPP.pm{orig,} ''; - buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; JSONAny = buildPerlPackage { - name = "JSON-Any-1.29"; + name = "JSON-Any-1.39"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/JSON-Any-1.29.tar.gz; - sha256 = "15v2j9dh58r7r4s7rnnmgnzzbyz61bhyxwpx1z7r811ixs9bkks2"; + url = mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz; + sha256 = "1hspg6khjb38syn59cysnapc1q77qgavfym3fqr6l2kiydf7ajdf"; }; - propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; JSONMaybeXS = buildPerlPackage rec { - name = "JSON-MaybeXS-1.003005"; + name = "JSON-MaybeXS-1.003010"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "02n8dkj3qpzikkqyki8gvdk1pfdqrs9qcrdr96fla42gar5nkd5x"; + url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.003010.tar.gz; + sha256 = "0hs504x5zsa2vl6r7b3rvbygsak1ly24m1lg636bqp3x7jirmb30"; }; - buildInputs = [ TestWithoutModule ]; - propagatedBuildInputs = [ JSONPP ]; meta = { description = "Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -7706,10 +8179,10 @@ let self = _self // overrides; _self = with self; { }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-2.27203"; + name = "JSON-PP-2.97001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27203.tar.gz; - sha256 = "0ljwya1fb4969pckcq2j1g6axgx8qh9yscxbs6qf62qxf8wkj1mp"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-2.97001.tar.gz; + sha256 = "1d1731yqv2py039qxcr0j9r4jb8m9kq387pj1q6gxawbfwvlmxb7"; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -7745,16 +8218,17 @@ let self = _self // overrides; _self = with self; { }; JSONXS = buildPerlPackage { - name = "JSON-XS-2.34"; + name = "JSON-XS-3.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.34.tar.gz; - sha256 = "1sh0i73skxp3rvd9w8phxqncw9m1r5ibnb9qxxm21bmrfwkxybx6"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz; + sha256 = "0b3w14zqjxnm93jjfzjqz8pkxp3a2l9242y7zxxhnvzav1mq7n35"; }; - propagatedBuildInputs = [ commonsense ]; + propagatedBuildInputs = [ TypesSerialiser ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; + buildInputs = [ CanaryStability ]; }; JSONXSVersionOneAndTwo = buildPerlPackage rec { @@ -7770,11 +8244,11 @@ let self = _self // overrides; _self = with self; { }; Later = buildPerlPackage rec { - version = "0.19"; + version = "0.21"; name = "Object-Realize-Later-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "0ka0qar51kk5wlvd2s3yis3w9qc14h0ngn0ds0v6c8ssmjvfcgbz"; + sha256 = "1nfqssld7pcdw9sj4mkfnh75w51wl14i1h7npj9fld4fri09cywg"; }; }; @@ -7797,7 +8271,7 @@ let self = _self // overrides; _self = with self; { sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; }; outputs = [ "out" ]; - buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ]; + buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; propagatedBuildInputs = [ mod_perl2 ]; makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config"; preConfigure = '' @@ -7823,10 +8297,10 @@ let self = _self // overrides; _self = with self; { libintlperl = pkgs.perlPackages.libintl_perl; libintl_perl = buildPerlPackage rec { - name = "libintl-perl-1.23"; + name = "libintl-perl-1.29"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz; - sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0"; + url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.29.tar.gz; + sha256 = "1cgvrgh4axd8jlr6497ndgphgvgnqc1axd306460hskdvc85z4vq"; }; meta = { maintainers = with maintainers; [ ]; @@ -7846,20 +8320,33 @@ let self = _self // overrides; _self = with self; { }; }; + librelative = buildPerlPackage rec { + name = "lib-relative-0.002"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-0.002.tar.gz; + sha256 = "1i51qa22lgm1gpakn1vy4sf574fsmz141dx90i6pq84w9hc9xbry"; + }; + meta = { + description = "Add paths relative to the current file to @INC"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "https://github.com/Grinnz/lib-relative"; + }; + }; + libxml_perl = buildPerlPackage rec { name = "libxml-perl-0.08"; src = fetchurl { url = "mirror://cpan/authors/id/K/KM/KMACLEOD/${name}.tar.gz"; sha256 = "1jy9af0ljyzj7wakqli0437zb2vrbplqj4xhab7bfj2xgfdhawa5"; }; - propagatedBuildInputs = [XMLParser]; + propagatedBuildInputs = [ XMLParser ]; }; LinguaENFindNumber = buildPerlPackage { - name = "Lingua-EN-FindNumber-1.31"; + name = "Lingua-EN-FindNumber-1.32"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.31.tar.gz; - sha256 = "f67f4d4983bd29da5cbbff3cb18dd70788692b35e2dabcd4c65bef1cd2bf658f"; + url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.32.tar.gz; + sha256 = "1d176d1c863fb9844bd19d2c2a4e68a0ed73da158f724a89405b90db7e8dbd04"; }; propagatedBuildInputs = [ LinguaENWords2Nums ]; meta = { @@ -7870,10 +8357,10 @@ let self = _self // overrides; _self = with self; { }; LinguaENInflect = buildPerlPackage rec { - name = "Lingua-EN-Inflect-1.899"; + name = "Lingua-EN-Inflect-1.903"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; - sha256 = "1599a93020a2fdc0de8db14eea721df8fd772f78dedaf81081081fc93aa6a257"; + sha256 = "fcef4b67b04cc39e427b2d70e7c5b24195edd0ed88dd705a08ecd5cd830b0d49"; }; meta = { description = "Convert singular to plural. Select 'a' or 'an'"; @@ -7896,13 +8383,13 @@ let self = _self // overrides; _self = with self; { }; LinguaENInflectPhrase = buildPerlPackage rec { - name = "Lingua-EN-Inflect-Phrase-0.18"; + name = "Lingua-EN-Inflect-Phrase-0.20"; src = fetchurl { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "290a5b8fc2be28d6d479517655027a90e944476cb3552f10cbf6db37af79f9a6"; + sha256 = "55058911a99f1755de3eb449a99ffbeb92d88c01ff5dc60511a24679050ddea8"; }; buildInputs = [ TestNoWarnings ]; - propagatedBuildInputs = [ LinguaENFindNumber LinguaENInflect LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ]; + propagatedBuildInputs = [ LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ]; meta = { homepage = https://metacpan.org/release/Lingua-EN-Inflect-Phrase; description = "Inflect short English Phrases"; @@ -7926,12 +8413,12 @@ let self = _self // overrides; _self = with self; { }; LinguaENTagger = buildPerlPackage { - name = "Lingua-EN-Tagger-0.24"; + name = "Lingua-EN-Tagger-0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.24.tar.gz; - sha256 = "0qksqh1zi8fz76a29s2ll4g6yr8y6agmzgq7ngccvgj3gza5q241"; + url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.28.tar.gz; + sha256 = "1rm223d871s150dgnhbar71w56bim950cp45f0904w6px5fifcqa"; }; - propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ]; + propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; meta = { description = "Part-of-speech tagger for English natural language processing"; license = stdenv.lib.licenses.gpl3; @@ -7950,25 +8437,82 @@ let self = _self // overrides; _self = with self; { }; }; - LinguaStem = buildPerlPackage rec { + LinguaPTStemmer = buildPerlPackage rec { + name = "Lingua-PT-Stemmer-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz; + sha256 = "17c48sfbgwd2ivlgf59sr6jdhwa3aim8750f8pyzz7xpi8gz0var"; + }; + meta = { + description = "Portuguese language stemming"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Lingua-PT-Stemmer"; + }; + }; + + LinguaStem = buildPerlModule rec { name = "Lingua-Stem-0.84"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz; sha256 = "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"; }; doCheck = false; + propagatedBuildInputs = [ LinguaPTStemmer LinguaStemFr LinguaStemIt LinguaStemRu LinguaStemSnowballDa SnowballNorwegian SnowballSwedish TextGerman ]; + }; + + LinguaStemFr = buildPerlPackage rec { + name = "Lingua-Stem-Fr-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz; + sha256 = "0vyrspwzaqjxm5mqshf4wvwa3938mkajd1918d9ii2l9m2rn8kwx"; + }; + meta = { + }; + }; + + LinguaStemIt = buildPerlPackage rec { + name = "Lingua-Stem-It-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz; + sha256 = "1207r183s5hlh4mfwa6p46vzm0dhvrs2dnss5s41a0gyfkxp7riq"; + }; + meta = { + }; + }; + + LinguaStemRu = buildPerlPackage rec { + name = "Lingua-Stem-Ru-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz; + sha256 = "0a2jmdz7jn32qj5hyiw5kbv8fvlpmws8i00a6xcbkzb48yvwww0j"; + }; + meta = { + description = "Porter's stemming algorithm for Russian (KOI8-R only)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Lingua-Stem-Ru"; + }; + }; + + LinguaStemSnowballDa = buildPerlPackage rec { + name = "Lingua-Stem-Snowball-Da-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz; + sha256 = "0mm0m7glm1s6i9f6a78jslw6wh573208arxhq93yriqmw17bwf9f"; + }; + meta = { + }; }; LinguaTranslit = buildPerlPackage rec { - name = "Lingua-Translit-0.26"; + name = "Lingua-Translit-0.28"; src = fetchurl { url = "mirror://cpan/authors/id/A/AL/ALINKE/${name}.tar.gz"; - sha256 = "2430b5c84927f15570533eb68c56958c580f16044fc413d48bf44f0460422598"; + sha256 = "113f91d8fc2c630437153a49fb7a52b023af8f6278ed96c070b1f60824b8eae1"; }; doCheck = false; }; - LinuxDistribution = buildPerlPackage { + LinuxDistribution = buildPerlModule { name = "Linux-Distribution-0.23"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz; @@ -7986,20 +8530,19 @@ let self = _self // overrides; _self = with self; { LinuxInotify2 = buildPerlPackage rec { name = "Linux-Inotify2-1.22"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Linux/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-1.22.tar.gz; sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw"; }; propagatedBuildInputs = [ commonsense ]; }; ListAllUtils = buildPerlPackage { - name = "List-AllUtils-0.09"; + name = "List-AllUtils-0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.09.tar.gz; - sha256 = "4cfe6359cc6c9f4ba0d178e223f4b468d3cf7768d645334962f05de069bdaee2"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz; + sha256 = "e45aa65927ae1975a000cc2fed14274627fa5e2bd09bab826a5f2c41d17ef6cd"; }; - buildInputs = [ TestWarnings ]; - propagatedBuildInputs = [ ListMoreUtils ]; + propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ScalarListUtils ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8017,27 +8560,42 @@ let self = _self // overrides; _self = with self; { }; ListMoreUtils = buildPerlPackage rec { - name = "List-MoreUtils-0.413"; + name = "List-MoreUtils-0.428"; src = fetchurl { url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; - sha256 = "4d6429d5672ce74a59d6490320252cb8b5b8285db8fe9c6551a4162e5375ef37"; + sha256 = "713e0945d5f16e62d81d5f3da2b6a7b14a4ce439f6d3a7de74df1fd166476cc2"; }; - propagatedBuildInputs = [ ExporterTiny ]; + propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ]; meta = { homepage = https://metacpan.org/release/List-MoreUtils; description = "Provide the stuff missing in List::Util"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestLeakTrace ]; + }; + + ListMoreUtilsXS = buildPerlPackage rec { + name = "List-MoreUtils-XS-0.428"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz; + sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; + }; + propagatedBuildInputs = [ XSLoader ]; + meta = { + description = "Provide the stuff missing in List::Util in XS"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "https://metacpan.org/release/List-MoreUtils-XS"; + }; }; ListSomeUtils = buildPerlPackage rec { - name = "List-SomeUtils-0.52"; + name = "List-SomeUtils-0.56"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1e8c900332ac08c314b78ca1b0d23aba28c146b6133606a817d828d5bd0485ac"; + sha256 = "eaa7d99ce86380c0389876474c8eb84acc0a6bfeef1b0fc23a292592de6f89f7"; }; buildInputs = [ TestLeakTrace ]; - propagatedBuildInputs = [ ExporterTiny ModuleImplementation ]; + propagatedBuildInputs = [ ModuleImplementation ]; meta = { homepage = https://metacpan.org/release/List-SomeUtils; description = "Provide the stuff missing in List::Util"; @@ -8045,11 +8603,11 @@ let self = _self // overrides; _self = with self; { }; }; - ListUtilsBy = buildPerlPackage rec { - name = "List-UtilsBy-0.09"; + ListUtilsBy = buildPerlModule rec { + name = "List-UtilsBy-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz; - sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1"; + url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz; + sha256 = "0nkpylkqccxanr8wc7j9wg6jdrizybjjd6p8q3jbh7f29cxz9pgs"; }; meta = { maintainers = with maintainers; [ ]; @@ -8058,10 +8616,10 @@ let self = _self // overrides; _self = with self; { }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.35"; + name = "Locale-Codes-3.56"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.35.tar.gz; - sha256 = "b1a2f944b03972d2b7282767cf88100e3c0d7daa3f4ca7aef8460c1c5e246480"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.56.tar.gz; + sha256 = "d82f3340ecb7f8700493df0273dede0c049fbc44c2fe1e811fc6c5a79b79ae79"; }; meta = { description = "A distribution of modules to handle locale codes"; @@ -8070,21 +8628,34 @@ let self = _self // overrides; _self = with self; { }; LocaleGettext = buildPerlPackage { - name = "LocaleGettext-1.05"; - buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext; - NIX_CFLAGS_LINK = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) "-lintl"; + name = "gettext-1.07"; + buildInputs = [ pkgs.gettext ]; src = fetchurl { - url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; - sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; + url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz; + sha256 = "05cwqjxxary11di03gg3fm6j9lbvg1dr2wpr311c1rwp8salg7ch"; }; LANG="C"; }; + LocaleMOFile = buildPerlPackage rec { + name = "Locale-MO-File-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.08.tar.gz; + sha256 = "1flpk7jdn5cp7pld3f0vi3v5527p76jp1fqp4pzrhhqjlhyp3im4"; + }; + propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestHexDifferences TestNoWarnings ]; + meta = { + description = "Locale::MO::File - Write or read gettext MO files."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LocaleMaketext = buildPerlPackage { - name = "Locale-Maketext-1.23"; + name = "Locale-Maketext-1.28"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.23.tar.gz; - sha256 = "1r1sq7djafvk5abzc4l068p39dz44hlpgdldj3igvn2bjz78cli1"; + url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.28.tar.gz; + sha256 = "1sgpcnh9kqdnsizpwxzsyfv44id7gxsgkd9bmnhmj4g8hfs9712p"; }; }; @@ -8134,10 +8705,10 @@ let self = _self // overrides; _self = with self; { }; LocalePO = buildPerlPackage { - name = "Locale-PO-0.23"; + name = "Locale-PO-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.23.tar.gz; - sha256 = "52e5fdc88ec4eb00512418a938dc5089476ea66c9e744fee3c6bbfdf17a0d302"; + url = mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz; + sha256 = "3c994a4b63e6e4e836c6f79a93f51921cab77c90c9753fe0f8b5429220d516b9"; }; propagatedBuildInputs = [ FileSlurp ]; meta = { @@ -8148,16 +8719,87 @@ let self = _self // overrides; _self = with self; { }; }; + LocaleTextDomainOO = buildPerlPackage rec { + name = "Locale-TextDomain-OO-1.033"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.033.tar.gz; + sha256 = "1nkjncwa5kg7avrly0ldfxijgkrjgwj3rggb2r6mi72h427xwjic"; + }; + propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::TextDomain::OO - Perl OO Interface to Uniforum Message Translation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleTextDomainOOUtil = buildPerlPackage rec { + name = "Locale-TextDomain-OO-Util-3.008"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-3.008.tar.gz; + sha256 = "1kj633apv20ah5nazjlig4w25l021lvmlb6a6fhwrixis08mdqxb"; + }; + propagatedBuildInputs = [ namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::TextDomain::OO::Util - Lexicon utils"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleUtilsPlaceholderBabelFish = buildPerlPackage rec { + name = "Locale-Utils-PlaceholderBabelFish-0.006"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz; + sha256 = "1k54njj8xz19c8bjb0iln1mnfq55j3pvbff7samyrab3k59h071f"; + }; + propagatedBuildInputs = [ HTMLParser MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderBabelFish - Utils to expand BabelFish palaceholders"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleUtilsPlaceholderMaketext = buildPerlPackage rec { + name = "Locale-Utils-PlaceholderMaketext-1.005"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz; + sha256 = "1srlbp8sfnzhndgh9s4d8bglpzw0vb8gnab9r8r8sggkv15n0a2h"; + }; + propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderMaketext - Utils to expand maketext placeholders"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleUtilsPlaceholderNamed = buildPerlPackage rec { + name = "Locale-Utils-PlaceholderNamed-1.004"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz; + sha256 = "1gd68lm5w5c6ndcilx91rn84zviqyrk3fx92jjx5khxm76i8xmvg"; + }; + propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderNamed - Utils to expand named placeholders"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + locallib = buildPerlPackage rec { - name = "local-lib-2.000019"; + name = "local-lib-2.000024"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "008b9kgvcs9vjvj7ifg0f1s7i7446ff2441c575vhrwn15x35b9n"; + sha256 = "01cav7m6qc1x96wna1viiw6n212f94ks7cik4vj1a1lasixr36rf"; }; meta = { description = "Create and use a local lib/ for perl modules with PERL5LIB"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ ModuleBuild ]; }; LockFileSimple = buildPerlPackage rec { @@ -8200,27 +8842,27 @@ let self = _self // overrides; _self = with self; { }; LogDispatch = buildPerlPackage { - name = "Log-Dispatch-2.41"; + name = "Log-Dispatch-2.67"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.41.tar.gz; - sha256 = "0vsmlkx2g9lc13pl9v96kn575yszfvd79a236b8v0s1di83gm09z"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.67.tar.gz; + sha256 = "017ks3i0k005dqz7fz53w7x35csqqlr4vfb95c0ijdablajs4kd9"; }; - propagatedBuildInputs = [ ClassLoad ParamsValidate ]; + propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Dispatches messages to one or more outputs"; license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ IPCRun3 TestFatal TestNeeds ]; }; - LogHandler = buildPerlPackage rec { + LogHandler = buildPerlModule rec { name = "Log-Handler-0.88"; src = fetchurl { url = "mirror://cpan/authors/id/B/BL/BLOONIX/${name}.tar.gz"; sha256 = "45bf540ab2138ed3ff93afc205b0516dc75755b86acdcc5e75c41347833c293d"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ ParamsValidate ]; meta = { description = "Log messages to several outputs"; @@ -8235,21 +8877,46 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz; sha256 = "bd697dd62aaf26d118e9f0a0813429deb1c544e4501559879b61fcbdfe99fe46"; }; - propagatedBuildInputs = [ if_ ]; meta = { description = "Powerful and flexible message logging mechanism"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; + LogMessageSimple = buildPerlPackage rec { + name = "Log-Message-Simple-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz; + sha256 = "15nxi935nfrf8dkdrgvcrf2qlai4pbz03yj8sja0n9mcq2jd24ma"; + }; + propagatedBuildInputs = [ LogMessage ]; + meta = { + description = "Simplified interface to Log::Message"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LogTrace = buildPerlPackage rec { name = "Log-Trace-1.070"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Log/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BB/BBC/Log-Trace-1.070.tar.gz; sha256 = "1qrnxn9b05cqyw1286djllnj8wzys10754glxx6z5hihxxc85jwy"; }; }; + MCE = buildPerlPackage rec { + name = "MCE-1.835"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.835.tar.gz; + sha256 = "1dxs7gvj97vr1ns74k3inix1i80d8b2j942crnapdx9j90j6cqvi"; + }; + meta = { + description = "Many-Core Engine for Perl providing parallel processing capabilities"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/marioroy/mce-perl"; + }; + }; + LogLog4perl = buildPerlPackage rec { name = "Log-Log4perl-1.49"; src = fetchurl { @@ -8283,13 +8950,13 @@ let self = _self // overrides; _self = with self; { }; LogDispatchouli = buildPerlPackage rec { - name = "Log-Dispatchouli-2.012"; + name = "Log-Dispatchouli-2.016"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "214eca0fe77f2dc74675f9aa542778d5d4618c5bf12283540ca1062fcb967fa0"; + sha256 = "7f2a1a1854fd1e4ed02883bc21f5395f4244a266b661276b438d1bdd50bdacf7"; }; buildInputs = [ TestDeep TestFatal ]; - propagatedBuildInputs = [ LogDispatch LogDispatchArray ParamsUtil StringFlogger SubExporter SubExporterGlobExporter TryTiny ]; + propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; meta = { homepage = https://github.com/rjbs/Log-Dispatchouli; description = "A simple wrapper around Log::Dispatch"; @@ -8311,17 +8978,18 @@ let self = _self // overrides; _self = with self; { }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.15"; + name = "libwww-perl-6.33"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322"; + url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.33.tar.gz; + sha256 = "97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99"; }; - propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ]; + propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; meta = with stdenv.lib; { description = "The World-Wide Web library for Perl"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; }; + buildInputs = [ TestFatal TestRequiresInternet ]; }; LWPAuthenOAuth = buildPerlPackage rec { @@ -8330,7 +8998,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TI/TIMBRODY/${name}.tar.gz"; sha256 = "e78e0bd7de8002cfb4760073258d555ef55b2c27c07a94b3d8a2166a17fd96bc"; }; - propagatedBuildInputs = [ LWP URI ]; + propagatedBuildInputs = [ LWP ]; meta = { description = "Generate signed OAuth requests"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8358,7 +9026,7 @@ let self = _self // overrides; _self = with self; { sha256 = "9f252394775e23aa42c3176611e5930638ab528d5190110b4731aa5b0bf35a15"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ HTTPMessage IOSocketSSL LWP LWPProtocolhttps URI ]; + propagatedBuildInputs = [ LWPProtocolHttps ]; meta = { description = "Provides HTTP/CONNECT proxy support for LWP::UserAgent"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8368,28 +9036,42 @@ let self = _self // overrides; _self = with self; { LWPProtocolhttps = pkgs.perlPackages.LWPProtocolHttps; LWPProtocolHttps = buildPerlPackage rec { - name = "LWP-Protocol-https-6.04"; + name = "LWP-Protocol-https-6.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz; - sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy"; + url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz; + sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; - propagatedBuildInputs = [ LWP IOSocketSSL ]; + propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ]; doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; + buildInputs = [ TestRequiresInternet ]; + }; + + LWPProtocolhttp10 = buildPerlPackage rec { + name = "LWP-Protocol-http10-6.03"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz; + sha256 = "1lxq40qfwfai9ryhzhsdnycc4189c8kfl43rf7qq34fmz48skzzk"; + }; + propagatedBuildInputs = [ LWP ]; + meta = { + description = "Legacy HTTP/1.0 support for LWP"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LWPUserAgent = LWP; LWPUserAgentDetermined = buildPerlPackage { - name = "LWP-UserAgent-Determined-1.06"; + name = "LWP-UserAgent-Determined-1.07"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/LWP-UserAgent-Determined-1.06.tar.gz; - sha256 = "c31d8e16dc92e2113c81cdbfb11149cfd19039e789f77cd34333ac9184346fc5"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz; + sha256 = "06d8d50e8cd3692a11cb4fb44a2f84e5476a98f0e2e6a4a0dfce9f67e55ddb53"; }; propagatedBuildInputs = [ LWP ]; meta = { @@ -8398,13 +9080,13 @@ let self = _self // overrides; _self = with self; { }; }; - LWPUserAgentMockable = buildPerlPackage { - name = "LWP-UserAgent-Mockable-1.10"; + LWPUserAgentMockable = buildPerlModule { + name = "LWP-UserAgent-Mockable-1.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MM/MMORGAN/LWP-UserAgent-Mockable-1.10.tgz; - sha256 = "1z89jszgifvjb8irzd8wrzim7l5m4hypdl9mj4dpkb4jm4189kmn"; + url = mirror://cpan/authors/id/M/MJ/MJEMMESON/LWP-UserAgent-Mockable-1.18.tar.gz; + sha256 = "0923ahl22c0gdzrihj7dqnrawia9hmcl462asf4ry8d5wd84z1i5"; }; - propagatedBuildInputs = [ LWP HookLexWrap ]; + propagatedBuildInputs = [ HookLexWrap LWP SafeIsa ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -8413,13 +9095,14 @@ let self = _self // overrides; _self = with self; { # https://rt.cpan.org/Public/Bug/Display.html?id=63966 is the bug upstream, # which doesn't look like it will get fixed anytime soon. doCheck = false; + buildInputs = [ ModuleBuildTiny TestRequiresInternet ]; }; LWPxParanoidAgent = buildPerlPackage rec { - name = "LWPx-ParanoidAgent-1.10"; + name = "LWPx-ParanoidAgent-1.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/${name}.tar.gz"; - sha256 = "0i306p7mdqx09qfsf6b3rnn5xw9v9r3md4swlbk9z0mskjl0l4w4"; + sha256 = "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c"; }; doCheck = false; # 3 tests fail, probably because they try to connect to the network propagatedBuildInputs = [ LWP NetDNS ]; @@ -8453,24 +9136,16 @@ let self = _self // overrides; _self = with self; { }; MailBox = buildPerlPackage rec { - version = "2.118"; + version = "3.005"; name = "Mail-Box-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "1ixi7xpvj8kn2y0l8rxkvdnnl7x5wqg7mi2av0viwdh5l828dcfc"; + sha256 = "103v5jiv5mlckss1yardjvil506sx60f3g2ph2kgx9x6sy1sd93m"; }; doCheck = false; - propagatedBuildInputs = [ - Later - - DevelGlobalDestruction - FileRemove - IOStringy - MailTools - MIMETypes - ]; + propagatedBuildInputs = [ DevelGlobalDestruction FileRemove Later MailTransport ]; }; MailMboxMessageParser = buildPerlPackage rec { @@ -8489,23 +9164,37 @@ let self = _self // overrides; _self = with self; { }; }; + MailMessage = buildPerlPackage rec { + name = "Mail-Message-3.006"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.006.tar.gz; + sha256 = "08bdf06bmxdqbslk3k9av542pjhyw9wx10j79fxz0dwpalimc6zi"; + }; + propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; + meta = { + description = "Processing MIME messages"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MailDKIM = buildPerlPackage rec { - name = "Mail-DKIM-0.40"; + name = "Mail-DKIM-0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz"; - sha256 = "1wd6mab4fp47v1nh85jfxsjmysnyv5mwvfv47cn5m2h2lb1s0piw"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.52.tar.gz; + sha256 = "1dbczg7vyvvm12d9gbiqd9a24qg4254cz7bh7yf3p27i58hhpbwy"; }; - propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ]; + propagatedBuildInputs = [ CryptOpenSSLRSA MailTools NetDNSResolverMock YAMLLibYAML ]; doCheck = false; # tries to access the domain name system + buildInputs = [ TestRequiresInternet ]; }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.35"; + name = "Mail-IMAPClient-3.39"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.35.tar.gz; - sha256 = "0qzn8370cr91jnq1kawy6v16bcz49pch6inmw85rhzg87j1h6ica"; + url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.39.tar.gz; + sha256 = "18sf8fd093qxvflscysm6pv6mj9cmm19zrnfic297jjvgnsgshdm"; }; - buildInputs = [ParseRecDescent]; + propagatedBuildInputs = [ ParseRecDescent ]; }; MailPOP3Client = buildPerlPackage rec { @@ -8534,7 +9223,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NE/NEILB/Mail-Sendmail-0.80.tar.gz"; sha256 = "1r38qbkj7jwj8cqy1rnqzkk81psxi08b1aiq392817f3bk5ri2jv"; }; - propagatedBuildInputs = [ DigestMD5 MIMEBase64 Socket TimeLocal ]; # The test suite simply loads the module and attempts to send an email to # the module's author, the latter of which is a) more of an integration # test, b) impossible to verify, and c) won't work from a sandbox. Replace @@ -8572,10 +9260,10 @@ let self = _self // overrides; _self = with self; { MailTools = buildPerlPackage rec { - name = "MailTools-2.14"; + name = "MailTools-2.20"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "1y6zndb4rsn8i65g1bg3b0zb7966cz83q19zg7m7bvxjfkv7wz2b"; + sha256 = "15iizg2x1w7ca0r8rn3wwhp7w160ljvf55prspljwd6cm7vhcmpm"; }; propagatedBuildInputs = [ TimeDate ]; meta = { @@ -8585,10 +9273,23 @@ let self = _self // overrides; _self = with self; { }; }; + MailTransport = buildPerlPackage rec { + name = "Mail-Transport-3.002"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.002.tar.gz; + sha256 = "0wm4j9w15nsvjxi9x22fn2rnljbffd88v27p0z0305bfg35gh4kg"; + }; + propagatedBuildInputs = [ MailMessage ]; + meta = { + description = "Email message exchange"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MathLibm = buildPerlPackage rec { name = "Math-Libm-1.00"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz; sha256 = "0xn2a950mzzs5q1c4q98ckysn9dz20x7r35g02zvk35chgr0klxz"; }; }; @@ -8606,10 +9307,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999806"; + name = "Math-BigInt-1.999811"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "9b62b2fcfeed5ef42d375778e4ec3b469cab0002b5dc247906dc99f5786fa1fc"; + sha256 = "d4bfa5ad0127b6360ad29971da6fa08bcfb56a471d55db3c7419d05f8a947b8d"; }; meta = { description = "Arbitrary size integer/float math package"; @@ -8618,22 +9319,35 @@ let self = _self // overrides; _self = with self; { }; MathBigIntGMP = buildPerlPackage rec { - name = "Math-BigInt-GMP-1.38"; + name = "Math-BigInt-GMP-1.6004"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "05bg10gg3ksn4h08yyyj7f31rqhdqap8d0jsbq61b3x0274wml0s"; + sha256 = "1wiklyxxpf02c01flymyjqh46lhi0qhkvf14icni8grjgpfjjqi3"; }; buildInputs = [ pkgs.gmp ]; doCheck = false; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; + propagatedBuildInputs = [ MathBigInt ]; + }; + + MathBigIntLite = buildPerlPackage rec { + name = "Math-BigInt-Lite-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.17.tar.gz; + sha256 = "1pii36cykpja9al6bdnsxn2w0la674qagqcff6lhk9yx6xakycpk"; + }; + propagatedBuildInputs = [ MathBigInt ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.2611"; + name = "Math-BigRat-0.2613"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "a8a033d0ccac9ac641c73867d71f2455ecb2339984cd964b1e3cfb2859e9fd81"; + sha256 = "b893dfe2caf27b233a3678abc39176e706a9b518e8937bc496e46e125e960e22"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -8645,11 +9359,11 @@ let self = _self // overrides; _self = with self; { MathClipper = buildPerlModule rec { name = "Math-Clipper-1.23"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-Clipper-1.23.tar.gz; sha256 = "0i9wzvig7ayijc9nvh5x5rryk1jrcj1hcvfmlcj449rnnxx24dav"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; - propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ]; + buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ]; }; MathComplex = buildPerlPackage { @@ -8663,7 +9377,7 @@ let self = _self // overrides; _self = with self; { MathConvexHullMonotoneChain = buildPerlPackage rec { name = "Math-ConvexHull-MonotoneChain-0.01"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-ConvexHull-MonotoneChain-0.01.tar.gz; sha256 = "1xcl7cz62ydddji9qzs4xsfxss484jqjlj4iixa4aci611cw92r8"; }; }; @@ -8671,19 +9385,20 @@ let self = _self // overrides; _self = with self; { MathGeometryVoronoi = buildPerlPackage rec { name = "Math-Geometry-Voronoi-1.3"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SAMTREGAR/Math-Geometry-Voronoi-1.3.tar.gz; sha256 = "0b206k2q5cznld45cjhgm0as0clc9hk135ds8qafbkl3k175w1vj"; }; propagatedBuildInputs = [ ClassAccessor ParamsValidate ]; }; MathPlanePath = buildPerlPackage rec { - name = "Math-PlanePath-123"; + name = "Math-PlanePath-126"; src = fetchurl { url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; - sha256 = "13by23pzwfa2f3rxiws7blqxb8lr3mfczdfq6jsi1kb3ml2wnxyc"; + sha256 = "014gr79gg992paas6v1glciyycqp2hg7pg4y03kgfbxz1slc6zhq"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; + buildInputs = [ DataFloat MathBigIntLite ]; }; MathRandomISAAC = buildPerlPackage { @@ -8708,7 +9423,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.22.tar.gz; sha256 = "07zha5zjxyvqwnycb1vzk4hk2m46n9yc5lrbvhkc22595dsyjahz"; }; - propagatedBuildInputs = [ ExceptionClass ObjectInsideOut ]; + propagatedBuildInputs = [ ObjectInsideOut ]; meta = { description = "Auto-seeded Mersenne Twister PRNGs"; license = "unrestricted"; @@ -8718,13 +9433,13 @@ let self = _self // overrides; _self = with self; { }; MathRandomSecure = buildPerlPackage { - name = "Math-Random-Secure-0.06"; + name = "Math-Random-Secure-0.080001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MK/MKANAT/Math-Random-Secure-0.06.tar.gz; - sha256 = "0392h78l3shkba9l2c43rgz6sm5qv7pzdylgb7gp9milprn77crc"; + url = mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz; + sha256 = "0dgbf4ncll4kmgkyb9fsaxn0vf2smc9dmwqzgh3259zc2zla995z"; }; - buildInputs = [ ListMoreUtils TestWarn ]; - propagatedBuildInputs = [ AnyMoose CryptRandomSource MathRandomISAAC ]; + buildInputs = [ ListMoreUtils TestSharedFork TestWarn ]; + propagatedBuildInputs = [ CryptRandomSource MathRandomISAAC ]; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; license = stdenv.lib.licenses.artistic2; @@ -8734,21 +9449,42 @@ let self = _self // overrides; _self = with self; { }; MathRound = buildPerlPackage rec { - name = "Math-Round-0.06"; + name = "Math-Round-0.07"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; - sha256 = "194dvggf1cmzc701j4wma38jgrcv2pwwzk69rnysjjdcjdv6y255"; + url = mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz; + sha256 = "09wkvqj4hfq9y0fimri967rmhnq90dc2wf20lhlmqjp5hsd359vk"; + }; + }; + + MathVecStat = buildPerlPackage rec { + name = "Math-VecStat-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz; + sha256 = "03bdcl9pn2bc9b50c50nhnr7m9wafylnb3v21zlch98h9c78x6j0"; }; }; Memoize = buildPerlPackage { - name = "Memoize-1.03.tgz"; + name = "Memoize-1.03"; src = fetchurl { url = mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz; sha256 = "5239cc5f644a50b0de9ffeaa51fa9991eb06ecb1bf4678873e3ab89af9c0daf3"; }; }; + MemoizeExpireLRU = buildPerlPackage rec { + name = "Memoize-ExpireLRU-0.56"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz; + sha256 = "1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"; + }; + meta = { + description = "Expiry plug-in for Memoize that adds LRU cache expiration"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Memoize-ExpireLRU"; + }; + }; + MetaBuilder = buildPerlModule { name = "Meta-Builder-0.003"; src = fetchurl { @@ -8800,18 +9536,18 @@ let self = _self // overrides; _self = with self; { }; MIMEBase64 = buildPerlPackage rec { - name = "MIME-Base64-3.14"; + name = "MIME-Base64-3.15"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1qbcipxij7pv25qhnfdc2lnkqi2cf60frlhlh86gjxslc8kr8nhj"; + sha256 = "1f8y78dskf91p4xym73n9lqbj15av5vxpsivm7nr7jx9lrk3b1kz"; }; }; MIMECharset = buildPerlPackage { - name = "MIME-Charset-1.011.1"; + name = "MIME-Charset-1.012.2"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.011.1.tar.gz; - sha256 = "2955a3b617fe12654efc2a13ae1dc7d32aad81d35cfae21f74337213cf2435d5"; + url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz; + sha256 = "878c779c0256c591666bd06c0cde4c0d7820eeeb98fd1183082aee9a1e7b1d13"; }; meta = { description = "Charset Information for MIME"; @@ -8829,36 +9565,13 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ProcWaitStat ]; }; - MIMETools = buildPerlPackage rec { - name = "MIME-tools-5.509"; - src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz"; - sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; - }; - propagatedBuildInputs = [ - MailTools - FilePath - FileTemp - MIMEBase64 - ]; - buildInputs = [ - TestDeep - TestPod - TestPodCoverage - ]; - meta = { - description = "class for parsed-and-decoded MIME message"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - MIMELite = buildPerlPackage rec { name = "MIME-Lite-3.030"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "8f39901bc580bc3dce69e10415305e4435ff90264c63d29f707b4566460be962"; }; - propagatedBuildInputs = [ EmailDateFormat MailTools MIMETypes ]; + propagatedBuildInputs = [ EmailDateFormat ]; meta = { description = "Low-calorie MIME generator (DEPRECATED)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8866,16 +9579,18 @@ let self = _self // overrides; _self = with self; { }; }; - MIMEtools = buildPerlPackage { - name = "MIME-tools-5.507"; + MIMEtools = MIMETools; + + MIMETools = buildPerlPackage rec { + name = "MIME-tools-5.509"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.507.tar.gz; - sha256 = "2f43683e1d5bed21179207d81c0caf1d5b5d480d018ac812f4ab950879fe7793"; + url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz; + sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; }; - buildInputs = [ TestDeep ]; propagatedBuildInputs = [ MailTools ]; + buildInputs = [ TestDeep ]; meta = { - description = "Tools to manipulate MIME messages"; + description = "class for parsed-and-decoded MIME message"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8907,13 +9622,37 @@ let self = _self // overrides; _self = with self; { }; }; - ModernPerl = buildPerlPackage { - name = "Modern-Perl-1.20140107"; + Mo = buildPerlPackage rec { + name = "Mo-0.40"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz; + sha256 = "1fff81awg9agfawf3wxx0gpf6vgav8w920rmxsbjg30z75943lli"; + }; + meta = { + description = "Micro Objects. Mo is less."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/ingydotnet/mo-pm"; + }; + }; + + MockConfig = buildPerlPackage rec { + name = "Mock-Config-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz; + sha256 = "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55"; + }; + meta = { + description = "temporarily set Config or XSConfig values"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus artistic2 ]; + }; + }; + + ModernPerl = buildPerlModule { + name = "Modern-Perl-1.20170117"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20140107.tar.gz; - sha256 = "9cf66b2f93340dfe1cd7162262a47e7c4ba82475a52dc2a036c2fdc8a65298b8"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20170117.tar.gz; + sha256 = "5df2a83461163212db22b9c3353606a1a123616820fe50675041c34f004b3628"; }; - propagatedBuildInputs = [ perl ]; meta = { homepage = https://github.com/chromatic/Modern-Perl; description = "Enable all of the features of Modern Perl with one import"; @@ -8922,12 +9661,11 @@ let self = _self // overrides; _self = with self; { }; ModuleBuild = buildPerlPackage rec { - name = "Module-Build-0.4222"; + name = "Module-Build-0.4224"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "0q5i03lbx52g22bwvyb04ycky4niq379j1c3fhmlfdj7lzclajz7"; + sha256 = "10n7ggpmicwq1n503pg7kiwslda0bz48azzjvc7vb9s4hbbibjm6"; }; - buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8953,12 +9691,13 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; sha256 = "e5bb2acb117792c984628812acb0fec376cb970caee8ede57535e04d762b0e40"; }; - propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ModuleBuild TestSharedFork ]; + propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ]; meta = { homepage = https://github.com/tokuhirom/Module-Build-Pluggable; description = "Module::Build meets plugins"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestSharedFork ]; }; ModuleBuildPluggablePPPort = buildPerlModule rec { @@ -8967,8 +9706,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; sha256 = "44084ba3d8815f343bd391585ac5d8339a4807ce5c0dd84c98db8f310b64c0ea"; }; - buildInputs = [ ModuleBuild TestRequires ]; - propagatedBuildInputs = [ ClassAccessorLite ModuleBuildPluggable ]; + buildInputs = [ TestRequires TestSharedFork ]; + propagatedBuildInputs = [ ModuleBuildPluggable ]; meta = { description = "Generate ppport.h"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8981,8 +9720,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz; sha256 = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c"; }; - buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness perl ]; - propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness ]; + buildInputs = [ FileShareDir ]; + propagatedBuildInputs = [ ExtUtilsHelpers ExtUtilsInstallPaths ]; meta = { description = "A tiny replacement for Module::Build"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8995,27 +9734,56 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; sha256 = "0d39fjg9c0n820bk3fb50vvlwhdny4hdl69xmlyzql5xzp4cicsk"; }; - propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ]; + propagatedBuildInputs = [ ExtUtilsCppGuess ExtUtilsXSpp ]; }; ModuleBuildXSUtil = buildPerlModule rec { - name = "Module-Build-XSUtil-0.10"; + name = "Module-Build-XSUtil-0.18"; src = fetchurl { url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz"; - sha256 = "1323vxp8vf5xdz66lbc1wfciaks93mrbqfsjgb9nz1w9bb21xj36"; + sha256 = "1vjl77iwbwr2xhdlyqva3hhma9r1fgr2rappwsimwqjmybdrfd6b"; }; - buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ]; + buildInputs = [ CaptureTiny CwdGuard FileCopyRecursive ]; meta = { description = "A Module::Build class for building XS modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ DevelCheckCompiler ]; + }; + + ModuleCPANTSAnalyse = buildPerlPackage rec { + name = "Module-CPANTS-Analyse-0.96"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-0.96.tar.gz; + sha256 = "1c38fnbx9w1s841am1i5h33lcqr9bwc9bni21n907nmyp41wr297"; + }; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo FileFindObject IOCapture JSONMaybeXS ModuleExtractUse ModulePluggable SetScalar SoftwareLicenseCCpack ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; + meta = { + description = "Generate Kwalitee ratings for a distribution"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://cpants.cpanauthors.org"; + }; + }; + + ModuleCPANfile = buildPerlPackage rec { + name = "Module-CPANfile-1.1002"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1002.tar.gz; + sha256 = "1z9wsps70h7ypaxmwq8l8wp0dg4kqrxmaqgzbh2fq8jw9idw55dz"; + }; + meta = { + description = "Parse cpanfile"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/cpanfile"; + }; }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-3.01"; + name = "Module-CoreList-5.20180221"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-3.01.tar.gz; - sha256 = "10vf18x9qk4hdpwazxq8c0qykals36dxj0bjazqqcbp5xfb4fnyg"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180221.tar.gz; + sha256 = "12gad19gxvrv19938f6hs2i2fanq2s1dx3l1yy8nh0nvc2mwggzl"; }; meta = { homepage = http://dev.perl.org/; @@ -9024,11 +9792,25 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleExtractUse = buildPerlModule rec { + name = "Module-ExtractUse-0.342"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.342.tar.gz; + sha256 = "06z6iz4zc1rdm3w3zkddgv832rghlpvb4r494vdz65pphr65saax"; + }; + propagatedBuildInputs = [ ParseRecDescent PodStrip ]; + buildInputs = [ TestDeep TestNoWarnings ]; + meta = { + description = "Find out what modules are used"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleFind = buildPerlPackage { - name = "Module-Find-0.12"; + name = "Module-Find-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.12.tar.gz; - sha256 = "1lc33jdv4pgmm7nkr9bff0lhwjhhw91kaf6iiy2n7i7mw8dfv47l"; + url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz; + sha256 = "0s45y5lvd9k89g7lds83c0bn1p29c13hfsbrd7x64jfaf8h8cisa"; }; meta = { description = "Find and use installed modules in a (sub)category"; @@ -9053,26 +9835,26 @@ let self = _self // overrides; _self = with self; { }; ModuleInfo = buildPerlPackage rec { - name = "Module-Info-0.35"; + name = "Module-Info-0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBARBON/Module-Info-0.35.tar.gz"; - sha256 = "0r7vxg1iy3lam0jgb2sk8ghgpmp3x5fskvzqlgkb09bssq83s1xb"; + url = mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz; + sha256 = "0j143hqxgdkdpj5qssppq72gjr0n73c4f7is6wgrrcchjx905a4f"; }; buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ BUtils ]; }; - ModuleInstall = let version = "1.16"; in buildPerlPackage { + ModuleInstall = let version = "1.19"; in buildPerlPackage { name = "Module-Install-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-${version}.tar.gz"; - sha256 = "0ph242hmz11wv41yh1g8k9zj1bgzkamg2kgq8hnq4kaz4mj15b5g"; + sha256 = "06q12cm97yh4p7qbm0a2p96996ii6ss59qy57z0f7f9svy6sflqs"; }; - buildInputs = [ YAMLTiny ]; - propagatedBuildInputs = [ FileRemove ModuleScanDeps YAMLTiny ]; + propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9109,11 +9891,23 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleLoadConditional = buildPerlPackage rec { + name = "Module-Load-Conditional-0.68"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-Load-Conditional-0.68.tar.gz; + sha256 = "1zcq0s7q9bvk9wdv9ijfyddh3b8ck4n3w87rcx31lbsav5fba9vn"; + }; + meta = { + description = "Looking up module information / loading at runtime"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleManifest = buildPerlPackage { - name = "Module-Manifest-1.08"; + name = "Module-Manifest-1.09"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Module-Manifest-1.08.tar.gz; - sha256 = "722ed428afcbe5b5b441b0165cbafbd8534fa63d7856d4089e6e25ac21e6445d"; + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz; + sha256 = "a395f80ff15ea0e66fd6c453844b6787ed4a875a3cd8df9f7e29280250bd539b"; }; buildInputs = [ TestException TestWarn ]; propagatedBuildInputs = [ ParamsUtil ]; @@ -9124,12 +9918,11 @@ let self = _self // overrides; _self = with self; { }; ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000027"; + name = "Module-Metadata-1.000033"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "1rrjj48vvv3i1jrmw97i4mvsmknll7hxga4cq2s9qvc2issdrxz2"; + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000033.tar.gz; + sha256 = "13pzydb22693l33rfx6drwbhjxj04q80ds4m2nn2sbmm95wwr5mw"; }; - propagatedBuildInputs = [ version ]; }; ModulePath = buildPerlPackage rec { @@ -9160,6 +9953,7 @@ let self = _self // overrides; _self = with self; { description = "Automatically give your module the ability to have plugins"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ AppFatPacker ]; }; ModulePluggableFast = buildPerlPackage { @@ -9168,7 +9962,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz; sha256 = "0pq758wlasmh77xyd2xh75m5b2x14s8pnsv63g5356gib1q5gj08"; }; - propagatedBuildInputs = [UNIVERSALrequire]; + propagatedBuildInputs = [ UNIVERSALrequire ]; }; ModuleRefresh = buildPerlPackage { @@ -9184,13 +9978,12 @@ let self = _self // overrides; _self = with self; { }; }; - ModuleRuntime = buildPerlPackage { - name = "Module-Runtime-0.014"; + ModuleRuntime = buildPerlModule { + name = "Module-Runtime-0.016"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.014.tar.gz; - sha256 = "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz; + sha256 = "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38"; }; - buildInputs = [ ModuleBuild ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Runtime module handling"; @@ -9199,13 +9992,12 @@ let self = _self // overrides; _self = with self; { }; ModuleRuntimeConflicts = buildPerlPackage { - name = "Module-Runtime-Conflicts-0.001"; + name = "Module-Runtime-Conflicts-0.003"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.001.tar.gz; - sha256 = "0f73d03846575dd1492d3760deeb9627afaa1f8b04d4d526b1775174201be25f"; + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz; + sha256 = "707cdc75038c70fe91779b888ac050f128565d3967ba96680e1b1c7cc9733875"; }; - buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ DistCheckConflicts ModuleRuntime ]; + propagatedBuildInputs = [ DistCheckConflicts ]; meta = { homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts; description = "Provide information on conflicts for Module::Runtime"; @@ -9213,11 +10005,11 @@ let self = _self // overrides; _self = with self; { }; }; - ModuleScanDeps = let version = "1.20"; in buildPerlPackage { + ModuleScanDeps = let version = "1.24"; in buildPerlPackage { name = "Module-ScanDeps-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; - sha256 = "14a623b3gzr0mq5n93lrxm6wjmdp8dwj91gb43wk7f3dwd3ka03j"; + sha256 = "0s6cj90ckhy351gql52ksh4ms1x8piv26iadl09fcpzkx7j0srw9"; }; buildInputs = [ TestRequires ]; meta = { @@ -9228,10 +10020,10 @@ let self = _self // overrides; _self = with self; { }; ModuleSignature = buildPerlPackage { - name = "Module-Signature-0.79"; + name = "Module-Signature-0.81"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.79.tar.gz; - sha256 = "22df2ce097fb5d176efa951c782633d8debe594924a25ca66666252512ce462c"; + url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.81.tar.gz; + sha256 = "7df547ceb8e45d40f75e481a868f389aaed5641c2cf4e133146ccea4b8facec6"; }; buildInputs = [ IPCRun ]; meta = { @@ -9240,13 +10032,12 @@ let self = _self // overrides; _self = with self; { }; }; - ModuleUtil = buildPerlPackage { + ModuleUtil = buildPerlModule { name = "Module-Util-1.09"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz; sha256 = "6cfbcb6a45064446ec8aa0ee1a7dddc420b54469303344187aef84d2c7f3e2c6"; }; - buildInputs = [ ModuleBuild ]; meta = { description = "Module name tools and transformations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9279,10 +10070,10 @@ let self = _self // overrides; _self = with self; { }; mod_perl2 = buildPerlPackage { - name = "mod_perl-2.0.9"; + name = "mod_perl-2.0.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.9.tar.gz; - sha256 = "0azmir4hbb825mfmcxwa1frhnhhf82rl8xf6mmgwkhbinxmg4q02"; + url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.10.tar.gz; + sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi"; }; makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; @@ -9293,12 +10084,11 @@ let self = _self // overrides; _self = with self; { }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-6.56"; + name = "Mojolicious-7.71"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "82f73553836ac378edf825fd9f24be982653be9e0d78f8ba38b7841aabdafb02"; + sha256 = "25d8ab46fd7c340abcbbe740f690c197df6ff40a9c3dddf907629211bf3ad905"; }; - propagatedBuildInputs = [ JSONPP ]; meta = { homepage = http://mojolicious.org; description = "Real-time web framework"; @@ -9307,10 +10097,10 @@ let self = _self // overrides; _self = with self; { }; MojoIOLoopForkCall = buildPerlModule rec { - name = "Mojo-IOLoop-ForkCall-0.17"; + name = "Mojo-IOLoop-ForkCall-0.19"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; - sha256 = "886de5c3b44194a86228471075fac4036073bda19093e776c702aa65c3ef1824"; + sha256 = "a436b71c7d1450f79b9810f4f46e24f5ffe1e1428da473d4315673e08e4dec62"; }; propagatedBuildInputs = [ IOPipely Mojolicious ]; meta = { @@ -9325,10 +10115,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NI/NIERLEIN/${name}.tar.gz"; sha256 = "030cw86j8712z8rn66k935gbilb5rcj3lnk4n53vh1b2phrszvjw"; }; - buildInputs = [ TestMore ]; - propagatedBuildInputs = [ - Carp ClassAccessor ConfigTiny - MathCalcUnits ParamsValidate ]; + propagatedBuildInputs = [ ClassAccessor ConfigTiny MathCalcUnits ParamsValidate ]; meta = { description = '' A family of perl modules to streamline writing Naemon, @@ -9367,13 +10154,13 @@ let self = _self // overrides; _self = with self; { }; Moose = buildPerlPackage { - name = "Moose-2.1213"; + name = "Moose-2.2010"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1213.tar.gz; - sha256 = "0f3b196ae67dc1daaa43c44ae7703f27c4f92c391ad3e252a90e90c50c851e03"; + url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2010.tar.gz; + sha256 = "af0905b69f18c27de1177c9bc7778ee495d4ec91be1f223e8ca8333af4de08c5"; }; - buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ModuleMetadata ]; - propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DevelStackTrace DistCheckConflicts EvalClosure ListMoreUtils MROCompat ModuleRuntime ModuleRuntimeConflicts PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; + buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ScalarListUtils SubExporter ]; preConfigure = '' export LD=$CC ''; @@ -9393,20 +10180,94 @@ let self = _self // overrides; _self = with self; { sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c"; }; buildInputs = [ MooXTypesMooseLike TestException TestFatal ]; - propagatedBuildInputs = [ ClassMethodModifiers DataPerl ModuleRuntime Moo RoleTiny ]; + propagatedBuildInputs = [ DataPerl Moo ]; meta = { description = "NativeTrait-like behavior for Moo"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; + MooXLocalePassthrough = buildPerlPackage rec { + name = "MooX-Locale-Passthrough-0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz; + sha256 = "04h5xhqdvydd4xk9ckb6a79chn0ygf915ix55vg1snmba9z841bs"; + }; + propagatedBuildInputs = [ Moo ]; + meta = { + description = "provide API used in translator modules without translating"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-Locale-Passthrough"; + }; + }; + + MooXLocaleTextDomainOO = buildPerlPackage rec { + name = "MooX-Locale-TextDomain-OO-0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz; + sha256 = "0g8pwj45ccqrzvs9cqyhw29nm68vai1vj46ad39rajnqzp7m53jv"; + }; + propagatedBuildInputs = [ LocaleTextDomainOO MooXLocalePassthrough ]; + meta = { + description = "provide API used in translator modules without translating"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-Locale-TextDomain-OO"; + }; + }; + + MooXOptions = buildPerlPackage rec { + name = "MooX-Options-4.103"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz; + sha256 = "0v9j0wxx4f6z6lrmdqf2k084b2c2f2jbvh86pwib0vgjz1sdbyad"; + }; + propagatedBuildInputs = [ GetoptLongDescriptive MROCompat MooXLocalePassthrough PathClass UnicodeLineBreak strictures ]; + buildInputs = [ Mo MooXCmd MooXLocaleTextDomainOO Moose TestTrap ]; + meta = { + description = "Explicit Options eXtension for Object Class"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/celogeek/MooX-Options"; + }; + }; + + MooXSingleton = buildPerlModule rec { + name = "MooX-Singleton-1.20"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz; + sha256 = "03i1wfag279ldjjkwi9gvpfs8fgi05my47icq5ggi66yzxpn5mzp"; + }; + propagatedBuildInputs = [ RoleTiny ]; + buildInputs = [ Moo ]; + meta = { + description = "turn your Moo class into singleton"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://search.cpan.org/dist/MooX-Singleton"; + }; + }; + + MooXStrictConstructor = buildPerlPackage rec { + name = "MooX-StrictConstructor-0.010"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz; + sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr"; + }; + propagatedBuildInputs = [ Moo strictures ]; + buildInputs = [ TestFatal ]; + meta = { + description = "Make your Moo-based object constructors blow up on unknown attributes."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-StrictConstructor"; + }; + }; + MooXTypesMooseLike = buildPerlPackage rec { - name = "MooX-Types-MooseLike-0.27"; + name = "MooX-Types-MooseLike-0.29"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz"; - sha256 = "1489almsam2zcrs5039sh0y88gjicwna8kws8j2jgfs8bpcf4dgf"; + sha256 = "1d6jg9x3p7gm2r0xmbcag374a44gf5pcga2swvxhlhzakfm80dqx"; }; - propagatedBuildInputs = [ Moo TestFatal ]; + propagatedBuildInputs = [ ModuleRuntime ]; + buildInputs = [ Moo TestFatal ]; }; MooXTypesMooseLikeNumeric = buildPerlPackage rec { @@ -9423,14 +10284,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseAutobox = buildPerlPackage { - name = "Moose-Autobox-0.15"; + MooseAutobox = buildPerlModule { + name = "Moose-Autobox-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Moose-Autobox-0.15.tar.gz; - sha256 = "0xcayrfm08dqas1mq8lnf8nxkvzdgcmv6xs5lqah17bxqxgznrl9"; + url = mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz; + sha256 = "0mbhd0p7gf6qdhaylldl0ahq59zghs0vd5n1iqcbfkj8ryj1sh4j"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ]; + buildInputs = [ ModuleBuildTiny TestException ]; + propagatedBuildInputs = [ ListMoreUtils Moose SyntaxKeywordJunction autobox namespaceautoclean ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9460,18 +10321,18 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; sha256 = "0j07zqczjfmng3md6nkha7560i786d0cp3gdmrx49hr64jbhz1f4"; }; - buildInputs = [ TestFatal TestRequires ]; + buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose ]; }; - MooseXAppCmd = buildPerlPackage rec { + MooseXAppCmd = buildPerlModule rec { name = "MooseX-App-Cmd-0.32"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "2e3bbf7283a4bee72d91d26eb204436030992bbe55cbd35ec33a546f16f973ff"; }; buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; - propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXGetopt MooseXNonMoose namespaceautoclean ]; + propagatedBuildInputs = [ AppCmd MooseXGetopt MooseXNonMoose ]; meta = { homepage = https://github.com/moose/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; @@ -9487,7 +10348,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz"; sha256 = "2ff91a656e78aae0aca42293829d7a7e5acb9bf22b0401635b2ab6c870de32d5"; }; - propagatedBuildInputs = [ DataOptList ImportInto ModuleRuntime Moo ]; + propagatedBuildInputs = [ DataOptList ImportInto Moo ]; meta = { homepage = https://github.com/Getty/p5-moox; description = "Using Moo and MooX:: packages the most lazy way"; @@ -9495,6 +10356,21 @@ let self = _self // overrides; _self = with self; { }; }; + MooXCmd = buildPerlPackage rec { + name = "MooX-Cmd-0.017"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz; + sha256 = "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl"; + }; + propagatedBuildInputs = [ ListMoreUtils ModulePluggable Moo PackageStash ParamsUtil RegexpCommon ]; + buildInputs = [ CaptureTiny ]; + meta = { + description = "Giving an easy Moo style way to make command organized CLI apps"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-Cmd"; + }; + }; + MooXlate = buildPerlPackage { name = "MooX-late-0.015"; src = fetchurl { @@ -9516,8 +10392,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; }; - buildInputs = [ Mouse PathClass ]; - propagatedBuildInputs = [ ConfigAny Mouse MouseXConfigFromFile ]; + propagatedBuildInputs = [ ConfigAny MouseXConfigFromFile ]; meta = { description = "A Mouse role for setting attributes from a simple configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9543,7 +10418,7 @@ let self = _self // overrides; _self = with self; { sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; }; buildInputs = [ TestUseAllModules ]; - propagatedBuildInputs = [ Mouse MouseXTypes PathClass ]; + propagatedBuildInputs = [ MouseXTypes PathClass ]; meta = { description = "A Path::Class type library for Mouse"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9557,7 +10432,7 @@ let self = _self // overrides; _self = with self; { sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ AnyMoose Mouse ]; + propagatedBuildInputs = [ AnyMoose ]; meta = { description = "Organize your Mouse types in libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9571,7 +10446,7 @@ let self = _self // overrides; _self = with self; { sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; }; buildInputs = [ TestUseAllModules ]; - propagatedBuildInputs = [ Mouse MouseXTypesPathClass ]; + propagatedBuildInputs = [ MouseXTypesPathClass ]; meta = { description = "An abstract Mouse role for setting attributes from a configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9586,7 +10461,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; sha256 = "a6221043e7be3217ce56d2a6425a413d9cd28e2f52053995a6ceb118e8e963bc"; }; - buildInputs = [ ModuleBuildTiny Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { homepage = https://github.com/gfx/mousex-getopt; @@ -9597,12 +10472,12 @@ let self = _self // overrides; _self = with self; { }; MooseXAttributeChained = buildPerlModule rec { - name = "MooseX-Attribute-Chained-1.0.1"; + name = "MooseX-Attribute-Chained-1.0.3"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "101kwjzidppcsnyvp9x1vw8vpvkp1cc1csqmzbashwvqy8d0g4af"; + url = mirror://cpan/authors/id/T/TO/TOMHUKINS/MooseX-Attribute-Chained-1.0.3.tar.gz; + sha256 = "0kjydmkxh8hpkbbmsgd5wrkhgq7w69lgfg6lx4s5g2xpqfkqmqz7"; }; - propagatedBuildInputs = [ Moose TryTiny ]; + propagatedBuildInputs = [ Moose ]; }; MooseXAttributeHelpers = buildPerlPackage { @@ -9612,7 +10487,7 @@ let self = _self // overrides; _self = with self; { sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1"; }; patches = [ ../development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch ]; - buildInputs = [ Moose TestException ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; @@ -9622,27 +10497,28 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXClone = buildPerlPackage { - name = "MooseX-Clone-0.05"; + MooseXClone = buildPerlModule { + name = "MooseX-Clone-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/MooseX-Clone-0.05.tar.gz; - sha256 = "11pbw3zdbcn54hrj6z74qisnmj9k4qliy6yjj9d71qndq3xg3x0f"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Clone-0.06.tar.gz; + sha256 = "19wd74dihybnz1lbbsqn0clwxzb6y0aa0i25a8zhajz7p5fq5myb"; }; - propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ]; + propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat namespaceautoclean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ ModuleBuildTiny ]; }; - MooseXConfigFromFile = buildPerlPackage rec { + MooseXConfigFromFile = buildPerlModule rec { name = "MooseX-ConfigFromFile-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "9ad343cd9f86d714be9b54b9c68a443d8acc6501b6ad6b15e9ca0130b2e96f08"; }; - buildInputs = [ ModuleBuildTiny Moose MooseXGetopt TestDeep TestFatal TestRequires TestWithoutModule self."if" ]; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestRequires TestWithoutModule ]; + propagatedBuildInputs = [ MooseXTypesPathTiny ]; meta = { homepage = https://github.com/moose/MooseX-ConfigFromFile; description = "An abstract Moose role for setting attributes from a configfile"; @@ -9651,14 +10527,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXDaemonize = buildPerlPackage rec { + MooseXDaemonize = buildPerlModule rec { name = "MooseX-Daemonize-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "111f391221d00f8b09cdcc6c806ab114324cf7f529d12f627fb97d054da42225"; }; - buildInputs = [ DevelCheckOS ModuleBuildTiny Moose TestFatal ]; - propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass SubExporter namespaceautoclean ]; + buildInputs = [ DevelCheckOS ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ MooseXGetopt MooseXTypesPathClass ]; meta = { homepage = https://github.com/moose/MooseX-Daemonize; description = "Role for daemonizing your Moose based application"; @@ -9680,14 +10556,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXGetopt = buildPerlPackage rec { + MooseXGetopt = buildPerlModule rec { name = "MooseX-Getopt-0.71"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "de18f8ea0a5650cbbdebecb8f4c028f5f951fc5698332f7b8e20c7874902c259"; }; - buildInputs = [ ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings self."if" ]; - propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings ]; + propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; meta = { homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; @@ -9702,8 +10578,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz; sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68"; }; - buildInputs = [ Moose TestMost namespaceautoclean ]; - propagatedBuildInputs = [ ClassLoad ListMoreUtils PackageStash StringRewritePrefix ]; + buildInputs = [ Moose TestDeep TestDifferences TestException TestMost TestWarn namespaceautoclean ]; + propagatedBuildInputs = [ ClassLoad ListMoreUtils StringRewritePrefix ]; meta = { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; @@ -9713,14 +10589,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXHasSugar = buildPerlModule { - name = "MooseX-Has-Sugar-0.05070421"; + MooseXHasSugar = buildPerlPackage { + name = "MooseX-Has-Sugar-1.000006"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-0.05070421.tar.gz; - sha256 = "5acf92a6dcac50a6edfcbdb2c38802f8c1f9dc7194a79d0b85a3d4105ebba7df"; + url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz; + sha256 = "efeed3ddb3a8ea18f416d485f3c2b0427145d267e63368c651d488eaa8c28d09"; }; - buildInputs = [ Moose MooseXTypes TestFatal namespaceautoclean ]; - propagatedBuildInputs = [ SubExporter ]; + buildInputs = [ TestFatal namespaceclean ]; + propagatedBuildInputs = [ SubExporterProgressive ]; meta = { homepage = https://github.com/kentfredric/MooseX-Has-Sugar; description = "Sugar Syntax for moose 'has' fields"; @@ -9728,13 +10604,13 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXLazyRequire = buildPerlPackage { - name = "MooseX-LazyRequire-0.10"; + MooseXLazyRequire = buildPerlModule { + name = "MooseX-LazyRequire-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.10.tar.gz; - sha256 = "a555f80c0e91bc428f040015f00dd98f3c022704ec089516b9b3507f3d437090"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz; + sha256 = "ef620c1e019daf9cf3f23a943d25a94c91e93ab312bcd63be2e9740ec0b94288"; }; - buildInputs = [ TestCheckDeps TestFatal ModuleMetadata ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; @@ -9749,8 +10625,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz; sha256 = "1y3yxwcjjajm66pvca54cv9fax7a6dy36xqr92x7vzyhfqrw3v69"; }; - buildInputs = [ TestMoose ]; - propagatedBuildInputs = [ BHooksEndOfScope Moose namespaceautoclean ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/MooseX-MarkAsMethods/; description = "Mark overload code symbols as methods"; @@ -9759,13 +10634,13 @@ let self = _self // overrides; _self = with self; { }; MooseXMethodAttributes = buildPerlPackage { - name = "MooseX-MethodAttributes-0.28"; + name = "MooseX-MethodAttributes-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.28.tar.gz; - sha256 = "0srk85z6py9brw1jfvacd76y6219wycq3dj0wackbkmmbq04ln0g"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz; + sha256 = "1whd10w7bm3dwaj7gpgw40bci9vvb2zmxs4349ifji91hvinwqck"; }; - buildInputs = [ namespaceautoclean TestCheckDeps TestException ModuleMetadata ]; - propagatedBuildInputs = [ Moose MooseXTypes namespaceautoclean ]; + buildInputs = [ MooseXRoleParameterized TestFatal TestRequires ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; description = "Code attribute introspection"; @@ -9788,13 +10663,12 @@ let self = _self // overrides; _self = with self; { }; MooseXOneArgNew = buildPerlPackage { - name = "MooseX-OneArgNew-0.004"; + name = "MooseX-OneArgNew-0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.004.tar.gz; - sha256 = "1frfrqaj283z1x95cqbbj3cvmb6rj50ngs47jq8myz6d1bg4zwff"; + url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz; + sha256 = "0gqhqdkwsnxmni0xv43iplplgp6g55khdwc5117j9i569r3wykvy"; }; - buildInputs = [ Moose ]; - propagatedBuildInputs = [ Moose MooseXRoleParameterized namespaceautoclean ]; + propagatedBuildInputs = [ MooseXRoleParameterized ]; meta = { homepage = https://github.com/rjbs/moosex-oneargnew; description = "Teach ->new to accept single, non-hashref arguments"; @@ -9805,35 +10679,34 @@ let self = _self // overrides; _self = with self; { MooseXRelatedClassRoles = buildPerlPackage rec { name = "MooseX-RelatedClassRoles-0.004"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HD/HDP/MooseX-RelatedClassRoles-0.004.tar.gz; sha256 = "17vynkf6m5d039qkr4in1c9lflr8hnwp1fgzdwhj4q6jglipmnrh"; }; - buildInputs = [ ]; propagatedBuildInputs = [ MooseXRoleParameterized ]; }; MooseXParamsValidate = buildPerlPackage { - name = "MooseX-Params-Validate-0.18"; + name = "MooseX-Params-Validate-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.18.tar.gz; - sha256 = "02yim0lmr7p2nzswy97d5ylbs4ksmgklqq350p119i2611x7ai0k"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz; + sha256 = "1n9ry6gnskkp9ir6s7d5jirn3mh14ydgpmwqz6wcp6d9md358ac8"; }; - buildInputs = [ Moose TestFatal ]; - propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ]; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ DevelCaller Moose ParamsValidate ]; meta = { description = "An extension of Params::Validate using Moose's types"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - MooseXRoleParameterized = buildPerlPackage { - name = "MooseX-Role-Parameterized-1.02"; + MooseXRoleParameterized = buildPerlModule { + name = "MooseX-Role-Parameterized-1.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-1.02.tar.gz; - sha256 = "089czh2pipvdajjy4rxlix0y20ilp3ldbzi0vs68b7k6k9q3mqdk"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.10.tar.gz; + sha256 = "0plx25n80mv9qwhix52z79md0qil616nbcryk2f4216kghpw2ij8"; }; - buildInputs = [ TestFatal TestMoose ]; - propagatedBuildInputs = [ Moose ]; + buildInputs = [ CPANMetaCheck ModuleBuildTiny MooseXRoleWithOverloading TestFatal TestRequires ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/sartak/MooseX-Role-Parameterized/tree; description = "Roles with composition parameters"; @@ -9847,8 +10720,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j"; }; - buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata]; - propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ]; + propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/MooseX-Role-WithOverloading; description = "Roles which support overloading"; @@ -9856,14 +10728,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXRunnable = buildPerlPackage rec { + MooseXRunnable = buildPerlModule rec { name = "MooseX-Runnable-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "40d8fd1b5524ae965965a1f144d7a0a0c850594c524402b2319b24d5c4af1199"; }; - buildInputs = [ ModuleBuildTiny MooseXGetopt TestFatal TestSimple TestTableDriven ]; - propagatedBuildInputs = [ ClassLoad ListSomeUtils Moose MooseXTypes MooseXTypesPathTiny ParamsUtil PathTiny namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 TestTableDriven ]; + propagatedBuildInputs = [ ListSomeUtils MooseXTypesPathTiny ]; meta = { homepage = https://github.com/moose/MooseX-Runnable; description = "Tag a class as a runnable application"; @@ -9874,10 +10746,10 @@ let self = _self // overrides; _self = with self; { }; MooseXSemiAffordanceAccessor = buildPerlPackage rec { - name = "MooseX-SemiAffordanceAccessor-0.09"; + name = "MooseX-SemiAffordanceAccessor-0.10"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "1724cxvgy1wh1kfawcj2sanlm90zarfh7k186pgyx1lk8fhnlj4m"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.10.tar.gz; + sha256 = "1mdil9ckgmgr78z59p8wfa35ixn5855ndzx14y01dvfxpiv5gf55"; }; propagatedBuildInputs = [ Moose ]; }; @@ -9885,33 +10757,34 @@ let self = _self // overrides; _self = with self; { MooseXSetOnce = buildPerlPackage rec { name = "MooseX-SetOnce-0.200002"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz; sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose ]; }; - MooseXSingleton = buildPerlPackage rec { - name = "MooseX-Singleton-0.29"; + MooseXSingleton = buildPerlModule rec { + name = "MooseX-Singleton-0.30"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz; - sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Singleton-0.30.tar.gz; + sha256 = "0hb5s1chsgbx2nlb0f112mdh2v1zwww8f4i3gvfvcghx3grv5135"; }; - buildInputs = [ Moose TestFatal TestRequires ]; + buildInputs = [ ModuleBuildTiny TestFatal TestRequires TestWarnings ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + propagatedBuildInputs = [ Moose ]; }; MooseXStrictConstructor = buildPerlPackage { - name = "MooseX-StrictConstructor-0.19"; + name = "MooseX-StrictConstructor-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.19.tar.gz; - sha256 = "486573c16901e83c081da3d90a544281af1baa40bbf036337d6fa91994e48a31"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz; + sha256 = "c72a5ae9583706ccdec71d401dcb3054013a7536b750df1436613d858ea2920d"; }; - buildInputs = [ Moose TestFatal ]; + buildInputs = [ Moo TestFatal TestNeeds ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Make your object constructors blow up on unknown attributes"; @@ -9919,14 +10792,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTraits = buildPerlPackage rec { + MooseXTraits = buildPerlModule rec { name = "MooseX-Traits-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "74afe0c4faf4e3b97c57f289437caa60becca34cd5821f489dd4cc9da4fbe29a"; }; - buildInputs = [ ModuleBuildTiny Moose MooseXRoleParameterized TestFatal TestRequires TestSimple ]; - propagatedBuildInputs = [ ClassLoad Moose SubExporter namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny MooseXRoleParameterized TestFatal TestRequires TestSimple13 ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Traits; description = "Automatically apply roles at object creation time"; @@ -9940,19 +10813,18 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; sha256 = "1jjqmcidy4kdgp5yffqqwxrsab62mbhbpvnzdy1rpwnb1savg5mb"; }; - buildInputs =[ TestException ]; - propagatedBuildInputs = - [ ClassMOP Moose namespaceautoclean ListMoreUtils ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ ListMoreUtils Moose namespaceautoclean ]; }; - MooseXTypes = buildPerlPackage rec { + MooseXTypes = buildPerlModule rec { name = "MooseX-Types-0.50"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08"; }; - buildInputs = [ ModuleBuildTiny TestFatal TestRequires self."if" ]; - propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubExporterForMethods SubInstall SubName namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal TestRequires ]; + propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; @@ -9961,14 +10833,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesCommon = buildPerlPackage rec { + MooseXTypesCommon = buildPerlModule rec { name = "MooseX-Types-Common-0.001014"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f"; }; - buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; - propagatedBuildInputs = [ MooseXTypes self."if" ]; + buildInputs = [ ModuleBuildTiny TestDeep TestWarnings ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { homepage = https://github.com/moose/MooseX-Types-Common; description = "A library of commonly used type constraints"; @@ -9976,14 +10848,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesDateTime = buildPerlPackage rec { + MooseXTypesDateTime = buildPerlModule rec { name = "MooseX-Types-DateTime-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "b89fa26636f6a17eaa3868b4514340472b68bbdc2161a1d79a22a1bf5b1d39c6"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal TestSimple ]; - propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean self."if" ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; + propagatedBuildInputs = [ DateTime MooseXTypes ]; meta = { homepage = https://github.com/moose/MooseX-Types-DateTime; description = "DateTime related constraints and coercions for Moose"; @@ -9991,14 +10863,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesDateTimeMoreCoercions = buildPerlPackage rec { + MooseXTypesDateTimeMoreCoercions = buildPerlModule rec { name = "MooseX-Types-DateTime-MoreCoercions-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796"; }; - buildInputs = [ ModuleBuildTiny TestFatal TestSimple ]; - propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean self."if" ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; + propagatedBuildInputs = [ DateTimeXEasy MooseXTypesDateTime TimeDurationParse ]; meta = { homepage = https://github.com/moose/MooseX-Types-DateTime-MoreCoercions; description = "Extensions to MooseX::Types::DateTime"; @@ -10006,14 +10878,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesLoadableClass = buildPerlPackage { - name = "MooseX-Types-LoadableClass-0.012"; + MooseXTypesLoadableClass = buildPerlModule { + name = "MooseX-Types-LoadableClass-0.015"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.012.tar.gz; - sha256 = "a1d2b186c2b69f416bb0c9271dc8692c2287c2f6ce144cc3b9b2c922427060df"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.015.tar.gz; + sha256 = "e037d3778253dcf92946435715bada0e6449c0a2808fa3ff32a965064d5a3bf4"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal ]; - propagatedBuildInputs = [ ClassLoad ModuleRuntime Moose MooseXTypes namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -10023,27 +10895,28 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesPathClass = buildPerlPackage { - name = "MooseX-Types-Path-Class-0.06"; + MooseXTypesPathClass = buildPerlModule { + name = "MooseX-Types-Path-Class-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THEPLER/MooseX-Types-Path-Class-0.06.tar.gz; - sha256 = "02lw86r6pp6saiwc7ns890mlwq93vhkqyri3cipsfwhnhcap847g"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz; + sha256 = "0zpgwzxj6d9k2lbg6v6zd1bcbzjz2h336rm816krbblq6ssvm177"; }; - propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ]; + propagatedBuildInputs = [ MooseXTypes PathClass ]; meta = { description = "A Path::Class type library for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny TestNeeds ]; }; MooseXTypesPathTiny = buildPerlModule { - name = "MooseX-Types-Path-Tiny-0.006"; + name = "MooseX-Types-Path-Tiny-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.006.tar.gz; - sha256 = "0260c6fbbf84d411b145238ffd92a73f754bd92434448d9f78798fba0a2dfdd6"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz; + sha256 = "19eede02dd654e70f73e34cd7af0063765173bcaefeeff1bdbe21318ecfd9158"; }; - buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ModuleMetadata ]; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesStringlike PathTiny ]; + buildInputs = [ Filepushd ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ MooseXGetopt MooseXTypesStringlike PathTiny ]; meta = { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; @@ -10059,7 +10932,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz; sha256 = "0nijy676q27bvjb8swxrb1j4lq2xq8jbqkaxs1l9q81k7jpvx17h"; }; - propagatedBuildInputs = [ MooseXTypes ParamsUtil ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { description = "Moose types that check against Perl syntax"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -10067,12 +10940,11 @@ let self = _self // overrides; _self = with self; { }; MooseXTypesStringlike = buildPerlPackage { - name = "MooseX-Types-Stringlike-0.002"; + name = "MooseX-Types-Stringlike-0.003"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.002.tar.gz; - sha256 = "18g07bvhcrhirb1yhcz55y7nsvkw1wq285d1hyb0jxrzgr0ga94k"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz; + sha256 = "06fgamdiz0n7cgghb8ycjd5mcidj8w769zs2gws6z6jjbkn4kqrf"; }; - buildInputs = [ Moose ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { homepage = https://github.com/dagolden/moosex-types-stringlike; @@ -10083,14 +10955,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesStructured = buildPerlPackage { - name = "MooseX-Types-Structured-0.30"; + MooseXTypesStructured = buildPerlModule { + name = "MooseX-Types-Structured-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.30.tar.gz; - sha256 = "0svfgbyzwdipywh7bfp954hncm8ihfr8xpppcyy59wr1inx2f55c"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.36.tar.gz; + sha256 = "0mrxc00sid7526c6brrnjr6288468sszic3wazij71v3z59bdka3"; }; - buildInputs = [ DateTime MooseXTypesDateTime TestFatal ]; - propagatedBuildInputs = [ DevelPartialDump Moose MooseXTypes SubExporter ]; + buildInputs = [ DateTime ModuleBuildTiny MooseXTypesDateTime TestFatal TestNeeds ]; + propagatedBuildInputs = [ DevelPartialDump MooseXTypes ]; meta = { homepage = https://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; @@ -10100,14 +10972,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesURI = buildPerlPackage rec { + MooseXTypesURI = buildPerlModule rec { name = "MooseX-Types-URI-0.08"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "d310d20fa361fe2dff758236df87949cc7bf98e5cf3a7c79115365eccde6ccc1"; }; - buildInputs = [ ModuleBuildTiny Moose TestSimple ]; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass URI URIFromHash namespaceautoclean self."if" ]; + buildInputs = [ ModuleBuildTiny TestSimple13 ]; + propagatedBuildInputs = [ MooseXTypesPathClass URIFromHash ]; meta = { homepage = https://github.com/moose/MooseX-Types-URI; description = "URI related types and coercions for Moose"; @@ -10118,15 +10990,12 @@ let self = _self // overrides; _self = with self; { }; Mouse = buildPerlModule rec { - name = "Mouse-v2.4.10"; + name = "Mouse-2.5.2"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "053d28c4v8kj7llwfwj5hjkvc1kcs6mvcn24yg7vxklgj6hxv5dr"; + url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.2.tar.gz; + sha256 = "17nr2432cfw7q2qxiz8pv7lw91dszgvn4ln77gpv2m77kjh5ilbs"; }; - buildInputs = [ - ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput - TestFatal - ]; + buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; }; @@ -10137,8 +11006,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ AnyMoose ]; + buildInputs = [ AnyMoose TestFatal ]; + propagatedBuildInputs = [ Mouse ]; meta = { description = "Extend attribute interfaces for Mouse"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -10146,10 +11015,10 @@ let self = _self // overrides; _self = with self; { }; MozillaCA = buildPerlPackage rec { - name = "Mozilla-CA-20160104"; + name = "Mozilla-CA-20180117"; src = fetchurl { url = "mirror://cpan/authors/id/A/AB/ABH/${name}.tar.gz"; - sha256 = "27a7069a243162b65ada4194ff9d21b6ebc304af723eb5d3972fb74c11b03f2a"; + sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; }; meta = { description = "Mozilla's CA cert bundle in PEM format"; @@ -10174,10 +11043,10 @@ let self = _self // overrides; _self = with self; { }; MROCompat = buildPerlPackage { - name = "MRO-Compat-0.12"; + name = "MRO-Compat-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/MRO-Compat-0.12.tar.gz; - sha256 = "1mhma2g83ih9f8nkmg2k9l0x6izhhbb6k5lli4rpllxad4wbk9dv"; + url = mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz; + sha256 = "1y547lr6zccf7919vx01v22zsajy528psanhg5aqschrrin3nb4a"; }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; @@ -10199,13 +11068,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pkgs.libdiscid ]; }; - MusicBrainz = buildPerlPackage rec { - name = "WebService-MusicBrainz-0.93"; + MusicBrainz = buildPerlModule rec { + name = "WebService-MusicBrainz-1.0.4"; src = fetchurl { url = "mirror://cpan/authors/id/B/BF/BFAIST/${name}.tar.gz"; - sha256 = "1gg62x6qv4jj73jsqh0sb237k96i22blj29afpbp1scp3m7i5g61"; + sha256 = "182z3xjajk6s7k5xm3kssjy3hqx2qbnq4f8864hma098ryy2ph3a"; }; - propagatedBuildInputs = [ XMLLibXML LWP ClassAccessor URI ]; + propagatedBuildInputs = [ Mojolicious ]; doCheck = false; # Test performs network access. }; @@ -10216,7 +11085,7 @@ let self = _self // overrides; _self = with self; { sha256 = "cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ BHooksEndOfScope SubIdentify namespaceclean ]; + propagatedBuildInputs = [ SubIdentify namespaceclean ]; meta = { homepage = https://github.com/moose/namespace-autoclean; description = "Keep imports out of your namespace"; @@ -10225,10 +11094,10 @@ let self = _self // overrides; _self = with self; { }; namespaceclean = buildPerlPackage rec { - name = "namespace-clean-0.26"; + name = "namespace-clean-0.27"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "73986e19c4ad0e634e35f4f26e81437f152d8026eb1d91fe795725746ce13eca"; + sha256 = "8a10a83c3e183dc78f9e7b7aa4d09b47c11fb4e7d3a33b9a12912fd22e31af9d"; }; propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; meta = { @@ -10268,6 +11137,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; + doCheck = false; }; NetAmazonAWSSign = buildPerlPackage { @@ -10306,17 +11176,16 @@ let self = _self // overrides; _self = with self; { doCheck = false; # wants to create actual EC2 instances (for $$$) }; - NetAmazonMechanicalTurk = buildPerlPackage rec { - name = "Net-Amazon-MechanicalTurk-1.01"; + NetAmazonMechanicalTurk = buildPerlModule rec { + name = "Net-Amazon-MechanicalTurk-1.02"; src = fetchurl { url = "mirror://cpan/authors/id/M/MT/MTURK/${name}.tar.gz"; - sha256 = "17xh6qcp2sw721r8cpcal80an49264db497namms4k139fsr1yig"; + sha256 = "13hgggfchhp4m3l2rn3d1v6g6ccwmwf9xiyc9izv5570930mw2cd"; }; patches = [ ../development/perl-modules/net-amazon-mechanicalturk.patch ]; - propagatedBuildInputs = - [ DigestHMAC LWP LWPProtocolHttps URI XMLParser IOString ]; - buildInputs = [ DBI DBDSQLite ]; + propagatedBuildInputs = [ DigestHMAC LWPProtocolHttps XMLParser ]; + doCheck = false; }; NetAmazonS3 = buildPerlPackage rec { @@ -10325,8 +11194,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; sha256 = "efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848"; }; - buildInputs = [ LWP TestException ]; - propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI VMEC2SecurityCredentialCache XMLLibXML ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RegexpCommon TermEncoding TermProgressBarSimple VMEC2SecurityCredentialCache XMLLibXML ]; meta = { homepage = http://search.cpan.org/dist/Net-Amazon-S3/; description = "Use the Amazon S3 - Simple Storage Service"; @@ -10334,7 +11203,7 @@ let self = _self // overrides; _self = with self; { }; }; - NetAmazonS3Policy = buildPerlPackage { + NetAmazonS3Policy = buildPerlModule { name = "Net-Amazon-S3-Policy-0.1.6"; src = fetchurl { url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz; @@ -10367,10 +11236,10 @@ let self = _self // overrides; _self = with self; { }; NetCIDR = buildPerlPackage { - name = "Net-CIDR-0.17"; + name = "Net-CIDR-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.17.tar.gz; - sha256 = "4a968e700d382cf0946e47df420d0151fbd8e0135f037d404c7c63713b66daf0"; + url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.18.tar.gz; + sha256 = "c3df7ea8d42b2d8ec328c187329c5f8c4db6a2470873f61e3d0dd91430ef1427"; }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; @@ -10398,7 +11267,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CY/CYCLES/Net-CoverArtArchive-1.02.tar.gz; sha256 = "1lfx8lrjgb3s11fcm243jp5sghngd9svkgmg7xmssmj34q4f49ap"; }; - buildInputs = [ FileFindRule TryTiny ]; + buildInputs = [ FileFindRule ]; propagatedBuildInputs = [ JSONAny LWP Moose namespaceautoclean ]; meta = { homepage = https://github.com/metabrainz/CoverArtArchive; @@ -10425,10 +11294,10 @@ let self = _self // overrides; _self = with self; { }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.05"; + name = "Net-DNS-1.15"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "900198014110af96ebac34af019612dd2ddd6af30178600028c3c940d089d5c8"; + sha256 = "1ad46ba6438b846a94b4f50d53ecfda55f504a17e11b94effb087ff9329e61d0"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; @@ -10438,6 +11307,19 @@ let self = _self // overrides; _self = with self; { }; }; + NetDNSResolverMock = buildPerlPackage rec { + name = "Net-DNS-Resolver-Mock-1.20171219"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz; + sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9"; + }; + propagatedBuildInputs = [ NetDNS ]; + meta = { + description = "Mock a DNS Resolver object for testing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetDomainTLD = buildPerlPackage rec { name = "Net-Domain-TLD-1.75"; src = fetchurl { @@ -10451,11 +11333,24 @@ let self = _self // overrides; _self = with self; { }; }; + NetFastCGI = buildPerlPackage rec { + name = "Net-FastCGI-0.14"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz; + sha256 = "0sjrnlzci21sci5m52zz0x9bf889j67i6vnhrjlypsfm9w5914qi"; + }; + buildInputs = [ TestException TestHexString ]; + meta = { + description = "FastCGI Toolkit"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetHTTP = buildPerlPackage rec { - name = "Net-HTTP-6.12"; + name = "Net-HTTP-6.17"; src = fetchurl { url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; - sha256 = "8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6"; + sha256 = "1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611"; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; @@ -10464,9 +11359,10 @@ let self = _self // overrides; _self = with self; { description = "Low-level HTTP connection (client)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; - NetIDNEncode = buildPerlPackage { + NetIDNEncode = buildPerlModule { name = "Net-IDN-Encode-2.400"; src = fetchurl { url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz; @@ -10484,7 +11380,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GA/GANGLION/${name}.tar.gz"; sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912"; }; - buildInputs = [TestPod TestPodCoverage]; propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; meta = { description = "Not so simple IMAP client library"; @@ -10502,23 +11397,16 @@ let self = _self // overrides; _self = with self; { }; }; - NetLDAP = buildPerlPackage { - name = "Net-LDAP-0.4001"; - propagatedBuildInputs = [ ConvertASN1 ]; - src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/perl-ldap-0.4001.tar.gz; - sha256 = "0spwid70yxkh5zbad3ldw8yb2m5shkm59a7f0kllw8bb7ccczqps"; - }; - }; + NetLDAP = perlldap; - NetOAuth = buildPerlPackage { + NetOAuth = buildPerlModule { name = "Net-OAuth-0.28"; src = fetchurl { url = mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz; sha256 = "0k4h4a5048h7qgyx25ih64x0l4airx8a6d9gjq08wmxcl2fk3z3v"; }; - buildInputs = [ ModuleBuild TestWarn ]; - propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; + buildInputs = [ TestWarn ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWP ]; meta = { description = "An implementation of the OAuth protocol"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -10538,10 +11426,10 @@ let self = _self // overrides; _self = with self; { }; NetPing = buildPerlPackage { - name = "Net-Ping-2.41"; + name = "Net-Ping-2.66"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMPETERS/Net-Ping-2.41.tar.gz; - sha256 = "cbff21a8d323f235b70237c7ee56ffa5f22e87511e70608c027e2ec27fce47e0"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.66.tar.gz; + sha256 = "a477b29e543695343513e65f3aff885a353ecebb612741e79f0bad5622e4b9e4"; }; meta = { description = "Check a remote host for reachability"; @@ -10549,12 +11437,11 @@ let self = _self // overrides; _self = with self; { }; NetDNSResolverProgrammable = buildPerlPackage rec { - name = "Net-DNS-Resolver-Programmable-v0.003"; + name = "Net-DNS-Resolver-Programmable-0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMEHNLE/net-dns-resolver-programmable/${name}.tar.gz"; - sha256 = "8d402260941f259c83bf1b2564408e75288df028f604136c29da11a9a6a076ec"; + url = mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz; + sha256 = "8080a2ab776629585911af1179bdb7c4dc2bebfd4b5efd77b11d1dac62454bf8"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ NetDNS ]; meta = { description = "Programmable DNS resolver class for offline emulation of DNS"; @@ -10564,10 +11451,10 @@ let self = _self // overrides; _self = with self; { NetServer = buildPerlPackage { - name = "Net-Server-2.007"; + name = "Net-Server-2.009"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.007.tar.gz; - sha256 = "0a03m237cw6j5bvm2yxk2b2gbfx7wj0w2x5zivi9ddqvbcad6vqw"; + url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz; + sha256 = "0gw1k9gcw7habbkxvsfa2gz34brlbwcidk6khgsf1qjm0dbccrw2"; }; doCheck = false; # seems to hang waiting for connections meta = { @@ -10575,15 +11462,28 @@ let self = _self // overrides; _self = with self; { }; }; + NetServerCoro = buildPerlPackage rec { + name = "Net-Server-Coro-1.3"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz; + sha256 = "11pvfxsi0q37kd17z597wb8r9dv3r96fiagq57kc746k1lmp06hy"; + }; + propagatedBuildInputs = [ Coro NetServer ]; + meta = { + description = "A co-operative multithreaded server using Coro"; + license = with stdenv.lib.licenses; [ mit ]; + }; + }; + NetSMTP = libnet; NetSMTPSSL = buildPerlPackage { - name = "Net-SMTP-SSL-1.03"; + name = "Net-SMTP-SSL-1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz; - sha256 = "05y94mb1vdw32mvwb0cp2h4ggh32f8j8nwwfjb8kjwxvfkfhyp9h"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz; + sha256 = "001a6dcfahf7kkyirqkc8jd4fh4fkal7n7vm9c4dblqrvmdc8abv"; }; - propagatedBuildInputs = [IOSocketSSL]; + propagatedBuildInputs = [ IOSocketSSL ]; }; NetSMTPTLS = buildPerlPackage { @@ -10592,7 +11492,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz; sha256 = "19g48kabj22v66jbf69q78xplhi7r1y2kdbddfwh4xy3g9k75rzg"; }; - propagatedBuildInputs = [IOSocketSSL DigestHMAC]; + propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; }; NetSMTPTLSButMaintained = buildPerlPackage { @@ -10601,10 +11501,10 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz; sha256 = "0vi5cv7f9i96hgp3q3jpxzn1ysn802kh5xc304f8b7apf67w15bb"; }; - propagatedBuildInputs = [NetSSLeay DigestHMAC IOSocketSSL]; + propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; }; - NetSNMP = buildPerlPackage rec { + NetSNMP = buildPerlModule rec { name = "Net-SNMP-6.0.1"; src = fetchurl { url = "mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz"; @@ -10614,10 +11514,10 @@ let self = _self // overrides; _self = with self; { }; NetSSLeay = buildPerlPackage rec { - name = "Net-SSLeay-1.77"; + name = "Net-SSLeay-1.85"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKEM/${name}.tar.gz"; - sha256 = "06h6wbr923jxmazmv5shdg1767s7r60bvzcza52dk31yckks6l31"; + sha256 = "1j5h4ycm8538397l204d2d5fkm9595aj174pj7bkpbhwzfwqi0cx"; }; buildInputs = [ pkgs.openssl ]; doCheck = false; # Test performs network access. @@ -10635,10 +11535,10 @@ let self = _self // overrides; _self = with self; { }; NetStatsd = buildPerlPackage { - name = "Net-Statsd-0.11"; + name = "Net-Statsd-0.12"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.11.tar.gz; - sha256 = "0f56c95846c7e65e6d32cec13ab9df65716429141f106d2dc587f1de1e09e163"; + url = mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.12.tar.gz; + sha256 = "63e453603da165bc6d1c4ca0b55eda3d2204f040c59304a47782c5aa7886565c"; }; meta = { description = "Sends statistics to the stats daemon over UDP"; @@ -10658,14 +11558,14 @@ let self = _self // overrides; _self = with self; { }; }; - NetTwitterLite = buildPerlPackage { - name = "Net-Twitter-Lite-0.11002"; + NetTwitterLite = buildPerlModule { + name = "Net-Twitter-Lite-0.12008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.11002.tar.gz; - sha256 = "032gyn1h3r5d83wvz7nj3k7g50wcf73lbbmjc18466ml90vigys0"; + url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.12008.tar.gz; + sha256 = "13j69a6nqq8mh5b4qk021db55rkfnk1ppwk0rpg68b1z58gvxsmj"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ CryptSSLeay LWPUserAgent NetOAuth URI ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ JSON LWPProtocolHttps ]; doCheck = false; meta = { homepage = https://github.com/semifor/Net-Twitter-Lite; @@ -10694,6 +11594,18 @@ let self = _self // overrides; _self = with self; { }; }; + NumberMisc = buildPerlModule rec { + name = "Number-Misc-1.2"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz; + sha256 = "1n4ivj4ydplanwbxn3jbsfyfcl91ngn2d0addzqrq1hac26bdfbp"; + }; + meta = { + description = "Number::Misc - handy utilities for numbers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NTLM = buildPerlPackage rec { name = "NTLM-1.09"; src = fetchurl { @@ -10719,11 +11631,11 @@ let self = _self // overrides; _self = with self; { }; }; - ObjectInsideOut = buildPerlPackage { - name = "Object-InsideOut-3.98"; + ObjectInsideOut = buildPerlModule { + name = "Object-InsideOut-4.04"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-3.98.tar.gz; - sha256 = "1zxfm2797p8b9dsvnbgd6aa4mgpxqxjqzbpfbla1g7f9alxm9f1z"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.04.tar.gz; + sha256 = "01pncagr3k7yj0rn22xap08s17nw2p2ffcg6j00gs9fg4jv9pfmj"; }; propagatedBuildInputs = [ ExceptionClass ]; meta = { @@ -10781,7 +11693,7 @@ let self = _self // overrides; _self = with self; { }; # FIXME: try with libGL + libGLU instead of libGLU_combined - buildInputs = with pkgs; [ libGLU_combined libGLU freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; + buildInputs = with pkgs; [ pkgs.libGLU_combined pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -10798,28 +11710,29 @@ let self = _self // overrides; _self = with self; { }; NetOpenIDCommon = buildPerlPackage rec { - name = "Net-OpenID-Common-1.18"; + name = "Net-OpenID-Common-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; - sha256 = "13hy5j6hcggb4l2r4pnwdh30p20wwja0chpmqm8y6wnnsp1km07f"; + sha256 = "1jdbkp18ka2m4akjp9b0dbw2lqnzgwpq435cnh6hwwa79bbrfkmb"; }; - propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPMessage XMLSimple ]; + propagatedBuildInputs = [ CryptDHGMP XMLSimple ]; }; NetOpenIDConsumer = buildPerlPackage rec { - name = "Net-OpenID-Consumer-1.15"; + name = "Net-OpenID-Consumer-1.18"; src = fetchurl { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; - sha256 = "1nh9988436rmmmd6x2zz1fyrqy2005a1gvqzgvnc1pg2ylg61fqf"; + sha256 = "0f2g6sczvbpyjmy14pabmrj0d48hlsndqswrvmqk1161wxpkh70f"; }; - propagatedBuildInputs = [ CGI NetOpenIDCommon JSON LWP ]; + propagatedBuildInputs = [ JSON NetOpenIDCommon ]; + buildInputs = [ CGI ]; }; NetOpenSSH = buildPerlPackage rec { - name = "Net-OpenSSH-0.73"; + name = "Net-OpenSSH-0.77"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; - sha256 = "f45a54b3c6015d4dc44cbff9f9be57bc9d54dfb104fb38bcf3c4eb04789582d9"; + sha256 = "16e965c6ed3dfe0f1288a6ba932d0e8d5c7846ce86de05c0dbd64259df2a2477"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; @@ -10828,10 +11741,10 @@ let self = _self // overrides; _self = with self; { }; PackageConstants = buildPerlPackage { - name = "Package-Constants-0.04"; + name = "Package-Constants-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.04.tar.gz; - sha256 = "7e09a88da2c0df24f498eb3a133f7d979404a7bc853f21afa2ba68dfd859a880"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz; + sha256 = "0b58be78706ccc4e4bd9bbad41767470427fd7b2cfad749489de101f85bc5df5"; }; meta = { description = "List constants defined in a package"; @@ -10840,13 +11753,13 @@ let self = _self // overrides; _self = with self; { }; PackageDeprecationManager = buildPerlPackage rec { - name = "Package-DeprecationManager-0.16"; + name = "Package-DeprecationManager-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "4018a06f7a3ba252c9eccc3fdcad9490cd003dfa6baf261545e96b5a82e784a7"; + sha256 = "1d743ada482b5c9871d894966e87d4c20edc96931bb949fb2638b000ddd6684b"; }; buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName namespaceautoclean ]; + propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName ]; meta = { homepage = https://metacpan.org/release/Package-DeprecationManager; description = "Manage deprecation warnings for your distribution"; @@ -10857,7 +11770,7 @@ let self = _self // overrides; _self = with self; { PatchReader = buildPerlPackage rec { name = "PatchReader-0.9.6"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/T/TM/TMANNERM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz; sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c"; }; meta = { @@ -10873,7 +11786,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz; sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c"; }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; + buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; meta = { homepage = https://metacpan.org/release/Package-Stash; @@ -10888,7 +11801,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz; sha256 = "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13"; }; - buildInputs = [ TestRequires TestFatal ]; + buildInputs = [ TestFatal TestRequires ]; meta = { homepage = https://metacpan.org/release/Package-Stash-XS; description = "Faster and more correct implementation of the Package::Stash API"; @@ -10902,7 +11815,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "0wdcidnfnb6nm79fzfs39ivawj3x8m98a147fmcxgv1zvwia9c1l"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.pango ]; + buildInputs = [ pkgs.pango ]; propagatedBuildInputs = [ Cairo Glib ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; @@ -10927,10 +11840,10 @@ let self = _self // overrides; _self = with self; { }; ParallelPrefork = buildPerlPackage { - name = "Parallel-Prefork-0.17"; + name = "Parallel-Prefork-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.17.tar.gz; - sha256 = "0d81de2632281091bd31297de1906e14cae4e845cf32200953b50406859e763b"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz; + sha256 = "f1c1f48f1ae147a58bc88f9cb2f570d6bb15ea4c0d589abd4c3084ddc961596e"; }; buildInputs = [ TestRequires TestSharedFork ]; propagatedBuildInputs = [ ClassAccessorLite ListMoreUtils ProcWait3 ScopeGuard SignalMask ]; @@ -10940,13 +11853,12 @@ let self = _self // overrides; _self = with self; { }; }; - ParamsClassify = buildPerlPackage rec { - name = "Params-Classify-0.013"; + ParamsClassify = buildPerlModule rec { + name = "Params-Classify-0.015"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Params/${name}.tar.gz"; - sha256 = "1d4ysd95flszrxrnjgy6s7b80jkagjsb939h42i2hix4q20sy0a1"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz; + sha256 = "052r198xyrsv8wz21gijdigz2cgnidsa37nvyfzdiz4rv1fc33ir"; }; - buildInputs = [ ModuleBuild ExtUtilsParseXS ]; }; ParamsUtil = buildPerlPackage { @@ -10963,12 +11875,12 @@ let self = _self // overrides; _self = with self; { }; ParamsValidate = buildPerlModule rec { - name = "Params-Validate-1.24"; + name = "Params-Validate-1.29"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1e1576f16e6e01ba63aa73775da563b410b49f26ee44169a45280feb958a5f0d"; + sha256 = "49a68dfb430bea028042479111d19068e08095e5a467e320b7ab7bde3d729733"; }; - buildInputs = [ ModuleBuild TestFatal TestRequires ]; + buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; perlPreHook = "export LD=$CC"; meta = { @@ -10978,6 +11890,21 @@ let self = _self // overrides; _self = with self; { }; }; + ParamsValidationCompiler = buildPerlPackage rec { + name = "Params-ValidationCompiler-0.27"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.27.tar.gz; + sha256 = "1cpr188c2xm0kkmdir6slcsgv7v6ibqff4lax8s0whwx6ml9kaah"; + }; + propagatedBuildInputs = [ EvalClosure ExceptionClass ]; + buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestSimple13 TestWithoutModule ]; + meta = { + description = "Build an optimized subroutine parameter validator once, use it forever"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "http://metacpan.org/release/Params-ValidationCompiler"; + }; + }; + PARDist = buildPerlPackage { name = "PAR-Dist-0.49"; src = fetchurl { @@ -10989,11 +11916,26 @@ let self = _self // overrides; _self = with self; { }; }; + PAUSEPermissions = buildPerlPackage rec { + name = "PAUSE-Permissions-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz; + sha256 = "021ink414w4mdk6rd54cc1f23kfqg0zk4njx4ngr0bw3wc6r4kks"; + }; + propagatedBuildInputs = [ FileHomeDir HTTPDate MooXOptions TimeDurationParse ]; + buildInputs = [ PathTiny ]; + meta = { + description = "interface to PAUSE's module permissions file (06perms.txt)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/PAUSE-Permissions"; + }; + }; + Parent = buildPerlPackage { - name = "parent-0.228"; + name = "parent-0.236"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz; - sha256 = "0w0i02y4z8465z050kml57mvhv7c5gl8w8ivplhr3cms0zbaq87b"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.236.tar.gz; + sha256 = "0yhjps1fprifhvzdwwl09bp1ngyqx85rvyn96j34papn0jypx0rd"; }; }; @@ -11017,15 +11959,41 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JA/JAYBONCI/${name}.tar.gz"; sha256 = "0ad78qri4sg9agghqdm83xsjgks94yvffs23kppy7mqjy8gwwjxn"; }; - buildInputs = [ TestPod LWPUserAgent ]; - propagatedBuildInputs = [ IOStringy ]; + propagatedBuildInputs = [ IOStringy LWP ]; meta = with stdenv.lib; { homepage = http://search.cpan.org/~jaybonci/Parse-DebControl; license = with licenses; [ artistic1 gpl1Plus ]; }; }; - ParseRecDescent = buildPerlPackage rec { + ParseLocalDistribution = buildPerlPackage rec { + name = "Parse-LocalDistribution-0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz; + sha256 = "17p92nj4k3acrqqjnln1j5x8hbra9jkx5hdcybrq37ld9qnc62vb"; + }; + propagatedBuildInputs = [ ParsePMFile ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "parses local .pm files as PAUSE does"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ParsePMFile = buildPerlPackage rec { + name = "Parse-PMFile-0.41"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.41.tar.gz; + sha256 = "1ffv9msp4xjfaylay2zfqangxhgyr5xk993k5n1k08hh6qagq8df"; + }; + buildInputs = [ ExtUtilsMakeMakerCPANfile ]; + meta = { + description = "parses .pm file as PAUSE does"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ParseRecDescent = buildPerlModule rec { name = "Parse-RecDescent-1.967015"; src = fetchurl { url = "mirror://cpan/authors/id/J/JT/JTBRAUN/${name}.tar.gz"; @@ -11045,11 +12013,11 @@ let self = _self // overrides; _self = with self; { }; }; - PathClass = buildPerlPackage { - name = "Path-Class-0.33"; + PathClass = buildPerlModule { + name = "Path-Class-0.37"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.33.tar.gz; - sha256 = "0xy6s04xpslpzbb90x67yvfv0pjqnj1szxlx16vfx690iskcd36d"; + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz; + sha256 = "1kj8q8dmd8jci94w5arav59nkp0pkxrkliz4n8n6yf02hsa82iv5"; }; meta = { description = "Cross-platform path specification manipulation"; @@ -11063,8 +12031,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz; sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef"; }; - buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ]; - propagatedBuildInputs = [ autodie ]; meta = { homepage = https://metacpan.org/release/Path-Tiny; description = "File path utility"; @@ -11125,10 +12091,10 @@ let self = _self // overrides; _self = with self; { }; Pegex = buildPerlPackage rec { - name = "Pegex-0.60"; + name = "Pegex-0.64"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "317347f8c6355e886d87aef4c30fb4cb6cfa3e46adf62f59e6141ec05a97f2cf"; + sha256 = "27e00264bdafb9c2109212b9654542032617fecf7b7814915d2bdac198f067cd"; }; buildInputs = [ FileShareDirInstall YAMLLibYAML ]; meta = { @@ -11165,8 +12131,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; sha256 = "0662e8f02dd78e39ee9d5b01bdf5376a7cc70ce2b0edc9ca015be35e6cb61df6"; }; - buildInputs = [ ModuleBuild TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ]; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress FileHomeDir ModulePluggable PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; @@ -11175,18 +12141,18 @@ let self = _self // overrides; _self = with self; { }; PerlIOeol = buildPerlPackage rec { - name = "PerlIO-eol-0.16"; + name = "PerlIO-eol-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "159zrrf44469sjklsi0pb4c005q74d9242q7mqawvbwnxjqbh0a5"; + sha256 = "1fayp27vcmypqyzcd4003036h3g5zy6jk1ia25frdca58pzcpk6f"; }; }; PerlIOutf8_strict = buildPerlPackage rec { - name = "PerlIO-utf8_strict-0.006"; + name = "PerlIO-utf8_strict-0.007"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "980010e624c43be0a2aac8e1fe5db3fe43035940def75ca70401bb1ca98bd562"; + sha256 = "83a33f2fe046cb3ad6afc80790635a423e2c7c6854afacc6998cd46951cc81cb"; }; buildInputs = [ TestException ]; meta = { @@ -11230,13 +12196,13 @@ let self = _self // overrides; _self = with self; { ''; }; - PerlIOviaTimeout = buildPerlPackage rec { + PerlIOviaTimeout = buildPerlModule rec { name = "PerlIO-via-Timeout-0.32"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; sha256 = "9278f9ef668850d913d98fa4c0d7e7d667cff3503391f4a4eae73a246f2e7916"; }; - buildInputs = [ ModuleBuildTiny TestTCP ]; + buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; meta = { description = "A PerlIO layer that adds read & write timeout to a handle"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11244,6 +12210,22 @@ let self = _self // overrides; _self = with self; { }; }; + perlldap = buildPerlPackage rec { + name = "perl-ldap-0.65"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MARSCHAP/${name}.tar.gz"; + sha256 = "5f57dd261dc16ebf942a272ddafe69526598df71151a51916edc37a4f2f23834"; + }; + buildInputs = [ TextSoundex ]; + propagatedBuildInputs = [ ConvertASN1 ]; + meta = { + homepage = http://ldap.perl.org/; + description = "LDAP client library"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + PerlMagick = buildPerlPackage rec { name = "PerlMagick-6.89-1"; src = fetchurl { @@ -11259,18 +12241,18 @@ let self = _self // overrides; _self = with self; { }; PerlOSType = buildPerlPackage rec { - name = "Perl-OSType-1.009"; + name = "Perl-OSType-1.010"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "01mfvh6x9mgfnwb31bmaw0jkqkxbl8gn50mwqgjwajk1yz4z8p14"; + sha256 = "1ch36kfjwm229xicb9k7b9fhisy58ihdr16vm8iwniymnna4kvg7"; }; }; PerlTidy = buildPerlPackage rec { - name = "Perl-Tidy-20160302"; + name = "Perl-Tidy-20180220"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; - sha256 = "6dd04ed8c315bcfea8fe713de8f9de68955795b6864f3be6c177e802fd30dca7"; + sha256 = "e9973ce28b7518108c1e68fa767c6566822480e739df275375a0dfcc9c2b3370"; }; meta = { description = "Indent and reformat perl scripts"; @@ -11305,13 +12287,13 @@ let self = _self // overrides; _self = with self; { }; Plack = buildPerlPackage rec { - name = "Plack-1.0039"; + name = "Plack-1.0047"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "d24a572e88644c7d39c7e6ff1af005b728dec94a878cf06d9027ab7d1a2fd0a9"; + sha256 = "322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561"; }; - buildInputs = [ FileShareDirInstall TestRequires ]; - propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPBody HTTPHeadersFast HTTPMessage HashMultiValue StreamBuffered TestTCP TryTiny URI ]; + buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; + propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPEntityParser HTTPHeadersFast HTTPMessage TryTiny ]; meta = { homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; @@ -11319,14 +12301,58 @@ let self = _self // overrides; _self = with self; { }; }; + PlackAppProxy = buildPerlPackage rec { + name = "Plack-App-Proxy-0.29"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz; + sha256 = "03x6yb6ykz1ms90jp1s0pq19yplf7wswljvhzqkr16jannfrmah4"; + }; + propagatedBuildInputs = [ AnyEventHTTP LWP Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "proxy requests"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + PlackMiddlewareAuthDigest = buildPerlModule rec { + name = "Plack-Middleware-Auth-Digest-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz; + sha256 = "1sqm23kfsl3ac4060zcclc3r86x1vxzhsgvgzg6mxk9njj93zgcs"; + }; + propagatedBuildInputs = [ DigestHMAC Plack ]; + buildInputs = [ LWP ModuleBuildTiny TestSharedFork TestTCP ]; + meta = { + description = "Digest authentication"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Plack-Middleware-Auth-Digest"; + }; + }; + + PlackMiddlewareConsoleLogger = buildPerlModule rec { + name = "Plack-Middleware-ConsoleLogger-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz; + sha256 = "1ngvhwdw9ll4cwnvf0i89ppa9pbyiwng6iba04scrqjda353lrsm"; + }; + propagatedBuildInputs = [ JavaScriptValueEscape Plack ]; + buildInputs = [ ModuleBuildTiny TestRequires ]; + meta = { + description = "Write logs to Firebug or Webkit Inspector"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Plack-Middleware-ConsoleLogger"; + }; + }; + PlackMiddlewareDebug = buildPerlModule rec { - name = "Plack-Middleware-Debug-0.16"; + name = "Plack-Middleware-Debug-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "e1e4ff6e9b246fe67547ebac8a3e83d4ae77873f889d1f63411c21c8c6bf96d5"; + sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; - propagatedBuildInputs = [ ClassMethodModifiers DataDump FileShareDir Plack TextMicroTemplate ]; + propagatedBuildInputs = [ ClassMethodModifiers DataDump DataDumperConcise Plack TextMicroTemplate ]; meta = { homepage = https://github.com/miyagawa/Plack-Middleware-Debug; description = "Display information about the current request/response"; @@ -11334,13 +12360,26 @@ let self = _self // overrides; _self = with self; { }; }; + PlackMiddlewareDeflater = buildPerlPackage rec { + name = "Plack-Middleware-Deflater-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz; + sha256 = "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"; + }; + propagatedBuildInputs = [ Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "Compress response body with Gzip or Deflate"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PlackMiddlewareFixMissingBodyInRedirect = buildPerlPackage rec { name = "Plack-Middleware-FixMissingBodyInRedirect-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SW/SWEETKID/${name}.tar.gz"; sha256 = "6c22d069f5a57ac206d4659b28b8869bb9270640bb955efddd451dcc58cdb391"; }; - buildInputs = [ HTTPMessage Plack ]; propagatedBuildInputs = [ HTMLParser Plack ]; meta = { homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect; @@ -11349,13 +12388,25 @@ let self = _self // overrides; _self = with self; { }; }; + PlackMiddlewareHeader = buildPerlPackage rec { + name = "Plack-Middleware-Header-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz; + sha256 = "0pjxxbnilphn38s3mmv0fmg9q2hm4z02ngp2a1lxblzjfbzvkdjy"; + }; + propagatedBuildInputs = [ Plack ]; + meta = { + description = "modify HTTP response headers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PlackMiddlewareMethodOverride = buildPerlPackage rec { name = "Plack-Middleware-MethodOverride-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; sha256 = "2b4a6e67006f97a2b4cf7980900f6a8ababb1cf97d6597319f9897ada3c555bc"; }; - buildInputs = [ Plack URI ]; propagatedBuildInputs = [ Plack ]; meta = { description = "Override REST methods to Plack apps via POST"; @@ -11364,12 +12415,11 @@ let self = _self // overrides; _self = with self; { }; PlackMiddlewareRemoveRedundantBody = buildPerlPackage { - name = "Plack-Middleware-RemoveRedundantBody-0.05"; + name = "Plack-Middleware-RemoveRedundantBody-0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.05.tar.gz; - sha256 = "a0676e1c792bea7f25f1d901bee59054d35012d5ea8cd42529d336143fa87cd8"; + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.07.tar.gz; + sha256 = "64b841d5d74b4c4a595b85749d69297f4f5f5c0829a6e99e0099f05dd69be3c3"; }; - buildInputs = [ HTTPMessage Plack ]; propagatedBuildInputs = [ Plack ]; meta = { homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody; @@ -11391,14 +12441,29 @@ let self = _self // overrides; _self = with self; { }; }; + PlackMiddlewareSession = buildPerlModule rec { + name = "Plack-Middleware-Session-0.30"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.30.tar.gz; + sha256 = "0cwlhfj1644jq8axv4cghsqqjsx2y7hj7g0y5l179fcgmbp2ndzf"; + }; + propagatedBuildInputs = [ DigestHMAC DigestSHA1 Plack ]; + buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; + meta = { + description = "Middleware for session management"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/plack/Plack-Middleware-Session"; + }; + }; + PlackTestExternalServer = buildPerlPackage rec { name = "Plack-Test-ExternalServer-0.02"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "5baf5c57fe0c06412deec9c5abe7952ab8a04f8c47b4bbd8e9e9982268903ed0"; }; - buildInputs = [ HTTPMessage Plack TestTCP ]; - propagatedBuildInputs = [ LWP URI ]; + buildInputs = [ Plack TestSharedFork TestTCP ]; + propagatedBuildInputs = [ LWP ]; meta = { homepage = https://github.com/perl-catalyst/Plack-Test-ExternalServer; description = "Run HTTP tests on external live servers"; @@ -11448,11 +12513,7 @@ let self = _self // overrides; _self = with self; { # N.B. removing TestPodLinkCheck from buildInputs because tests requiring # this module don't disable themselves when "run_network_tests" is # not present (see below). - buildInputs = [ - Curses EmailMIME HTTPMessage IOTty LWPProtocolHttps POETestLoops - TermReadKey TestPod TestPodCoverage TestPodNo404s YAML - ]; - propagatedBuildInputs = [ pkgs.cacert IOPipely ]; + propagatedBuildInputs = [ pkgs.cacert IOPipely IOTty POETestLoops ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "Portable multitasking and networking framework for any event loop"; @@ -11482,8 +12543,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RC/RCAPUTO/${name}.tar.gz"; sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "Reusable tests for POE::Loop authors"; @@ -11511,27 +12570,27 @@ let self = _self // overrides; _self = with self; { }; }; - PPIxRegexp = buildPerlPackage rec { - name = "PPIx-Regexp-0.050"; + PPIxRegexp = buildPerlModule rec { + name = "PPIx-Regexp-0.056"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "fd095fb90826efa3f9b28bf018a099dc51f1d7c7d34ed2f193a28f1087635125"; + sha256 = "37992de526a368d120506e8c6c0498266e4de81942658cf0af1db89b12302f15"; }; - propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; + propagatedBuildInputs = [ PPI ]; meta = { description = "Parse regular expressions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - PPIxUtilities = buildPerlPackage { + PPIxUtilities = buildPerlModule { name = "PPIx-Utilities-1.001000"; src = fetchurl { url = mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz; sha256 = "03a483386fd6a2c808f09778d44db06b02c3140fb24ba4bf12f851f46d3bcb9b"; }; - buildInputs = [ PPI TestDeep ]; - propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ]; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ ExceptionClass PPI Readonly ]; meta = { description = "Extensions to L<PPI|PPI>"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11549,10 +12608,10 @@ let self = _self // overrides; _self = with self; { }; ProcProcessTable = buildPerlPackage { - name = "Proc-ProcessTable-0.51"; + name = "Proc-ProcessTable-0.55"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.51.tar.gz; - sha256 = "66636e102985a2a05ef4334b53a7893d627c192fac5dd7ff37dd1a0a50c0128d"; + url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.55.tar.gz; + sha256 = "3b9660d940a0c016c5e48108fa9dbf9f30492b505aa0a26d22b09554f05714f5"; }; meta = { description = "Perl extension to access the unix process table"; @@ -11609,17 +12668,17 @@ let self = _self // overrides; _self = with self; { ProcWaitStat = buildPerlPackage rec { name = "Proc-WaitStat-1.00"; src = fetchurl { - url = "mirror://cpan//authors/id/R/RO/ROSCH/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz; sha256 = "1g3l8jzx06x4l4p0x7fyn4wvg6plfzl420irwwb9v447wzsn6xfh"; }; propagatedBuildInputs = [ IPCSignal ]; }; ProtocolWebSocket = buildPerlModule rec { - name = "Protocol-WebSocket-0.20"; + name = "Protocol-WebSocket-0.24"; src = fetchurl { url = "mirror://cpan/authors/id/V/VT/VTI/${name}.tar.gz"; - sha256 = "00ga7sjrqcbr46kwfbaa37lxqqbp9z5gymjckzps6ll2jf7k58mx"; + sha256 = "1w0l9j1bnmw82jfhrx5yfw4hbl0bpcwmrl5laa1gz06mkzkdpa6z"; }; buildInputs = [ ModuleBuildTiny ]; }; @@ -11631,8 +12690,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CR/CRUX/${name}.tar.gz"; sha256 = "06y1djgzbn340hixav85728dvp8mj2mx2qf5fzkqxh145g5q860g"; }; - buildInputs = [ ModuleBuildTiny TestLeakTrace TestTCP ]; - propagatedBuildInputs = [ AnyEvent NetSSLeay ]; + buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ]; }; PSGI = buildPerlPackage rec { @@ -11644,10 +12702,10 @@ let self = _self // overrides; _self = with self; { }; PadWalker = buildPerlPackage rec { - name = "PadWalker-2.2"; + name = "PadWalker-2.3"; src = fetchurl { url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz"; - sha256 = "fc1df2084522e29e892da393f3719d2c1be0da022fdd89cff4b814167aecfea3"; + sha256 = "2a6c44fb600861e54568e74081a8d1f121f0060076069ceab34b1ae89d6588cf"; }; }; @@ -11666,7 +12724,7 @@ let self = _self // overrides; _self = with self; { sha256 = "478b5824791b87fc74c94a892180682bd06ad2cdf34034b1a4b859273927802a"; }; buildInputs = [ TestScript ]; - propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ]; + propagatedBuildInputs = [ FileFindRulePerl PerlCritic ]; meta = { homepage = https://github.com/neilbowers/Perl-MinimumVersion; description = "Find a minimum required version of perl for Perl code"; @@ -11680,8 +12738,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; - buildInputs = [ PPI TryTiny ]; - propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Perl-PrereqScanner; description = "A tool to scan your Perl code for its prerequisites"; @@ -11703,10 +12760,10 @@ let self = _self // overrides; _self = with self; { }; PodChecker = buildPerlPackage { - name = "Pod-Checker-1.71"; + name = "Pod-Checker-1.73"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.71.tar.gz; - sha256 = "4b90e745f4d6357bb7e8999e0e7d192216b98e3f3c8a86fa6ed446f8c36601df"; + url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz; + sha256 = "7dee443b03d80d0735ec50b6d1caf0209c51ab0a97d64050cfc10e1555cb9305"; }; }; @@ -11716,14 +12773,14 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh"; }; - propagatedBuildInputs = [DevelSymdump]; + propagatedBuildInputs = [ DevelSymdump ]; }; PodCoverageTrustPod = buildPerlPackage { - name = "Pod-Coverage-TrustPod-0.100003"; + name = "Pod-Coverage-TrustPod-0.100005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100003.tar.gz; - sha256 = "19lyc5a5hg3pqhw0k5fnd0q4l2mrdq0ck4kw1smjvwkccp24431z"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz; + sha256 = "08bk6lfimr2pwi6c92xg5cw1cxmi5fqhls3yasqzpjnd4if86s3c"; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { @@ -11740,7 +12797,7 @@ let self = _self // overrides; _self = with self; { sha256 = "43625cde7241fb174ad9c7eb45387fba410dc141d7de2323855eeab3590072c9"; }; buildInputs = [ TestDeep TestDifferences ]; - propagatedBuildInputs = [ ClassLoad MixinLinewise Moose MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods namespaceautoclean ]; + propagatedBuildInputs = [ MooseXTypes PodEventual StringRewritePrefix StringTruncate ]; meta = { homepage = https://github.com/rjbs/Pod-Elemental; description = "Work with nestable Pod elements"; @@ -11754,8 +12811,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "09fd3b5d53119437a01dced66b42eafdcd53895b3c32a2b0f781f36fda0f665b"; }; - buildInputs = [ Moose PodElemental ]; - propagatedBuildInputs = [ Moose PPI PodElemental namespaceautoclean ]; + buildInputs = [ TestDifferences ]; + propagatedBuildInputs = [ PPI PodElemental ]; meta = { homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; description = "A thing that takes a string of Perl and rewrites its documentation"; @@ -11773,16 +12830,17 @@ let self = _self // overrides; _self = with self; { }; PodEventual = buildPerlPackage { - name = "Pod-Eventual-0.093330"; + name = "Pod-Eventual-0.094001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.093330.tar.gz; - sha256 = "29de14a69df8a26f7e8ff73daca5afa7acc84cc9b7ae28093a5b1af09a4830b6"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz; + sha256 = "be9fb8910b108e5d1a66f002b659ad22576e88d779b703dff9d15122c3f80834"; }; - propagatedBuildInputs = [ MixinLinewise TestDeep ]; + propagatedBuildInputs = [ MixinLinewise ]; meta = { description = "Read a POD document as a series of trivial events"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDeep ]; }; PodParser = buildPerlPackage { @@ -11818,7 +12876,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; sha256 = "ccb42272c7503379cb1131394620ee50276d72844e0e80eb4b007a9d58f87623"; }; - buildInputs = [ TestMore ]; propagatedBuildInputs = [ PodPOM ]; meta = { description = "Generate the TOC of a POD with Pod::POM"; @@ -11833,8 +12890,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${name}.tar.gz"; sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ self."if" ]; meta = { homepage = https://github.com/timj/perl-Pod-LaTeX/tree/master; description = "Convert Pod data to formatted Latex"; @@ -11843,10 +12898,10 @@ let self = _self // overrides; _self = with self; { }; podlators = buildPerlPackage rec { - name = "podlators-4.06"; + name = "podlators-4.10"; src = fetchurl { url = "mirror://cpan/authors/id/R/RR/RRA/${name}.tar.gz"; - sha256 = "0fsb1k88fsqwgmk5fkcz57jf27g6ip4ncikawslm596d1si2h48a"; + sha256 = "008b4j41ijrfyyq5nd3y7pqyww6rg49fjg2c6kmpnqrmgs347qqp"; }; meta = { description = "Convert POD data to various other formats"; @@ -11855,12 +12910,12 @@ let self = _self // overrides; _self = with self; { }; podlinkcheck = buildPerlPackage rec { - name = "podlinkcheck-14"; + name = "podlinkcheck-15"; src = fetchurl { url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; - sha256 = "8ad152bdffbb7f5080616c0c0ae142f75b4c1255ed82b9cd80a5f4e3172fed3d"; + sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db"; }; - propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constantdefer libintlperl ]; + propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constant-defer libintl_perl ]; meta = { homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; description = "Check POD L<> link references"; @@ -11868,11 +12923,11 @@ let self = _self // overrides; _self = with self; { }; }; - PodPerldoc = buildPerlPackage { - name = "Pod-Perldoc-3.25"; + PodPerldoc = buildPerlPackage rec { + name = "Pod-Perldoc-3.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MALLEN/Pod-Perldoc-3.25.tar.gz; - sha256 = "f1a4b3ac7aa244485456b0e8733c773bbb39ae35b01a59515f6cba6bbe293a84"; + url = "mirror://cpan/authors/id/M/MA/MALLEN/${name}.tar.gz"; + sha256 = "0kf6xwdha8jl0nxv60r2v7xsfnvv6i3gy135xsl40g71p02ychfc"; }; meta = { description = "Look up Perl documentation in Pod format"; @@ -11893,10 +12948,10 @@ let self = _self // overrides; _self = with self; { }; PodMarkdown = buildPerlPackage { - name = "Pod-Markdown-2.000"; + name = "Pod-Markdown-3.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-2.000.tar.gz; - sha256 = "0qix7gmrc2ypm5dl1w5ajnjy32xlmy73wb3zycc1pxl5lipigsx8"; + url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.005.tar.gz; + sha256 = "00s3745kl4vbxqyi2lx149q5ghyfazc4fd00kcpl84bb87jfgdzq"; }; buildInputs = [ TestDifferences ]; meta = { @@ -11906,30 +12961,58 @@ let self = _self // overrides; _self = with self; { }; }; + PodMarkdownGithub = buildPerlPackage rec { + name = "Pod-Markdown-Github-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.03.tar.gz; + sha256 = "0y555pb78j0lz24kdgiwkmk1vcv4lg3a3mvnw9vm2qqnkp7p0nag"; + }; + propagatedBuildInputs = [ PodMarkdown ]; + buildInputs = [ TestDifferences ]; + meta = { + description = "Convert POD to Github's specific markdown"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodSimple = buildPerlPackage { - name = "Pod-Simple-3.05"; + name = "Pod-Simple-3.35"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARANDAL/Pod-Simple-3.05.tar.gz; - sha256 = "1j0kqcvr9ykcqlkr797j1npkbggykb3p4w5ri73s8mi163lzxkqb"; + url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.35.tar.gz; + sha256 = "0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr"; }; - propagatedBuildInputs = [constant PodEscapes]; + propagatedBuildInputs = [ TextTabsWrap ]; }; PodSpell = buildPerlPackage rec { - name = "Pod-Spell-1.01"; + name = "Pod-Spell-1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBURKE/${name}.tar.gz"; - sha256 = "938648dca5b62e591783347f9d4d4e2a5239f9629c6adfed9a581b9457ef7d2e"; + url = mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz; + sha256 = "6383f7bfe22bc0d839a08057a0ce780698b046184aea935be4833d94986dd03c"; }; + propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny ]; + buildInputs = [ FileShareDirInstall TestDeep ]; + }; + + PodStrip = buildPerlModule rec { + name = "Pod-Strip-1.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz; + sha256 = "1zsjfw2cjq1bd3ppl67fdvrx46vj9lina0c3cv9qgk5clzvaq3fq"; + }; + meta = { + description = "Remove POD from Perl code"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; PodUsage = buildPerlPackage { - name = "Pod-Usage-1.67"; + name = "Pod-Usage-1.69"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.67.tar.gz; - sha256 = "c8be6d29b0dfe304c4ddfcc140f93d4c4de7a8362ea6e2651611c288b53cc68a"; + url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.69.tar.gz; + sha256 = "1a920c067b3c905b72291a76efcdf1935ba5423ab0187b9a5a63cfc930965132"; }; - propagatedBuildInputs = [ perl ]; + propagatedBuildInputs = [ podlators ]; meta = { description = "Pod::Usage extracts POD documentation and shows usage information"; }; @@ -11942,7 +13025,7 @@ let self = _self // overrides; _self = with self; { sha256 = "5af25b29a55783e495a9df5ef6293240e2c9ab02764613d79f1ed50b12dec5ae"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; - propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli PodElemental ]; meta = { homepage = https://github.com/rjbs/Pod-Weaver; description = "Weave together a Pod document from an outline"; @@ -11960,10 +13043,10 @@ let self = _self // overrides; _self = with self; { }; POSIXstrftimeCompiler = buildPerlModule rec { - name = "POSIX-strftime-Compiler-0.41"; + name = "POSIX-strftime-Compiler-0.42"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "670b89e11500f3808c9e21b1c300089622f68906ff12b1cbfba8e30d3a1c3739"; + sha256 = "26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11"; }; # We cannot change timezones on the fly. prePatch = "rm t/04_tzset.t"; @@ -11986,6 +13069,7 @@ let self = _self // overrides; _self = with self; { description = "Collaborative, content-based spam filtering network agent"; license = stdenv.lib.licenses.mit; }; + doCheck = false; }; @@ -12010,9 +13094,10 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; sha256 = "8ae5c4e85299e5c8bddd1b196f2eea38f00709e0dc0cb60454dc9114ae3fff0d"; }; + propagatedBuildInputs = [ Readonly ]; }; - Redis = buildPerlPackage rec { + Redis = buildPerlModule rec { name = "Redis-1.991"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; @@ -12030,18 +13115,18 @@ let self = _self // overrides; _self = with self; { }; RegexpAssemble = buildPerlPackage rec { - name = "Regexp-Assemble-0.35"; + name = "Regexp-Assemble-0.38"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Regexp/${name}.tar.gz"; - sha256 = "1msxrriq74q8iacn2hkcw6g4qjjwv777avryiyz1w29h55mwq083"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Regexp-Assemble-0.38.tgz; + sha256 = "0hp4v8mghmpflq9l9fqrkjg4cw0d3ha2nrmnsnzwjwqvmvwyfsx0"; }; }; RegexpCommon = buildPerlPackage { - name = "Regexp-Common-2013031301"; + name = "Regexp-Common-2017060201"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2013031301.tar.gz; - sha256 = "729a8198d264aa64ecbb233ff990507f97fbb66bda746b95f3286f50f5f25c84"; + url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz; + sha256 = "ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b"; }; meta = with stdenv.lib; { description = "Provide commonly requested regular expressions"; @@ -12069,11 +13154,11 @@ let self = _self // overrides; _self = with self; { }; }; - RegexpGrammars = buildPerlPackage rec { - name = "Regexp-Grammars-1.045"; + RegexpGrammars = buildPerlModule rec { + name = "Regexp-Grammars-1.048"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; - sha256 = "8ab001f5641d03f7acce09ca5826b219b02ce40f8e56c2066737228a9232b594"; + sha256 = "d7718d9bb0d4259eabf326838e3f841b440c4e959faf9615d9ad9c345f4a3d6f"; }; meta = { homepage = http://search.cpan.org/~dconway/Regexp-Grammars-1.045/lib/Regexp/Grammars.pm; @@ -12094,10 +13179,10 @@ let self = _self // overrides; _self = with self; { }; RegexpParser = buildPerlPackage { - name = "Regexp-Parser-0.21"; + name = "Regexp-Parser-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.21.tar.gz; - sha256 = "d70cb66821f1f67a9b1ff53f0fa33c06aec8693791e0a5943be6760c25d2768d"; + url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.22.tar.gz; + sha256 = "d6d3c711657a380f1cb24d8b54a1cd20f725f7f54665189e9e67bb0b877109a3"; }; meta = { homepage = http://wiki.github.com/toddr/Regexp-Parser; @@ -12106,13 +13191,13 @@ let self = _self // overrides; _self = with self; { }; }; - RESTUtils = buildPerlPackage { + RESTUtils = buildPerlModule { name = "REST-Utils-0.6"; src = fetchurl { url = mirror://cpan/authors/id/J/JA/JALDHAR/REST-Utils-0.6.tar.gz; sha256 = "1zdrf3315rp2b8r9dwwj5h93xky7i33iawf4hzszwcddhzflmsfl"; }; - buildInputs = [ TestWWWMechanizeCGI ]; + buildInputs = [ TestLongString TestWWWMechanize TestWWWMechanizeCGI ]; meta = { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; @@ -12123,24 +13208,24 @@ let self = _self // overrides; _self = with self; { }; RpcXML = buildPerlPackage { - name = "RPC-XML-0.78"; + name = "RPC-XML-0.80"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.78.tar.gz; - sha256 = "0spci3sj2hq9k916sk9k2gchqrbnz9lwmlcnwf1k33wzl8j2gh52"; + url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz; + sha256 = "1xvy9hs7bqsjnk0663kf7zk2qjg0pzv96n6z2wlc2w5bgal7q3ga"; }; - propagatedBuildInputs = [LWP XMLLibXML XMLParser]; + propagatedBuildInputs = [ XMLParser ]; doCheck = false; }; ReturnValue = buildPerlPackage { - name = "Return-Value-1.666004"; + name = "Return-Value-1.666005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666004.tar.gz; - sha256 = "0xr7ic212p36arzdpph2l2yy1y88c7qaf4nng3gqb29zc9kzy3bc"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz; + sha256 = "1b2hfmdl19zi1z3npzv9wf6dh1g0xd88i70b4233ds9icnln08lf"; }; }; - RoleBasic = buildPerlPackage { + RoleBasic = buildPerlModule { name = "Role-Basic-0.13"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz; @@ -12158,8 +13243,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz; sha256 = "1lylfvarjfy6wy34dfny3032pc6r33mjby5yzzhmxybg8zhdp9pn"; }; - buildInputs = [ Moose ]; - propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ]; + propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; meta = { description = "A thing with a message method"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12172,7 +13256,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz; sha256 = "1bbkj2wqpbfdw1cbm99vg9d94rvzba19m18xhnylaym0l78lc4sn"; }; - buildInputs = [ Moose ]; propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; @@ -12194,26 +13277,26 @@ let self = _self // overrides; _self = with self; { }; RSSParserLite = buildPerlPackage { - name = "RSS-Parser-Lite-0.10"; + name = "RSS-Parser-Lite-0.12"; src = fetchurl { - url = mirror://cpan/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz; - sha256 = "1spvi0z62saz2cam8kwk2k561aavw2w42g3ykj38w1kmydvsk8z6"; + url = mirror://cpan/authors/id/T/TF/TFPBL/RSS-Parser-Lite-0.12.tar.gz; + sha256 = "1fcmp4qp7q3xr2mw7clqqwph45icbvgfs2n41gp9zamim2y39p49"; }; - propagatedBuildInputs = [ SOAPLite ]; + propagatedBuildInputs = [ locallib ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + doCheck = false; }; RTClientREST = buildPerlPackage { - name = "RT-Client-REST-0.49"; + name = "RT-Client-REST-0.51"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMITRI/RT-Client-REST-0.49.tar.gz; - sha256 = "832c84b4f19e97781e8902f123a659fdcfef68e0ed9cfe09055852e9d68f7afc"; + url = mirror://cpan/authors/id/D/DM/DMITRI/RT-Client-REST-0.51.tar.gz; + sha256 = "6a9df61c7f209f634613a8824393932d2faf2497b1c580ed8e5dd7794a36ea7d"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ CGI DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies HTTPMessage LWP ParamsValidate URI ]; + buildInputs = [ CGI DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies LWP ParamsValidate TestException ]; meta = { description = "Talk to RT installation using REST protocol"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12229,10 +13312,10 @@ let self = _self // overrides; _self = with self; { }; SafeIsa = buildPerlPackage { - name = "Safe-Isa-1.000004"; + name = "Safe-Isa-1.000008"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000004.tar.gz; - sha256 = "0sqwma0xqxrgnsm0jfy17szq87bskzq67cdh7p934qdifh5nfwn9"; + url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000008.tar.gz; + sha256 = "08r74hwxq5b3bibnbwjr9anybg15l3zqdgcirpw1xm2qpvcxgdkx"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -12242,10 +13325,10 @@ let self = _self // overrides; _self = with self; { }; ScalarListUtils = buildPerlPackage { - name = "Scalar-List-Utils-1.42"; + name = "Scalar-List-Utils-1.50"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.42.tar.gz; - sha256 = "3507f72541f66a2dce850b9b56771e5fccda3d215c52f74946c6e370c0f4a4da"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.50.tar.gz; + sha256 = "06aab9c693380190e53be09be7daed20c5d6278f71956989c24cca7782013675"; }; meta = { description = "Common Scalar and List utility subroutines"; @@ -12253,30 +13336,28 @@ let self = _self // overrides; _self = with self; { }; }; - ScalarString = buildPerlPackage rec { - name = "Scalar-String-0.002"; + ScalarString = buildPerlModule rec { + name = "Scalar-String-0.003"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "d3a45cc137bb9f7d8848d5a10a5142d275a98f8dcfd3adb60593cee9d33fa6ae"; + sha256 = "f54a17c9b78713b02cc43adfadf60b49467e7634d31317e8b9e9e97c26d68b52"; }; - buildInputs = [ ModuleBuild ]; }; - SCGI = buildPerlPackage rec { + SCGI = buildPerlModule rec { name = "SCGI-0.6"; src = fetchurl { url = "mirror://cpan/authors/id/V/VI/VIPERCODE/${name}.tar.gz"; sha256 = "196rj47mh4fq2vlnw595q391zja5v6qg7s3sy0vy8igfyid8rdsq"; }; preConfigure = "export HOME=$(mktemp -d)"; - buildInputs = [ ModuleBuild ]; }; ScopeGuard = buildPerlPackage { - name = "Scope-Guard-0.20"; + name = "Scope-Guard-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.20.tar.gz; - sha256 = "1lsagnz6pli035zvx5c1x4qm9fabi773vns86yd8lzfpldhfv3sv"; + url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz; + sha256 = "0y6jfzvxiz8h5yfz701shair0ilypq2mvimd7wn8wi2nbkm1p6wc"; }; meta = { description = "Lexically-scoped resource management"; @@ -12285,10 +13366,10 @@ let self = _self // overrides; _self = with self; { }; ScopeUpper = buildPerlPackage rec { - name = "Scope-Upper-0.29"; + name = "Scope-Upper-0.30"; src = fetchurl { url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "4b07360a243ce0ccaacfdfa98ae38ef2686aa908fcf4ef3d669105ac36759e0a"; + sha256 = "7f151582423850d814034404b1e23b5efb281b9dd656b9afe81c761ebb88bbb4"; }; meta = { homepage = http://search.cpan.org/dist/Scope-Upper/; @@ -12310,10 +13391,10 @@ let self = _self // overrides; _self = with self; { }; SelfLoader = buildPerlPackage { - name = "SelfLoader-1.20"; + name = "SelfLoader-1.24"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/SelfLoader-1.20.tar.gz; - sha256 = "79b1e2b8e4081854fba666441287c18b6bd822defb5bbee79067370edba1a042"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/SelfLoader-1.24.tar.gz; + sha256 = "4c7cd20fd82aa10520ac14b05fa003f60c72bb4c95527bd12aec8bf3c4546098"; }; meta = { description = "Load functions only on demand"; @@ -12322,12 +13403,12 @@ let self = _self // overrides; _self = with self; { }; ServerStarter = buildPerlModule rec { - name = "Server-Starter-0.33"; + name = "Server-Starter-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; - sha256 = "109cc1ede244f2edb7e020c507d4a1ff7a8074f22a8f7c30253fb00af1aba6f6"; + sha256 = "96a20d4a1f341655bd1b26df5795d57c5d7498d9bcf8ca9d0d6e2ed743608f78"; }; - buildInputs = [ ModuleBuild TestRequires TestSharedFork TestTCP ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { homepage = https://github.com/kazuho/p5-Server-Starter; description = "A superdaemon for hot-deploying server programs"; @@ -12349,7 +13430,7 @@ let self = _self // overrides; _self = with self; { SetIntSpan = buildPerlPackage rec { name = "Set-IntSpan-1.19"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz"; + url = mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz; sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"; }; @@ -12359,10 +13440,10 @@ let self = _self // overrides; _self = with self; { }; SetObject = buildPerlPackage rec { - name = "Set-Object-1.35"; + name = "Set-Object-1.39"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "189a4d7cc3e583faa8518a63a95cf4aa3a320f79b5c6f5e40970687244080ee7"; + sha256 = "5effcfeb104da334f413a20dee9cdc5e874246096c3b282190a5f44453401810"; }; meta = { description = "Unordered collections (sets) of Perl Objects"; @@ -12404,6 +13485,30 @@ let self = _self // overrides; _self = with self; { }; }; + SnowballNorwegian = buildPerlModule rec { + name = "Snowball-Norwegian-1.2"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz; + sha256 = "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"; + }; + meta = { + description = "Porters stemming algorithm for norwegian."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + SnowballSwedish = buildPerlModule rec { + name = "Snowball-Swedish-1.2"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz; + sha256 = "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"; + }; + meta = { + description = "Porters stemming algorithm for swedish."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SOAPLite = buildPerlPackage { name = "SOAP-Lite-1.11"; src = fetchurl { @@ -12444,6 +13549,7 @@ let self = _self // overrides; _self = with self; { }; setOutputFlags = false; buildInputs = [ pkgs.which ]; + patches = [ ../development/perl-modules/Socket6-sv_undef.patch ]; meta = { description = "IPv6 related part of the C socket.h defines and structure manipulators"; license = stdenv.lib.licenses.bsd3; @@ -12466,13 +13572,27 @@ let self = _self // overrides; _self = with self; { }; }; + SoftwareLicenseCCpack = buildPerlPackage rec { + name = "Software-License-CCpack-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz; + sha256 = "1cakbn7am8mhalwas5h33l7c6avdqpg42z478p6rav11pim5qksr"; + }; + propagatedBuildInputs = [ SoftwareLicense ]; + buildInputs = [ TestCheckDeps ]; + meta = { + description = "Software::License pack for Creative Commons' licenses"; + license = with stdenv.lib.licenses; [ lgpl3Plus ]; + homepage = "https://github.com/SineSwiper/Software-License-CCpack"; + }; + }; + SortKey = buildPerlPackage rec { name = "Sort-Key-1.33"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; sha256 = "1kqs10s2plj6c96srk0j8d7xj8dxk1704r7mck8rqk09mg7lqspd"; }; - buildInputs = [ TestMore ]; meta = { description = "Sort arrays by one or multiple calculated keys"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12480,11 +13600,41 @@ let self = _self // overrides; _self = with self; { }; SortVersions = buildPerlPackage rec { - name = "Sort-Versions-1.5"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ED/EDAVIS/${name}.tar.gz"; - sha256 = "1yhyxaakyhcffgr9lwd314badhlc2gh9f6n47013ljshbnkgzhh9"; - }; + name = "Sort-Versions-1.62"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz; + sha256 = "1aifzm79ky03gi2lwxyx4mk6yky8x215j0kz4f0jbgkf803k6pxz"; + }; + }; + + Specio = buildPerlPackage rec { + name = "Specio-0.42"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz; + sha256 = "1xjfa9g4vc6x3f0bzzbac8dwgpc4in4za1l1sp0y6ykdla9qna93"; + }; + propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; + buildInputs = [ TestFatal TestNeeds ]; + meta = { + description = "Type constraints and coercions for Perl"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "http://metacpan.org/release/Specio"; + }; + }; + + SpecioLibraryPathTiny = buildPerlPackage rec { + name = "Specio-Library-Path-Tiny-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz; + sha256 = "0cyfx8gigsgisdwynjamh8jkpad23sr8v6a98hq285zmibm16s7g"; + }; + propagatedBuildInputs = [ PathTiny Specio ]; + buildInputs = [ Filepushd TestFatal ]; + meta = { + description = "Path::Tiny types and coercions for Specio"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "http://metacpan.org/release/Specio-Library-Path-Tiny"; + }; }; Spiffy = buildPerlPackage rec { @@ -12493,7 +13643,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; sha256 = "18qxshrjh0ibpzjm2314157mxlibh3smyg64nr4mq990hh564n4g"; }; - buildInputs = [ ExtUtilsMakeMaker ]; }; SpreadsheetParseExcel = buildPerlPackage rec { @@ -12502,7 +13651,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz"; sha256 = "6ec4cb429bd58d81640fe12116f435c46f51ff1040c68f09cc8b7681c1675bec"; }; - propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOstringy OLEStorage_Lite ]; + propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; meta = { homepage = https://github.com/runrig/spreadsheet-parseexcel/; description = "Read information from an Excel file"; @@ -12530,28 +13679,27 @@ let self = _self // overrides; _self = with self; { sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; }; buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ HashMerge MROCompat Moo SubQuote ]; + propagatedBuildInputs = [ HashMerge MROCompat Moo ]; meta = { description = "Generate SQL from Perl data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - SQLAbstractLimit = buildPerlPackage rec { + SQLAbstractLimit = buildPerlModule rec { name = "SQL-Abstract-Limit-0.141"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/${name}.tar.gz"; sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg"; }; - propagatedBuildInputs = - [ SQLAbstract TestException DBI TestDeep ]; - buildInputs = [ TestPod TestPodCoverage ]; + propagatedBuildInputs = [ DBI SQLAbstract ]; + buildInputs = [ TestDeep TestException ]; }; SQLSplitStatement = buildPerlPackage rec { name = "SQL-SplitStatement-1.00020"; src = fetchurl { - url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz; sha256 = "0bqg45k4c9qkb2ypynlwhpvzsl4ssfagmsalys18s5c79ps30z7p"; }; buildInputs = [ TestException ]; @@ -12564,19 +13712,19 @@ let self = _self // overrides; _self = with self; { SQLTokenizer = buildPerlPackage rec { name = "SQL-Tokenizer-0.24"; src = fetchurl { - url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IZ/IZUT/SQL-Tokenizer-0.24.tar.gz; sha256 = "1qa2dfbzdlr5qqdam9yn78z5w3al5r8577x06qan8wv58ay6ka7s"; }; }; SQLTranslator = buildPerlPackage rec { - name = "SQL-Translator-0.11021"; + name = "SQL-Translator-0.11024"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "64cb38a9f78367bc115359a999003bbeb3c32cc75bba8306ec1a938fc441bfd1"; + sha256 = "5bde9d6f67850089ef35a9296d6f53e5ee8e991438366b71477f3f27c1581bb1"; }; buildInputs = [ JSON TestDifferences TestException XMLWriter YAML ]; - propagatedBuildInputs = [ CarpClan DBI FileShareDir ListMoreUtils Moo PackageVariant ParseRecDescent TryTiny ]; + propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; meta = { description = "SQL DDL transformations and more"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12585,13 +13733,13 @@ let self = _self // overrides; _self = with self; { }; PackageVariant = buildPerlPackage { - name = "Package-Variant-1.002002"; + name = "Package-Variant-1.003002"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Package-Variant-1.002002.tar.gz; - sha256 = "826780f19522f42c6b3d9f717ab6b5400f198cec08f4aa15b71aef9aa17e9b13"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz; + sha256 = "b2ed849d2f4cdd66467512daa3f143266d6df810c5fae9175b252c57bc1536dc"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ImportInto ModuleRuntime strictures ]; + propagatedBuildInputs = [ ImportInto strictures ]; meta = { description = "Parameterizable packages"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12607,12 +13755,12 @@ let self = _self // overrides; _self = with self; { }; Starlet = buildPerlPackage { - name = "Starlet-0.28"; + name = "Starlet-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.28.tar.gz; - sha256 = "245f606cdc8acadbe12e7e56dfa0752a8e8daa9a094373394fc17a45f5dde850"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz; + sha256 = "b9603b8e62880cb4582f6a7939eafec65e6efd3d900f2c7dd342e5f4c68d62d8"; }; - buildInputs = [ LWP TestTCP ]; + buildInputs = [ LWP TestSharedFork TestTCP ]; propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ]; meta = { description = "A simple, high-performance PSGI/Plack HTTP server"; @@ -12626,8 +13774,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-${version}.tar.gz"; sha256 = "1sbb5rb3vs82rlh1fjkgkcmj5pj62b4y9si4ihh45sl9m8c2qxx5"; }; - buildInputs = [ LWP ModuleBuildTiny TestRequires ]; - propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ]; + buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; + propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ]; doCheck = false; # binds to various TCP ports meta = { inherit version; @@ -12638,10 +13786,10 @@ let self = _self // overrides; _self = with self; { }; StatisticsBasic = buildPerlPackage { - name = "Statistics-Basic-1.6607"; + name = "Statistics-Basic-1.6611"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6607.tar.gz; - sha256 = "105agxl2581iqmwj1crgz33l5r19snf47h91hnjgm1nf555z79r7"; + url = mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6611.tar.gz; + sha256 = "1ywl398z42hz9w1k0waf1caa6agz8jzsjlf4rzs1lgpx2mbcwmb8"; }; propagatedBuildInputs = [ NumberFormat ]; meta = { @@ -12651,23 +13799,24 @@ let self = _self // overrides; _self = with self; { }; }; - StatisticsDescriptive = buildPerlPackage { - name = "Statistics-Descriptive-3.0605"; + StatisticsDescriptive = buildPerlModule { + name = "Statistics-Descriptive-3.0612"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0605.tar.gz; - sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz; + sha256 = "772413148e5e00efb32f277c4254aa78b9112490a896208dcd0025813afdbf7a"; }; meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ ListMoreUtils ]; }; StatisticsDistributions = buildPerlPackage rec { name = "Statistics-Distributions-1.02"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-1.02.tar.gz; sha256 = "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr"; }; }; @@ -12675,7 +13824,7 @@ let self = _self // overrides; _self = with self; { StatisticsTTest = buildPerlPackage rec { name = "Statistics-TTest-1.1.0"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; + url = mirror://cpan/authors/id/Y/YU/YUNFANG/Statistics-TTest-1.1.0.tar.gz; sha256 = "0rkifgzm4rappiy669dyi6lyxn2sdqaf0bl6gndlfa67b395kndj"; }; propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; @@ -12693,10 +13842,10 @@ let self = _self // overrides; _self = with self; { }; StreamBuffered = buildPerlPackage { - name = "Stream-Buffered-0.02"; + name = "Stream-Buffered-0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.02.tar.gz; - sha256 = "0bfa3h2pryrbrcd1r7235k0ik4gw35r5ig8h8y3dfmk9l3y96vjr"; + url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.03.tar.gz; + sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv"; }; meta = { homepage = http://plackperl.org; @@ -12706,10 +13855,10 @@ let self = _self // overrides; _self = with self; { }; strictures = buildPerlPackage rec { - name = "strictures-2.000002"; + name = "strictures-2.000003"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "0021m9k1f6dfqn88znlp24g7xsqxwwjbj91w474c7n5gngf5a0qk"; + sha256 = "08mgvf1d2651gsg3jgjfs13878ndqa4ji8vfsda9f7jjd84ymy17"; }; meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; @@ -12719,26 +13868,26 @@ let self = _self // overrides; _self = with self; { }; StringApprox = buildPerlPackage rec { - name = "String-Approx-3.27"; + name = "String-Approx-3.28"; src = fetchurl { url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; - sha256 = "2b8c1acd24fa9681ebba0ccb3c49f16289de1d579af8a0c898ea8f8d1baf5d36"; + sha256 = "43201e762d8699cb0ac2c0764a5454bdc2306c0771014d6c8fba821480631342"; }; }; StringCamelCase = buildPerlPackage rec { - name = "String-CamelCase-0.02"; + name = "String-CamelCase-0.04"; src = fetchurl { - url = "mirror://cpan/modules/by-module/String/${name}.tar.gz"; - sha256 = "17kh8nap2z5g5rqcvw0m7mvbai7wr7h0al39w8l827zhqad8ss42"; + url = mirror://cpan/authors/id/H/HI/HIO/String-CamelCase-0.04.tar.gz; + sha256 = "1a8i4yzv586svd0pbxls7642vvmyiwzh4x2xyij8gbnfxsydxhw9"; }; }; StringCRC32 = buildPerlPackage rec { - name = "String-CRC32-1.5"; + name = "String-CRC32-1.6"; src = fetchurl { - url = mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.5.tar.gz; - sha256 = "0m3hjk292hnxyi8nkfy8hlr1khnbf2clgkb4kzj0ycq8gcd2z0as"; + url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.6.tar.gz; + sha256 = "0mf545w014f9rwp2020h17dn8kfp7q1zgwrsfv0rpn89c61in8bh"; }; meta = { maintainers = with maintainers; [ ]; @@ -12747,13 +13896,13 @@ let self = _self // overrides; _self = with self; { }; StringErrf = buildPerlPackage { - name = "String-Errf-0.007"; + name = "String-Errf-0.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.007.tar.gz; - sha256 = "1apnmxdsqwrvn1kkbba4sw6yh6hdfxxar545p6m9dkid7xsiqjfj"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz; + sha256 = "1nyn9s52jgbffrsv0m7rhcx1awjj43n68bfjlap8frdc7mw6y4xf"; }; - buildInputs = [ JSON TimeDate ]; - propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ]; + buildInputs = [ JSONMaybeXS TimeDate ]; + propagatedBuildInputs = [ StringFormatter ]; meta = { description = "A simple sprintf-like dialect"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12778,7 +13927,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b"; }; - propagatedBuildInputs = [ JSONMaybeXS ParamsUtil SubExporter ]; + propagatedBuildInputs = [ JSONMaybeXS SubExporter ]; meta = { homepage = https://github.com/rjbs/String-Flogger; description = "String munging for loggers"; @@ -12787,10 +13936,10 @@ let self = _self // overrides; _self = with self; { }; StringFormat = buildPerlPackage rec { - name = "String-Format-1.17"; + name = "String-Format-1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; - sha256 = "0sxfavcsb349rfafxflq2f9h3xpxabrw0q7vhmh9n3hjij8fa1jk"; + url = mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz; + sha256 = "0y77frxzjifd4sw0j19cc346ysas1mya84rdxaz279lyin7plhcy"; }; }; @@ -12800,7 +13949,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz; sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; - propagatedBuildInputs = [ ParamsUtil SubExporter ]; + propagatedBuildInputs = [ SubExporter ]; meta = with stdenv.lib; { description = "Build sprintf-like functions of your own"; license = licenses.gpl2; @@ -12853,13 +14002,12 @@ let self = _self // overrides; _self = with self; { }; StringToIdentifierEN = buildPerlPackage rec { - name = "String-ToIdentifier-EN-0.11"; + name = "String-ToIdentifier-EN-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "1bawghkgkkx7j3avnrj5sg3vix1z5564ks6wf9az3jc2knh8s5nh"; + sha256 = "12nw7h2yiybhdw0vnnpc7bif8ylhsn6kqf6s39dsrf9h54iq9yrs"; }; - propagatedBuildInputs = - [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; + propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; }; StringTruncate = buildPerlPackage { @@ -12868,7 +14016,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz; sha256 = "0vjz4fd4cvcy12gk5bdha7z73ifmfpmk748khha94dhiq3pd98xa"; }; - propagatedBuildInputs = [ SubExporter SubInstall ]; + propagatedBuildInputs = [ SubExporter ]; meta = { description = "A module for when strings are too long to be displayed in"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12881,7 +14029,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz; sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p"; }; - buildInputs = [ Testuseok TestException TestTableDriven ]; + buildInputs = [ TestException TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; @@ -12891,17 +14039,19 @@ let self = _self // overrides; _self = with self; { }; }; - StringUtil = let version = "1.24"; in buildPerlPackage { + StringUtil = let version = "1.26"; in buildPerlModule { name = "String-Util-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKO/String-Util-${version}.tar.gz"; - sha256 = "16c7dbpz87ywq49lnsaml0k28jbkraf1p2njh72jc5xcxys7vykv"; + sha256 = "0bgs6fsc0gcj9qa1k98nwjp4xbkl3ckz71rz3qhmav0lgkrr96pl"; }; meta = { inherit version; description = "String::Util -- String processing utilities"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ NumberMisc ]; + buildInputs = [ TestToolbox ]; }; libfile-stripnondeterminism = buildPerlPackage rec { @@ -12937,12 +14087,12 @@ let self = _self // overrides; _self = with self; { }; SubExporter = buildPerlPackage { - name = "Sub-Exporter-0.984"; + name = "Sub-Exporter-0.987"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.984.tar.gz; - sha256 = "190qly7nv7zf17c1v0gnqhyf25p6whhh2m132mh4xzs5mqadwq0f"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz; + sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l"; }; - propagatedBuildInputs = [ DataOptList ParamsUtil SubInstall ]; + propagatedBuildInputs = [ DataOptList ]; meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; @@ -12967,10 +14117,10 @@ let self = _self // overrides; _self = with self; { }; SubExporterGlobExporter = buildPerlPackage { - name = "Sub-Exporter-GlobExporter-0.004"; + name = "Sub-Exporter-GlobExporter-0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.004.tar.gz; - sha256 = "025wgjavrbzh52jb4v0w2fxqh7r5181k935h9cyy2rm1qk49fg8p"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz; + sha256 = "0qvsvfvfyk69v2ygjnyd5sh3bgbzd6f7k7mgv0zws1yywvpmxi1g"; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -12981,10 +14131,10 @@ let self = _self // overrides; _self = with self; { }; SubExporterProgressive = buildPerlPackage { - name = "Sub-Exporter-Progressive-0.001011"; + name = "Sub-Exporter-Progressive-0.001013"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001011.tar.gz; - sha256 = "01kwzbqwdhvadpphnczid03nlyj0h4cxaq3m3v2401bckkkcc606"; + url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz; + sha256 = "0mn0x8mkh36rrsr58s1pk4srwxh2hbwss7sv630imnk49navfdfm"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -13009,10 +14159,10 @@ let self = _self // overrides; _self = with self; { }; SubIdentify = buildPerlPackage rec { - name = "Sub-Identify-0.12"; + name = "Sub-Identify-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz"; - sha256 = "83bb785a66113b4a966db0a4186fd1dd07987acdacb4502b1e1558f817dde825"; + sha256 = "068d272086514dd1e842b6a40b1bedbafee63900e5b08890ef6700039defad6f"; }; meta = { description = "Retrieve names of code references"; @@ -13036,10 +14186,10 @@ let self = _self // overrides; _self = with self; { }; SubInstall = buildPerlPackage { - name = "Sub-Install-0.927"; + name = "Sub-Install-0.928"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.927.tar.gz; - sha256 = "0nmgsdbwi8f474jkyd6w9jfnpav99xp8biydcdri8qri623f6plm"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz; + sha256 = "03zgk1yh128gciyx3q77zxzxg9kf8yy2gm46gdxqi24mcykngrb1"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -13049,12 +14199,12 @@ let self = _self // overrides; _self = with self; { }; SubName = buildPerlPackage rec { - name = "Sub-Name-0.19"; + name = "Sub-Name-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "b06ba8252ce3b1bb88fa0ea0fe9ec8b572e5ed36c69f55e9e3d9db8a73efe22b"; + sha256 = "bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117"; }; - buildInputs = [ self."if" ]; + buildInputs = [ BC DevelCheckBin ]; meta = { homepage = https://github.com/p5sagit/Sub-Name; description = "(Re)name a sub"; @@ -13064,12 +14214,12 @@ let self = _self // overrides; _self = with self; { }; SubOverride = buildPerlPackage rec { - name = "Sub-Override-0.08"; + name = "Sub-Override-0.09"; src = fetchurl { url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; - sha256 = "13s5zi6qz02q50vv4bmwdmhn9gvg0988fydjlrrv500g6hnyzlkj"; + sha256 = "1d955qn44brkcfif3gi0q2vvvqahny6rax0vr068x5i9yz0ng6lk"; }; - propagatedBuildInputs = [SubUplevel TestException]; + buildInputs = [ TestFatal ]; }; SubQuote = buildPerlPackage rec { @@ -13086,10 +14236,10 @@ let self = _self // overrides; _self = with self; { }; SubUplevel = buildPerlPackage { - name = "Sub-Uplevel-0.24"; + name = "Sub-Uplevel-0.2800"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.24.tar.gz; - sha256 = "1yzxqsim8vpavzqm2wfksh8dpmy6qbr9s3hdqqicp38br3lzd4qg"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz; + sha256 = "14z2xjiw931wizcx3mblmby753jspvfm321d6chs907nh0xzdwxl"; }; meta = { homepage = https://github.com/dagolden/sub-uplevel; @@ -13108,10 +14258,10 @@ let self = _self // overrides; _self = with self; { }; Swim = buildPerlPackage rec { - name = "Swim-0.1.45"; + name = "Swim-0.1.46"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "3755ba1a02aee933c8e1de3995aca1523d6175291a1fa60c3f7fd477f5bb2469"; + sha256 = "ac747362afec12a0ba30ffdfff8765f80a124dff8ebcb238326fa627e07daae8"; }; buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; @@ -13143,7 +14293,7 @@ let self = _self // overrides; _self = with self; { }; }; - SymbolUtil = buildPerlPackage { + SymbolUtil = buildPerlModule { name = "Symbol-Util-0.0203"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; @@ -13176,7 +14326,7 @@ let self = _self // overrides; _self = with self; { sha256 = "8b4975f21b1992a7e6c2df5dcc92b254c61925595eddcdfaf0b1498717aa95ef"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ SubExporterProgressive syntax ]; + propagatedBuildInputs = [ syntax ]; meta = { homepage = https://github.com/frioux/Syntax-Keyword-Junction; description = "Perl6 style Junction operators in Perl5"; @@ -13194,10 +14344,10 @@ let self = _self // overrides; _self = with self; { }; SysHostnameLong = buildPerlPackage rec { - name = "Sys-Hostname-Long-1.4"; + name = "Sys-Hostname-Long-1.5"; src = fetchurl { url = "mirror://cpan/authors/id/S/SC/SCOTT/${name}.tar.gz"; - sha256 = "0hy1225zg2yg11xhgj0wbiapzjyf6slx17ln36zqvfm07k6widlx"; + sha256 = "1jv5n8jv48c1p8svjsigyxndv1ygsq8wgwj9c7ypx1vaf3rns679"; }; doCheck = false; # no `hostname' in stdenv meta = { @@ -13206,10 +14356,10 @@ let self = _self // overrides; _self = with self; { }; SysSigAction = buildPerlPackage { - name = "Sys-SigAction-0.21"; + name = "Sys-SigAction-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.21.tar.gz; - sha256 = "e144207a6fd261eb9f98554c76bea66d95870ee1f62d2d346a1ea95fdccf80db"; + url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz; + sha256 = "c4ef6c9345534031fcbbe2adc347fc7194d47afc945e7a44fac7e9563095d353"; }; meta = { description = "Perl extension for Consistent Signal Handling"; @@ -13267,22 +14417,22 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; sha256 = "75b1b2d96155647842587146cefd0de30943b85195e8e3eca51e0f0b8642d61e"; }; - buildInputs = [TestPodCoverage]; - propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystModelDBICSchema CatalystPluginAuthentication CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystRuntime CatalystViewTT DBIxClass ]; + propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystViewTT ]; meta = { description = "Everything you need to follow the Catalyst Tutorial"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; TaskFreecellSolverTesting = buildPerlModule rec { - name = "Task-FreecellSolver-Testing-v0.0.10"; + name = "Task-FreecellSolver-Testing-0.0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "ce8960c0250a9947ae5b4485e8a3e807bb2d87b1120096464b3d2247d2c194ff"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz; + sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; - buildInputs = [ ModuleBuild perl ]; - propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify Inline InlineC ListMoreUtils Moo MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace YAMLLibYAML ]; + buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; + propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; meta = { homepage = https://metacpan.org/release/Task-FreecellSolver-Testing; description = "Install the CPAN dependencies of the Freecell Solver test suite"; @@ -13296,17 +14446,17 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; sha256 = "0ajwkyr9nwn11afi6fz6kx4bi7a3p8awjsldmsakz3sl0s42pmbr"; }; - propagatedBuildInputs = [ Plack PSGI ModuleBuildTiny ]; + propagatedBuildInputs = [ CGICompile CGIEmulatePSGI CGIPSGI Corona FCGI FCGIClient FCGIProcManager HTTPServerSimplePSGI IOHandleUtil NetFastCGI PSGI PlackAppProxy PlackMiddlewareAuthDigest PlackMiddlewareConsoleLogger PlackMiddlewareDebug PlackMiddlewareDeflater PlackMiddlewareHeader PlackMiddlewareReverseProxy PlackMiddlewareSession Starlet Starman Twiggy ]; + buildInputs = [ ModuleBuildTiny TestSharedFork ]; }; - TaskTestRunAllPlugins = buildPerlPackage rec { + TaskTestRunAllPlugins = buildPerlModule rec { name = "Task-Test-Run-AllPlugins-0.0105"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; + buildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Specifications for installing all the Test::Run"; @@ -13315,10 +14465,10 @@ let self = _self // overrides; _self = with self; { }; TaskWeaken = buildPerlPackage { - name = "Task-Weaken-1.04"; + name = "Task-Weaken-1.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.04.tar.gz; - sha256 = "1i7kd9v8fjsqyhr4rx4a1jv7n5vfjjm1v4agb24pizh0b72p3qk7"; + url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.05.tar.gz; + sha256 = "0p5ryr3421p5rqj6dk5dcvxsml5gl9skbn7gv4szk50fimrvzww5"; }; meta = { description = "Ensure that a platform has weaken support"; @@ -13419,22 +14569,23 @@ let self = _self // overrides; _self = with self; { }; TemplateToolkit = buildPerlPackage rec { - name = "Template-Toolkit-2.25"; + name = "Template-Toolkit-2.27"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.25.tar.gz; - sha256 = "048yg07j48rix3cly13j5wzms7kd5argviicj0kwykb004xpc8zl"; + url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.27.tar.gz; + sha256 = "1p66y9mwj7nkc1bcwgp2xjw78l4x5bzhj0xghp2k80ad4q1s848k"; }; propagatedBuildInputs = [ AppConfig ]; meta = { description = "Comprehensive template processing system"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CGI TestLeakTrace ]; }; TemplateGD = buildPerlPackage rec { name = "Template-GD-2.66"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz; sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b"; }; propagatedBuildInputs = [ GD TemplateToolkit ]; @@ -13445,10 +14596,10 @@ let self = _self // overrides; _self = with self; { }; TermANSIColor = buildPerlPackage { - name = "Term-ANSIColor-4.03"; + name = "Term-ANSIColor-4.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.03.tar.gz; - sha256 = "e89b6992030fa713f928f653dcdb71d66fa2493f873bacf5653aa121ca862450"; + url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.06.tar.gz; + sha256 = "8161c7434b1984bde588d75f22c786c46cb6d35d264d58111db0b82537de4bad"; }; meta = { description = "Color output using ANSI escape sequences"; @@ -13501,11 +14652,12 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz; sha256 = "25675292f588bc29d32e710cf3667da9a2a1751e139801770a9fdb18cd2184a6"; }; - propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; + propagatedBuildInputs = [ IOInteractive TermProgressBar ]; meta = { description = ""; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestMockObject ]; }; TermProgressBarSimple = buildPerlPackage { @@ -13515,6 +14667,7 @@ let self = _self // overrides; _self = with self; { sha256 = "a20db3c67d5bdfd0c1fab392c6d1c26880a7ee843af602af4f9b53a7043579a6"; }; propagatedBuildInputs = [ TermProgressBarQuiet ]; + buildInputs = [ TestMockObject ]; }; TermReadKey = buildPerlPackage rec { @@ -13522,15 +14675,15 @@ let self = _self // overrides; _self = with self; { version = "2.37"; src = fetchurl { url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; - sha256 = "1czarrdxgnxmmbaasjnq3sj14nf1cvzhm37padq6xvl7h7r2acb2"; + sha256 = "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa"; }; }; TermReadLineGnu = buildPerlPackage rec { - name = "Term-ReadLine-Gnu-1.31"; + name = "Term-ReadLine-Gnu-1.35"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz"; - sha256 = "42174b4bc9d3881502d527fc7c8bd1c0a4b266c2f0bbee012e9a604999418f3b"; + sha256 = "575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lreadline -lncursesw"; @@ -13593,10 +14746,10 @@ let self = _self // overrides; _self = with self; { }; TermSizePerl = buildPerlPackage { - name = "Term-Size-Perl-0.029"; + name = "Term-Size-Perl-0.031"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.029.tar.gz; - sha256 = "8c1aaab73646ee1d233e827213ea3b5ab8afcf1d02a8f94be7aed306574875e7"; + url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.031.tar.gz; + sha256 = "ae9a6746cb1b305ddc8f8d8ca46878552b9c1123628971e13a275183822f209e"; }; meta = { description = "Perl extension for retrieving terminal size (Perl version)"; @@ -13619,6 +14772,19 @@ let self = _self // overrides; _self = with self; { }; }; + TermUI = buildPerlPackage rec { + name = "Term-UI-0.46"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz; + sha256 = "19p92za5cx1v7g57pg993amprcvm1az3pp7y9g5b1aplsy06r54i"; + }; + propagatedBuildInputs = [ LogMessageSimple ]; + meta = { + description = "User interfaces via Term::ReadLine made easy"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermVT102 = buildPerlPackage { name = "Term-VT102-0.91"; src = fetchurl { @@ -13635,7 +14801,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/N/NU/NUFFIN/Term-VT102-Boundless-0.04.tar.gz; sha256 = "5bb88b5aecb44ebf56d3ac7240be80cd26def9dcf1ebeb4e77d9983dfc7a8f19"; }; - propagatedBuildInputs = [ TermVT102 Testuseok ]; + propagatedBuildInputs = [ TermVT102 ]; meta = { license = "unknown"; }; @@ -13665,13 +14831,28 @@ let self = _self // overrides; _self = with self; { }; }; + Test2PluginNoWarnings = buildPerlPackage rec { + name = "Test2-Plugin-NoWarnings-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz; + sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242"; + }; + propagatedBuildInputs = [ TestSimple13 ]; + buildInputs = [ IPCRun3 Test2Suite ]; + meta = { + description = "Fail if tests warn"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "http://metacpan.org/release/Test2-Plugin-NoWarnings"; + }; + }; + Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000094"; + name = "Test2-Suite-0.000111"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "7135ccb6af82bac39801234e1ce49eb8693dfe8f8e215c7de577c7ded65b6e5f"; + sha256 = "4ca28df74c7c2f37fe63897c5041aee92fba4530544d0afc371e7d14a9b4d0ad"; }; - propagatedBuildInputs = [ Importer ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; + propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -13679,14 +14860,29 @@ let self = _self // overrides; _self = with self; { }; }; - TestAssert = buildPerlPackage { + TestAbortable = buildPerlPackage rec { + name = "Test-Abortable-0.002"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz; + sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; + }; + propagatedBuildInputs = [ SubExporter TestSimple13 ]; + buildInputs = [ TestNeeds ]; + meta = { + description = "subtests that you can die your way out of ... but survive"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/rjbs/Test-Abortable"; + }; + }; + + TestAssert = buildPerlModule { name = "Test-Assert-0.0504"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz; sha256 = "194bzflmzc0cw5727kznbj1zwzj7gnj7nx1643zk2hshdjlnv8yg"; }; buildInputs = [ ClassInspector TestUnitLite ]; - propagatedBuildInputs = [ constantboolean ExceptionBase SymbolUtil ]; + propagatedBuildInputs = [ ExceptionBase constantboolean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -13696,20 +14892,19 @@ let self = _self // overrides; _self = with self; { TestAssertions = buildPerlPackage rec { name = "Test-Assertions-1.054"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BB/BBC/Test-Assertions-1.054.tar.gz; sha256 = "10026w4r3yv6k3vc6cby7d61mxddlqh0ls6z39c82f17awfy9p7w"; }; - buildInputs = [ LogTrace ]; + propagatedBuildInputs = [ LogTrace ]; }; - TestAggregate = buildPerlPackage rec { - name = "Test-Aggregate-0.373"; + TestAggregate = buildPerlModule rec { + name = "Test-Aggregate-0.375"; src = fetchurl { url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz"; - sha256 = "00d218daa7ba29d82bcf364b61d391d3a14356cf3bcb4b12144270108a14fd14"; + sha256 = "c6cc0abfd0d4fce85371acca93ec245381841d32b4caa2d6475e4bc8130427d1"; }; - buildInputs = [ TestMost TestTrap ]; - propagatedBuildInputs = [ TestNoWarnings ]; + buildInputs = [ TestMost TestNoWarnings TestTrap ]; meta = { description = "Aggregate C<*.t> tests to make them run faster"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -13724,6 +14919,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fch1cvivnszbnwhpfmwv1rin04j5xkj1n1ylfmlxg6bm72qqdjj"; }; propagatedBuildInputs = [ Spiffy ]; + buildInputs = [ AlgorithmDiff TextDiff ]; }; TestCheckDeps = buildPerlPackage rec { @@ -13732,7 +14928,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; sha256 = "1vjinlixxdx6gfcw8y1dw2rla8bfhi8nmgcqr3nffc7kqskcrz36"; }; - buildInputs = [ ModuleBuildTiny ModuleMetadata ]; propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; @@ -13755,14 +14950,27 @@ let self = _self // overrides; _self = with self; { }; }; + TestClassMost = buildPerlModule rec { + name = "Test-Class-Most-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz; + sha256 = "1zvx9hil0mg0pnb8xfa4m0xgjpvh8s5gnbyprq3xwpdsdgcdwk33"; + }; + buildInputs = [ TestClass TestDeep TestDifferences TestException TestMost TestWarn ]; + meta = { + description = "Test Classes the easy way"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestCleanNamespaces = buildPerlPackage { - name = "Test-CleanNamespaces-0.16"; + name = "Test-CleanNamespaces-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.16.tar.gz; - sha256 = "9779378394b9be32cf04129fafe2d40d74f6f200f593f1494998bd128a6ed9fa"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.22.tar.gz; + sha256 = "862a221994dd413b2f350450f22c96f57cac78784b1aca1a8fc763fc5449aaca"; }; - buildInputs = [ ModuleRuntime TestDeep TestRequires TestTester TestWarnings if_ ]; - propagatedBuildInputs = [ FileFindRule FileFindRulePerl ModuleRuntime PackageStash SubExporter SubIdentify namespaceclean ]; + buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ]; + propagatedBuildInputs = [ PackageStash SubIdentify ]; meta = { homepage = https://github.com/karenetheridge/Test-CleanNamespaces; description = "Check for uncleaned imports"; @@ -13770,7 +14978,7 @@ let self = _self // overrides; _self = with self; { }; }; - TestCommand = buildPerlPackage { + TestCommand = buildPerlModule { name = "Test-Command-0.11"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz; @@ -13783,13 +14991,12 @@ let self = _self // overrides; _self = with self; { }; }; - TestCompile = buildPerlPackage rec { - name = "Test-Compile-v1.3.0"; + TestCompile = buildPerlModule rec { + name = "Test-Compile-1.3.0"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EG/EGILES/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v1.3.0.tar.gz; sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { description = "Check whether Perl files compile correctly"; @@ -13798,10 +15005,10 @@ let self = _self // overrides; _self = with self; { }; TestCPANMeta = buildPerlPackage { - name = "Test-CPAN-Meta-0.23"; + name = "Test-CPAN-Meta-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.23.tar.gz; - sha256 = "dda70c5cb61eddc6d3148cb66b6ff5eb4546a065257f4c104112a8a8a3575116"; + url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz; + sha256 = "f55b4f9cf6bc396d0fe8027267685cb2ac4affce897d0967a317fac6db5a8db5"; }; meta = { description = "Validate your CPAN META.yml files"; @@ -13809,13 +15016,26 @@ let self = _self // overrides; _self = with self; { }; }; + TestCPANMetaJSON = buildPerlPackage rec { + name = "Test-CPAN-Meta-JSON-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz; + sha256 = "1jg9ka50ixwq083wd4k12rhdjq87w0ihb34gd8jjn7gvvyd51b37"; + }; + propagatedBuildInputs = [ JSON ]; + meta = { + description = "Validate your CPAN META.json files"; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + TestDataSplit = buildPerlModule rec { - name = "Test-Data-Split-0.2.0"; + name = "Test-Data-Split-0.2.1"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "90811c2af56750bf08eeff39e1e30f2ff8f625e809ed838b5ccb56a256c4b595"; + sha256 = "9ba0c27a9e23c5dd8ede7611a049180485acc512a63783e1d1843b6569db5ae7"; }; - buildInputs = [ ModuleBuild TestDifferences perl ]; + buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ IOAll ListMoreUtils MooX MooXlate ]; meta = { description = "Split data-driven tests into several test scripts"; @@ -13824,22 +15044,21 @@ let self = _self // overrides; _self = with self; { }; TestDeep = buildPerlPackage { - name = "Test-Deep-0.112"; + name = "Test-Deep-1.127"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-0.112.tar.gz; - sha256 = "1vg1bb1lpqpj0pxk738ykip4kw3agbi88g90wxb3pc11l84nlsan"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.127.tar.gz; + sha256 = "0s3jmyvkgk48piw46sxppx11nfsbzhmisb0y513iza8vqiczr35p"; }; - propagatedBuildInputs = [ TestNoWarnings TestTester ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; }; }; TestDir = buildPerlPackage { - name = "Test-Dir-1.014"; + name = "Test-Dir-1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.014.tar.gz; - sha256 = "b36efc286f8127b04fd7bb0dfdf4bd0a090b175872e35b5ce6d4d80c772c28bf"; + url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.16.tar.gz; + sha256 = "7332b323913eb6a2684d094755196304b2f8606f70eaab913654ca91f273eac2"; }; meta = { description = "Test directory attributes"; @@ -13847,11 +15066,11 @@ let self = _self // overrides; _self = with self; { }; }; - TestDifferences = buildPerlPackage { - name = "Test-Differences-0.63"; + TestDifferences = buildPerlModule { + name = "Test-Differences-0.64"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.63.tar.gz; - sha256 = "7c657a178c32f48de3b469f6d4f67b75f018a3a19c1e6d0d8892188b0d261a66"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz; + sha256 = "9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { @@ -13860,13 +15079,13 @@ let self = _self // overrides; _self = with self; { }; }; - TestDistManifest = buildPerlPackage { - name = "Test-DistManifest-1.012"; + TestDistManifest = buildPerlModule { + name = "Test-DistManifest-1.014"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.012.tar.gz; - sha256 = "4b128bef9beea2f03bdca037ceb722de43b4a2c516c3f50c2a26421548a72208"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz; + sha256 = "3d26c20df42628981cbfcfa5b1ca028c6ceadb344c1dcf97a25ad6a88b73d7c5"; }; - buildInputs = [ TestNoWarnings ]; + buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ ModuleManifest ]; meta = { homepage = http://search.cpan.org/dist/Test-DistManifest; @@ -13876,10 +15095,10 @@ let self = _self // overrides; _self = with self; { }; TestEOL = buildPerlPackage { - name = "Test-EOL-1.5"; + name = "Test-EOL-2.00"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-EOL-1.5.tar.gz; - sha256 = "0qfdn71562xzmgnhmkkdbpp3vj851ldl1zlmxvharxsr16gjh6s3"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz; + sha256 = "0l3bxpsw0x7j9nclizcp53mnf9wny25dmg2iglfhzgnk0xfpwzwf"; }; meta = { homepage = https://metacpan.org/release/Test-EOL; @@ -13891,10 +15110,10 @@ let self = _self // overrides; _self = with self; { }; TestException = buildPerlPackage rec { - name = "Test-Exception-0.32"; + name = "Test-Exception-0.43"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADIE/${name}.tar.gz"; - sha256 = "0issbjh5yl62lpaff5zhn28zhbf8sv8n2g79vklfr5s703k2fi5s"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz; + sha256 = "0cxm7s4bg0xpxa6l6996a6iq3brr4j7p4hssnkc6dxv4fzq16sqm"; }; propagatedBuildInputs = [ SubUplevel ]; }; @@ -13931,10 +15150,10 @@ let self = _self // overrides; _self = with self; { }; TestFile = buildPerlPackage { - name = "Test-File-1.41"; + name = "Test-File-1.443"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.41.tar.gz; - sha256 = "45ec1b714f64d05e34205c40b08c49549f257910e4966fa28e2ac170d5516316"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz; + sha256 = "61b4a6ab8f617c8c7b5975164cf619468dc304b6baaaea3527829286fa58bcd5"; }; buildInputs = [ Testutf8 ]; meta = { @@ -13944,10 +15163,10 @@ let self = _self // overrides; _self = with self; { }; TestFileContents = buildPerlModule { - name = "Test-File-Contents-0.21"; + name = "Test-File-Contents-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.21.tar.gz; - sha256 = "1b5a13f86f5df625ffd30361f628d34b0ceda80b9f39ca74bf0a4c1105828317"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz; + sha256 = "cd6fadfb910b34b4b53991ff231dad99929ca8850abec3ad0e2810c4bd7b1f3d"; }; propagatedBuildInputs = [ TextDiff ]; meta = { @@ -13957,14 +15176,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestFileShareDir = buildPerlModule { - name = "Test-File-ShareDir-0.3.3"; + TestFileShareDir = buildPerlPackage { + name = "Test-File-ShareDir-1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-0.3.3.tar.gz; - sha256 = "877e14afb6f432bd888ef730c0afd776dd149b14bc520bc2ce842d114e5886a2"; + url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz; + sha256 = "b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ FileCopyRecursive FileShareDir PathTiny ]; + propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir ScopeGuard ]; meta = { homepage = https://github.com/kentfredric/Test-File-ShareDir; description = "Create a Fake ShareDir for your modules for testing"; @@ -13973,10 +15192,10 @@ let self = _self // overrides; _self = with self; { }; TestHarness = buildPerlPackage { - name = "Test-Harness-3.33"; + name = "Test-Harness-3.42"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.33.tar.gz; - sha256 = "c22e36287d5cee3c28fd2006e3c8b6e7cc76c6fc39d79c7ab74f1936d35e8fe2"; + url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.42.tar.gz; + sha256 = "0fd90d4efea82d6e262e6933759e85d27cbcfa4091b14bf4042ae20bab528e53"; }; doCheck = false; # makes assumptions about path to Perl meta = { @@ -13998,6 +15217,30 @@ let self = _self // overrides; _self = with self; { }; }; + TestHexDifferences = buildPerlPackage rec { + name = "Test-HexDifferences-1.001"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz; + sha256 = "18lh6shpfx567gjikrid4hixydgv1hi3mycl20qzq2j2vpn4afd6"; + }; + propagatedBuildInputs = [ SubExporter TextDiff ]; + buildInputs = [ TestDifferences TestNoWarnings ]; + meta = { + }; + }; + + TestHexString = buildPerlModule rec { + name = "Test-HexString-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz; + sha256 = "0h1zl2l1ljlcxsn0xvin9dwiymnhyhnfnxgzg3f9899g37f4qk3x"; + }; + meta = { + description = "test binary strings with hex dump diagnostics"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestHTTPServerSimple = buildPerlPackage { name = "Test-HTTP-Server-Simple-0.11"; src = fetchurl { @@ -14010,24 +15253,40 @@ let self = _self // overrides; _self = with self; { }; }; - TestJSON = buildPerlPackage { + TestJSON = buildPerlModule { name = "Test-JSON-0.11"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Test-JSON-0.11.tar.gz; sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; }; - propagatedBuildInputs = [ JSONAny TestDifferences TestTester ]; + propagatedBuildInputs = [ JSONAny ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestDifferences ]; + }; + + TestKwalitee = buildPerlPackage rec { + name = "Test-Kwalitee-1.27"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.27.tar.gz; + sha256 = "095kpj2011jk1mpnb07fs7yi190hmqh85mj662gx0dkpl9ic7a5w"; + }; + propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; + buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; + meta = { + description = "Test the Kwalitee of a distribution before you release it"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Test-Kwalitee"; + }; }; TestLeakTrace = buildPerlPackage rec { - name = "Test-LeakTrace-0.14"; + name = "Test-LeakTrace-0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "06cn4g35l2gi9vbsdi2j49cxsji9fvfi7xp4xgdyxxds9vrxydia"; + url = mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz; + sha256 = "00z4hcjra5nk700f3fgpy8fs036d7ry7glpn8g3wh7jzj7nrw22z"; }; meta = { description = "Traces memory leaks"; @@ -14036,10 +15295,10 @@ let self = _self // overrides; _self = with self; { }; TestLongString = buildPerlPackage rec { - name = "Test-LongString-0.15"; + name = "Test-LongString-0.17"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "0r2i3a35l116ccwx88jwiii2fq4b8wm16sl1lkxm2kh44s4z7s5s"; + url = mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz; + sha256 = "0kwp7rfr1i2amz4ckigkv13ah7jr30q6l5k4wk0vxl84myg39i5b"; }; }; @@ -14057,14 +15316,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestMockClass = buildPerlPackage { + TestMockClass = buildPerlModule { name = "Test-Mock-Class-0.0303"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Mock-Class-0.0303.tar.gz; sha256 = "00pkfqcz7b34q1mvx15k46sbxs22zcrvrbv15rnbn2na57z54bnd"; }; - buildInputs = [ ClassInspector TestUnitLite ]; - propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ]; + buildInputs = [ ClassInspector TestAssert TestUnitLite ]; + propagatedBuildInputs = [ FatalException Moose namespaceclean ]; meta = with stdenv.lib; { description = "Simulating other classes"; license = licenses.lgpl2Plus; @@ -14088,10 +15347,10 @@ let self = _self // overrides; _self = with self; { }; TestMockModule = buildPerlModule { - name = "Test-MockModule-0.11"; + name = "Test-MockModule-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.11.tar.gz; - sha256 = "1f8l5y9dzik7a19mdbydqa0yxc4x0ilgpf9yaq6ix0bzlsilnn05"; + url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.13.tar.gz; + sha256 = "0lwh6fvnc16r6d74vvh5h4b5a1spcslpjb3mcqbv23k01lm78wvl"; }; propagatedBuildInputs = [ SUPER ]; meta = { @@ -14100,7 +15359,7 @@ let self = _self // overrides; _self = with self; { }; }; - SUPER = buildPerlPackage rec { + SUPER = buildPerlModule rec { name = "SUPER-1.20141117"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; @@ -14115,12 +15374,12 @@ let self = _self // overrides; _self = with self; { TestMockObject = buildPerlPackage rec { - name = "Test-MockObject-1.20150527"; + name = "Test-MockObject-1.20161202"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; - sha256 = "adf1357a9014b3a397ff7ecbf1835dec376a67a37bb2e788734a627e17dc1d98"; + sha256 = "14b225fff3645338697976dbbe2c39e44c1c93536855b78b3bbc6e9bfe94a0a2"; }; - buildInputs = [ TestException TestWarn CGI ]; + buildInputs = [ CGI TestException TestWarn ]; propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; meta = { description = "Perl extension for emulating troublesome interfaces"; @@ -14131,18 +15390,32 @@ let self = _self // overrides; _self = with self; { TestMoose = Moose; TestMockTime = buildPerlPackage rec { - name = "Test-MockTime-0.12"; + name = "Test-MockTime-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz"; - sha256 = "104p9qsqcchfbxh6b6w7q9jhkwb4hc424js0cyivyanjm6bcqvj9"; + sha256 = "1vxv7y7jn71m8v8ag0z0dd0zadhxp264dppb40islcjl4g7r6x08"; }; }; + TestMockTimeHiRes = buildPerlModule rec { + name = "Test-MockTime-HiRes-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz; + sha256 = "1hfykcjrls6ywgbd49w29c7apj3nq4wlyx7jzpd2glwmz2pgfjaz"; + }; + buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; + meta = { + description = "Replaces actual time with simulated high resolution time"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tarao/perl5-Test-MockTime-HiRes"; + }; + }; + TestMojibake = buildPerlPackage { - name = "Test-Mojibake-0.9"; + name = "Test-Mojibake-1.3"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-0.9.tar.gz; - sha256 = "0b7jamkmws6k3cvzwrz3r5vcpjrdhr8wndf82i5nx2z19xsy33ym"; + url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz; + sha256 = "0cqvbwddgh0pfzmh989gkysi9apqj7dp7jkxfa428db9kgzpbzlg"; }; meta = { homepage = https://github.com/creaktive/Test-Mojibake; @@ -14154,16 +15427,17 @@ let self = _self // overrides; _self = with self; { TestMore = TestSimple; TestMost = buildPerlPackage { - name = "Test-Most-0.33"; + name = "Test-Most-0.35"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.33.tar.gz; - sha256 = "0jp4jcwk97bgf85wwyjpxfsx4165s6w1v4ymn9gnv03yn77inyij"; + url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz; + sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq"; }; - propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ]; + propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Most commonly needed test functions and features"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDeep TestDifferences TestException TestSimple13 TestWarn ]; }; TestNeeds = buildPerlPackage rec { @@ -14179,10 +15453,10 @@ let self = _self // overrides; _self = with self; { }; TestNoTabs = buildPerlPackage { - name = "Test-NoTabs-1.3"; + name = "Test-NoTabs-2.00"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-NoTabs-1.3.tar.gz; - sha256 = "06gvj0pgljc7n9rxhvwb0gq9wk51i3ks41lgh7a5ycqfkh9d0glw"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.00.tar.gz; + sha256 = "127kpl1va267qar2ia4c22xb96jby2jqnda3sj5pjgmxg8si26cg"; }; meta = { description = "Check the presence of tabs in your project"; @@ -14198,7 +15472,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz; sha256 = "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3"; }; - buildInputs = [ TestTester ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Make sure you didn't emit any warnings while testing"; @@ -14207,30 +15480,43 @@ let self = _self // overrides; _self = with self; { }; TestObject = buildPerlPackage rec { - name = "Test-Object-0.07"; + name = "Test-Object-0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "d142a91b039928dc5d616c7bd9bb62ffb06e58991f00c54e26ef7e62ed61032a"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz; + sha256 = "65278964147837313f4108e55b59676e8a364d6edf01b3dc198aee894ab1d0bb"; }; }; TestOutput = buildPerlPackage rec { - name = "Test-Output-1.01"; + name = "Test-Output-1.031"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "0hg2hv6sify6qcx4865m4gyfdfbi96aw7fx39zpvnrivk3i2jdcd"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz; + sha256 = "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q"; }; - buildInputs = [ TestTester ]; - propagatedBuildInputs = [ SubExporter ]; + propagatedBuildInputs = [ CaptureTiny ]; + }; + + TestPAUSEPermissions = buildPerlPackage rec { + name = "Test-PAUSE-Permissions-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-PAUSE-Permissions-0.06.tar.gz; + sha256 = "1rspdxwfr1mxjrpcsd4asd5q1qpmiyw0sm7g008yy1gsz6i2yl88"; + }; + propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "tests module permissions in your distribution"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; - TestPerlCritic = buildPerlPackage rec { - name = "Test-Perl-Critic-1.02"; + TestPerlCritic = buildPerlModule rec { + name = "Test-Perl-Critic-1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz"; - sha256 = "89b242ff539034336ed87c11ef3e5ecac47c333a6ab8b46aab4cc449e3739a89"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Perl-Critic-1.04.tar.gz; + sha256 = "28f806b5412c7908b56cf1673084b8b44ce1cb54c9417d784d91428e1a04096e"; }; - propagatedBuildInputs = [ PerlCritic ]; + propagatedBuildInputs = [ MCE PerlCritic ]; }; TestPerlTidy = buildPerlPackage rec { @@ -14259,22 +15545,22 @@ let self = _self // overrides; _self = with self; { }; TestPodCoverage = buildPerlPackage rec { - name = "Test-Pod-Coverage-1.08"; + name = "Test-Pod-Coverage-1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "0y2md932zhbxdjwzskx0vmw2qy7jxkn87f9lb5h3f3vxxg1kcqz0"; + url = mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz; + sha256 = "1m203mhgfilz7iqc8mxaw4lw02fz391mni3n25sfx7nryylwrja8"; }; - propagatedBuildInputs = [PodCoverage]; + propagatedBuildInputs = [ PodCoverage ]; }; - TestPodLinkCheck = buildPerlPackage rec { + TestPodLinkCheck = buildPerlModule rec { name = "Test-Pod-LinkCheck-0.008"; src = fetchurl { url = "mirror://cpan/authors/id/A/AP/APOCAL/${name}.tar.gz"; sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0"; }; - buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ CaptureTiny Moose TestPod podlinkcheck ]; + buildInputs = [ ModuleBuildTiny TestPod ]; + propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck ]; meta = { homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/; description = "Tests POD for invalid links"; @@ -14282,25 +15568,26 @@ let self = _self // overrides; _self = with self; { }; }; - TestPodNo404s = buildPerlPackage rec { + TestPodNo404s = buildPerlModule rec { name = "Test-Pod-No404s-0.02"; src = fetchurl { url = "mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-No404s-0.02.tar.gz"; sha256 = "0ycfghsyl9f31kxdppjwx2g5iajrqh3fyywz0x7d8ayndw2hdihi"; }; - propagatedBuildInputs = [ LWPUserAgent ModuleBuildTiny URIFind TestPod ]; + propagatedBuildInputs = [ LWP URIFind ]; meta = { homepage = http://search.cpan.org/dist/Test-Pod-No404s/; description = "Checks POD for any http 404 links"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny TestPod ]; }; TestPortabilityFiles = buildPerlPackage { - name = "Test-Portability-Files-0.06"; + name = "Test-Portability-Files-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.06.tar.gz; - sha256 = "3e0fd033387ab82df8aedd42a14a8e64200aebd59447ad62a3bc411ff4a808a8"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.09.tar.gz; + sha256 = "16d31fa941af1a79faec0192e09880cb19225cde649c03d2e3ceda9b455a621c"; }; meta = { description = "Check file names portability"; @@ -14320,6 +15607,19 @@ let self = _self // overrides; _self = with self; { }; }; + TestRequiresInternet = buildPerlPackage rec { + name = "Test-RequiresInternet-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz; + sha256 = "0gl33vpj9bb78pzyijp884b66sbw6jkh1ci0xki8rmf03hmb79xv"; + }; + meta = { + description = "Easily test network connectivity"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/dist/Test-RequiresInternet"; + }; + }; + TestRoo = buildPerlPackage rec { name = "Test-Roo-1.004"; src = fetchurl { @@ -14327,18 +15627,18 @@ let self = _self // overrides; _self = with self; { sha256 = "1mnym49j1lj7gzylma5b6nr4vp75rmgz2v71904v01xmxhy9l4i1"; }; - propagatedBuildInputs = [ strictures Moo MooXTypesMooseLike SubInstall - CaptureTiny ]; + propagatedBuildInputs = [ Moo MooXTypesMooseLike SubInstall strictures ]; + buildInputs = [ CaptureTiny ]; }; TestRoutine = buildPerlPackage { - name = "Test-Routine-0.018"; + name = "Test-Routine-0.025"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.018.tar.gz; - sha256 = "1slaljcija2pbsxdyrqsh09pgajxbln68gb47l9fwffb6gsp5f3m"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.025.tar.gz; + sha256 = "13gxczy0mx3rqnp55vc0j2d936qldrimmad87nmf4wrj0kd2lw92"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ Moose namespaceautoclean namespaceclean ParamsUtil SubExporter ]; + buildInputs = [ TestAbortable TestFatal ]; + propagatedBuildInputs = [ Moose TestSimple13 namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; @@ -14348,14 +15648,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRun = buildPerlPackage rec { + TestRun = buildPerlModule rec { name = "Test-Run-0.0304"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323"; }; - buildInputs = [ ModuleBuild TestTrap ]; - propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MROCompat Moose MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; + buildInputs = [ TestTrap ]; + propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Base class to run standard TAP scripts"; @@ -14363,14 +15663,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunCmdLine = buildPerlPackage rec { + TestRunCmdLine = buildPerlModule rec { name = "Test-Run-CmdLine-0.0131"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18"; }; - buildInputs = [ ModuleBuild TestTrap ]; - propagatedBuildInputs = [ Moose MooseXGetopt TestRun UNIVERSALrequire YAMLLibYAML ]; + buildInputs = [ TestRun TestTrap ]; + propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; meta = { homepage = http://web-cpan.berlios.de/modules/Test-Run/; description = "Analyze tests from the command line using Test::Run"; @@ -14378,14 +15678,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginAlternateInterpreters = buildPerlPackage rec { + TestRunPluginAlternateInterpreters = buildPerlModule rec { name = "Test-Run-Plugin-AlternateInterpreters-0.0124"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3"; }; - buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ Moose ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Define different interpreters for different test scripts with Test::Run"; @@ -14393,14 +15693,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginBreakOnFailure = buildPerlPackage rec { - name = "Test-Run-Plugin-BreakOnFailure-v0.0.5"; + TestRunPluginBreakOnFailure = buildPerlModule rec { + name = "Test-Run-Plugin-BreakOnFailure-0.0.5"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz; sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430"; }; - buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ Moose ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Stop processing the entire test suite"; @@ -14408,14 +15708,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginColorFileVerdicts = buildPerlPackage rec { + TestRunPluginColorFileVerdicts = buildPerlModule rec { name = "Test-Run-Plugin-ColorFileVerdicts-0.0124"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ] ++ moreInputs; + buildInputs = [ TestRun TestRunCmdLine TestTrap ]; + propagatedBuildInputs = [ Moose ]; moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { @@ -14431,8 +15731,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ TestRun TestRunCmdLine ] ++ moreInputs; + buildInputs = [ TestRun TestRunCmdLine TestTrap ]; moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { @@ -14442,14 +15741,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec { + TestRunPluginTrimDisplayedFilenames = buildPerlModule rec { name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5"; }; - buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ Moose ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Trim the first components"; @@ -14458,12 +15757,12 @@ let self = _self // overrides; _self = with self; { }; TestRunValgrind = buildPerlModule rec { - name = "Test-RunValgrind-0.0.1"; + name = "Test-RunValgrind-0.2.0"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "67bf3cf3e7d5d23ec33e592f8b0dbcccfa01205d5bf0a3d73d8c8358d167e83f"; + sha256 = "70947565ad0be3e5d0cd9aca9e1fd0cb07c873e574310e92e8eca629ec6cd631"; }; - buildInputs = [ ModuleBuild perl ]; + buildInputs = [ TestTrap ]; propagatedBuildInputs = [ PathTiny ]; meta = { description = "Tests that an external program is valgrind-clean"; @@ -14472,22 +15771,22 @@ let self = _self // overrides; _self = with self; { }; TestScript = buildPerlPackage rec { - name = "Test-Script-1.10"; + name = "Test-Script-1.23"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "0wxbia5mmn73n5rkv857fv547kihpg3amizqllyh5flap6kbc7fn"; + sha256 = "1ca4mwcghgpdrpcg6xc0iwp3ga9c94qni9zf4hhqq8lpjwdyg89k"; }; - buildInputs = [ TestTester ]; + buildInputs = [ Test2Suite ]; - propagatedBuildInputs = [ ProbePerl IPCRun3 ]; + propagatedBuildInputs = [ CaptureTiny ProbePerl TestSimple13 ]; }; TestSharedFork = buildPerlPackage rec { - name = "Test-SharedFork-0.34"; + name = "Test-SharedFork-0.35"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "1yq4xzify3wqdc07zq33lwgh9gywp3qd8w6wzwrllbjw0hhkm4s8"; + sha256 = "17y52j20k1bs9dgf4n6rhh9dn4cfxxbnfn2cfs7pb00fc5jyhci9"; }; buildInputs = [ TestRequires ]; meta = { @@ -14500,46 +15799,46 @@ let self = _self // overrides; _self = with self; { TestSimple = null; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302125"; + name = "Test-Simple-1.302135"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302125.tar.gz; - sha256 = "8a3785a4fa60c4c5ae0c5cac2f3312242f2b36ca20e368d8a9ec22b4061aa317"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302135.tar.gz; + sha256 = "889b59d5fb5955b5d15dbef1020aa2e9a3ccafacc8717c16a939d7cfd619ab70"; }; meta = { description = "Basic utilities for writing tests"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; - buildInputs = [ ExtUtilsMakeMaker ]; }; TestSpec = buildPerlPackage rec { - name = "Test-Spec-0.51"; + name = "Test-Spec-0.54"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYJONES/${name}.tar.gz"; - sha256 = "0n2pzc32q4fr1b9w292ld9gh3yn3saxib3hxrjx6jvcmy3k9jkbi"; + url = mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz; + sha256 = "1lk5l69bm6yl1zxzz5v6mizzqfinpdhasmi4qjxr1vnwcl9cyc8a"; }; - propagatedBuildInputs = [ PackageStash TestDeep TestTrap TieIxHash ]; + propagatedBuildInputs = [ DevelGlobalPhase PackageStash TieIxHash ]; meta = { description = "Write tests in a declarative specification style"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDeep TestTrap ]; }; TestSubCalls = buildPerlPackage rec { - name = "Test-SubCalls-1.09"; + name = "Test-SubCalls-1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "a334b0457da338d79be2dbb62d403701fc90f7607df840115ff45ee1e2bd6e70"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz; + sha256 = "cbc1e9b35a05e71febc13e5ef547a31c8249899bb6011dbdc9d9ff366ddab6c2"; }; propagatedBuildInputs = [ HookLexWrap ]; }; TestSynopsis = buildPerlPackage rec { - name = "Test-Synopsis-0.11"; + name = "Test-Synopsis-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/${name}.tar.gz"; - sha256 = "1jn3vna5r5fa9nv33n1x0bmgc434sk0ggar3jm78xx0zzy5jnsxv"; + sha256 = "1cxxidhwf8j8n41d423ankvls2wdi7aw755csi3hcv3mj9k67mfi"; }; meta = { description = "Test your SYNOPSIS code"; @@ -14562,16 +15861,16 @@ let self = _self // overrides; _self = with self; { }; TestTCP = buildPerlPackage rec { - name = "Test-TCP-2.14"; + name = "Test-TCP-2.19"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; - sha256 = "00bxgm7qva4fd25phwl8fvv36h8h5k3jk89hz9302a288wv3ysmr"; + sha256 = "14ahzklq3xgmwj58p9vdcfgpggrmh3nigq5mzqk4wakbb6fjs0fx"; }; - propagatedBuildInputs = [ TestSharedFork ]; meta = { description = "Testing TCP program"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestSharedFork ]; }; TestTester = buildPerlPackage { @@ -14583,25 +15882,35 @@ let self = _self // overrides; _self = with self; { }; TestTime = buildPerlPackage rec { - name = "Test-Time-0.04"; + name = "Test-Time-0.05"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SATOH/${name}.tar.gz"; - sha256 = "d8c1bc57f9767ae8122fc4ab873bd991cb9ea8e9422c66399acb66770fa5c2ea"; + sha256 = "abef8885a811440114bfe067edc32f08500fbfd624902f8c3a81fc224ac4b410"; }; - buildInputs = [ FileSlurp ]; meta = { description = "Overrides the time() and sleep() core functions for testing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - TestTrailingSpace = buildPerlPackage rec { + TestToolbox = buildPerlModule rec { + name = "Test-Toolbox-0.4"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz; + sha256 = "1hxx9rhvncvn7wvzhzx4sk00w0xq2scgspfhhyqwjnm1yg3va820"; + }; + meta = { + description = "Test::Toolbox - tools for testing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TestTrailingSpace = buildPerlModule rec { name = "Test-TrailingSpace-0.0301"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "a28875747adb7a0e7d1ae8a4ffe71869e7ceb3a85d0cb30172959dada7de5970"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ FileFindObjectRule ]; meta = { description = "Test for trailing space in source files"; @@ -14609,7 +15918,7 @@ let self = _self // overrides; _self = with self; { }; }; - TestUnitLite = buildPerlPackage { + TestUnitLite = buildPerlModule { name = "Test-Unit-Lite-0.1202"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz; @@ -14637,12 +15946,12 @@ let self = _self // overrides; _self = with self; { }; TestWarn = buildPerlPackage { - name = "Test-Warn-0.30"; + name = "Test-Warn-0.32"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.30.tar.gz; - sha256 = "0haf2ii7br5z0psmkvlvmx2z2q9qz1c70gx0969r378qjidmb5w1"; + url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.32.tar.gz; + sha256 = "1lkkpx8gyfsxfkys1psp990xyy1zxf8rsqd44az57x4y3zkidi9g"; }; - propagatedBuildInputs = [ SubUplevel TreeDAGNode ]; + propagatedBuildInputs = [ SubUplevel ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Perl extension to test methods for warnings"; @@ -14656,7 +15965,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; }; - buildInputs = [ TestTester CPANMetaCheck ModuleMetadata ]; + buildInputs = [ CPANMetaCheck ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; @@ -14666,10 +15975,10 @@ let self = _self // overrides; _self = with self; { }; TestWithoutModule = buildPerlPackage { - name = "Test-Without-Module-0.17"; + name = "Test-Without-Module-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.17.tar.gz; - sha256 = "a691b0bf6d92dedbacfd547551021389ebc79c51937de2b914e792457da56ff7"; + url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz; + sha256 = "8e9aeb7c32a6c6d0b8a93114db2a8c072721273a9d9a2dd4f9ca86cfd28aa524"; }; meta = { description = "Test fallback behaviour in absence of modules"; @@ -14680,13 +15989,13 @@ let self = _self // overrides; _self = with self; { }; TestWWWMechanize = buildPerlPackage { - name = "Test-WWW-Mechanize-1.44"; + name = "Test-WWW-Mechanize-1.48"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz; - sha256 = "062pj242vsc73bw11jqpap92ax9wzc9f2m4xhyp1wzrwkfchpl2q"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.48.tar.gz; + sha256 = "1d11fx9155d5v17d5w7q3kj37b01l8yj2yb0g6b0z1vh938rrlcr"; }; - buildInputs = [ CGI ]; - propagatedBuildInputs = [ CarpAssertMore HTMLTree HTTPServerSimple LWP TestLongString URI WWWMechanize ]; + buildInputs = [ TestLongString ]; + propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; meta = { homepage = https://github.com/petdance/test-www-mechanize; description = "Testing-specific WWW::Mechanize subclass"; @@ -14701,12 +16010,12 @@ let self = _self // overrides; _self = with self; { sha256 = "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv"; }; doCheck = false; # listens on an external port - propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean - TestWWWMechanize WWWMechanize ]; + propagatedBuildInputs = [ CatalystRuntime WWWMechanize ]; meta = { description = "Test::WWW::Mechanize for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CatalystPluginSession CatalystPluginSessionStateCookie TestException TestWWWMechanize Testutf8 ]; }; TestWWWMechanizeCGI = buildPerlPackage { @@ -14715,21 +16024,22 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz; sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; - propagatedBuildInputs = [ CGI TestWWWMechanize WWWMechanizeCGI ]; + propagatedBuildInputs = [ WWWMechanizeCGI ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestLongString TestWWWMechanize ]; }; TestWWWMechanizePSGI = buildPerlPackage { - name = "Test-WWW-Mechanize-PSGI-0.35"; + name = "Test-WWW-Mechanize-PSGI-0.38"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-PSGI-0.35.tar.gz; - sha256 = "1hih8s49zf38bisvhnhzrrj0zwyiivkrbs7nmmdqm1qqy27wv7pc"; + url = mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.38.tar.gz; + sha256 = "0fsh2i05kf1kfavv2r9kmnjl7qlyqrd11ikc0qcqzzxsqzzjkg9r"; }; - buildInputs = [ TestPod CGI ]; - propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; + buildInputs = [ CGI TestLongString TestWWWMechanize ]; + propagatedBuildInputs = [ Plack ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -14755,6 +16065,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; sha256 = "0hxrfs7p9hqkhvv5nhk2hd3kh32smwng4nz47b8xf4iw2q1n2dr7"; }; + buildInputs = [ TestBase ]; }; TextAbbrev = buildPerlPackage { @@ -14770,11 +16081,11 @@ let self = _self // overrides; _self = with self; { }; }; - TextAligner = buildPerlPackage rec { - name = "Text-Aligner-0.12"; + TextAligner = buildPerlModule rec { + name = "Text-Aligner-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0a6zkchc0apvzkch6z18cx6h97xfiv50r7n4xhg90x8dvk75qzcs"; + sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776"; }; meta = { description = "Align text in columns"; @@ -14794,10 +16105,10 @@ let self = _self // overrides; _self = with self; { }; TextAutoformat = buildPerlPackage { - name = "Text-Autoformat-1.72"; + name = "Text-Autoformat-1.74"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.72.tar.gz; - sha256 = "b541152699fcd0f026322f283b7d9184839742aee0edb317a014c195ea26ae51"; + url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.74.tar.gz; + sha256 = "07eb3c2b3515897340ca6e9377495bbe2e05ec80d7f3f146adab8e534a818d5e"; }; propagatedBuildInputs = [ TextReform ]; meta = { @@ -14820,11 +16131,11 @@ let self = _self // overrides; _self = with self; { }; TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.81"; - buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ]; + name = "Text-BibTeX-0.85"; + buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "0dig1zlglm8rwm8fhnz087lx6gixj9jx10kxn1fx3swdkfblhsmf"; + sha256 = "036kxgbn1jf70pfm2lmjlzjwnhbkd888fp5lyvmkjpdd15gla18h"; }; perlPreHook = "export LD=$CC"; perlPostHook = stdenv.lib.optionalString stdenv.isDarwin '' @@ -14841,6 +16152,7 @@ let self = _self // overrides; _self = with self; { description = "Interface to read and parse BibTeX files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ ScalarListUtils ]; }; TextBrew = buildPerlPackage rec { @@ -14860,10 +16172,10 @@ let self = _self // overrides; _self = with self; { }; TextCSV = buildPerlPackage rec { - name = "Text-CSV-1.33"; + name = "Text-CSV-1.95"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz"; - sha256 = "9c5b8fb9baffd58f02ed2b3f0b6d9a6454198f18a80e7f3a049680ddbdb24115"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.95.tar.gz; + sha256 = "7e0a11d9c1129a55b68a26aa4b37c894279df255aa63ec8341d514ab848dbf61"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; @@ -14887,10 +16199,10 @@ let self = _self // overrides; _self = with self; { }; TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.23"; + name = "Text-CSV_XS-1.35"; src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; - sha256 = "5714e1c275e7715aee44f820f8ca26c976fbb563668de7eba42a4419a05a4b5a"; + sha256 = "2b4f111e9486b230b02bfabbbf50c453f959d18ec17351a930e41f0959b358b7"; }; meta = { homepage = https://metacpan.org/pod/Text::CSV_XS; @@ -14900,10 +16212,10 @@ let self = _self // overrides; _self = with self; { }; TextDiff = buildPerlPackage rec { - name = "Text-Diff-1.43"; + name = "Text-Diff-1.45"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; - sha256 = "1ampmj1k5cabgcaw2iqwqbmnq6hrnl96f7rk8hh22gsw6my86bac"; + sha256 = "013g13prdghxvrp5754gyc7rmv1syyxrhs33yc5f0lrz3dxs1fp8"; }; propagatedBuildInputs = [ AlgorithmDiff ]; meta = { @@ -14912,11 +16224,21 @@ let self = _self // overrides; _self = with self; { }; }; + TextGerman = buildPerlPackage rec { + name = "Text-German-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz; + sha256 = "1p87pgap99lw0nv62i3ghvsi7yg90lhn8vsa3yqp75rd04clybcj"; + }; + meta = { + }; + }; + TextGlob = buildPerlPackage rec { - name = "Text-Glob-0.09"; + name = "Text-Glob-0.11"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz"; - sha256 = "0lr76wrsj8wcxrq4wi8z1640w4dmdbkznp06q744rg3g0bd238d5"; + url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz; + sha256 = "11sj62fynfgwrlgkv5a051cq6yn0pagxqjsz27dxx8phsd4wv706"; }; }; @@ -14929,10 +16251,10 @@ let self = _self // overrides; _self = with self; { }; TestInter = buildPerlPackage { - name = "Test-Inter-1.05"; + name = "Test-Inter-1.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.05.tar.gz; - sha256 = "bda95ef503f1c1b39a5cd1ea686d18a67a63b56a8eb458f0614fc2acc51f7988"; + url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.07.tar.gz; + sha256 = "c3b1e2c753b88a893e08ec2dd3d0f0b3eb513cdce7afa52780cb0e02b6c576ee"; }; meta = { description = "Framework for more readable interactive test scripts"; @@ -14958,23 +16280,23 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1"; }; - buildInputs = [ FileSlurp ListMoreUtils Encode ExtUtilsMakeMaker - TestException HTMLTidy TestDifferences ]; + buildInputs = [ ListMoreUtils TestDifferences TestException ]; }; TestMagpie = buildPerlPackage { - name = "Test-Magpie-0.05"; + name = "Test-Magpie-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CY/CYCLES/Test-Magpie-0.05.tar.gz; - sha256 = "0a0c6vcj92spy6ngfdqn9yfym37jwxlds7hlw6xphkdmcklynh0b"; + url = mirror://cpan/authors/id/S/ST/STEVENL/Test-Magpie-0.11.tar.gz; + sha256 = "1c4iy35yg3fa9mrc4phmpz46fkihl6yic6a13fpcxyd3xafd5zhm"; }; - propagatedBuildInputs = [ aliased DevelPartialDump ListAllUtils Moose MooseXParamsValidate MooseXTypes MooseXTypesStructured namespaceautoclean SetObject SubExporter TestFatal ]; + propagatedBuildInputs = [ MooseXTypesStructured SetObject UNIVERSALref aliased ]; meta = { description = "Spy on objects to achieve test doubles (mock testing)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestFatal Throwable ]; }; TestMinimumVersion = buildPerlPackage rec { @@ -14983,8 +16305,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "3fba4e8fcf74806259aa639be7d90e70346ad0e0e4b8b619593490e378241970"; }; - buildInputs = [ TestTester ]; - propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion ]; + propagatedBuildInputs = [ PerlMinimumVersion ]; meta = { homepage = https://github.com/rjbs/Test-MinimumVersion; description = "Does your code require newer perl than you think?"; @@ -14993,10 +16314,10 @@ let self = _self // overrides; _self = with self; { }; TextMicroTemplate = buildPerlPackage { - name = "Text-MicroTemplate-0.20"; + name = "Text-MicroTemplate-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.20.tar.gz; - sha256 = "0da44kd3z4n23wivy99583cscmiay2xv0wq9dzx6mg8vq874kx74"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.24.tar.gz; + sha256 = "1j5ljx7hs4k29732nr5f2m4kssz4rqjw3kknsnhams2yydqix01j"; }; meta = { description = "Micro template engine with Perl5 language"; @@ -15031,12 +16352,11 @@ let self = _self // overrides; _self = with self; { }; TextPDF = buildPerlPackage rec { - name = "Text-PDF-0.29a"; + name = "Text-PDF-0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MH/MHOSKEN/${name}.tar.gz"; - sha256 = "11jig38vps957zyc9372q2g0jcabxgkql3b5vazc1if1ajhlvc4s"; + url = mirror://cpan/authors/id/B/BH/BHALLISSY/Text-PDF-0.31.tar.gz; + sha256 = "0s5cimfr4wwzgv15k30x83ncg1257jwsvmbmb86lp02rw5g537yz"; }; - propagatedBuildInputs = [ CompressZlib ]; }; TextQuoted = buildPerlPackage { @@ -15063,12 +16383,11 @@ let self = _self // overrides; _self = with self; { # at /etc/fonts/font.conf is not available. doCheck = false; - propagatedBuildInputs = [ TestException IOStringy ClassAccessor Readonly - ListMoreUtils TestPod TestPodCoverage GraphViz ReadonlyXS - TextTabularDisplay]; + propagatedBuildInputs = [ ClassAccessor IOStringy ListMoreUtils Readonly TextAutoformat ]; + buildInputs = [ TestException ]; }; - TextReform = buildPerlPackage { + TextReform = buildPerlModule { name = "Text-Reform-1.20"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz; @@ -15081,10 +16400,10 @@ let self = _self // overrides; _self = with self; { }; TextRoman = buildPerlPackage rec { - name = "Text-Roman-3.3"; + name = "Text-Roman-3.5"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EC/ECALDER/${name}.tar.gz"; - sha256 = "1ris38kdj15l8l7cl5whdpyyvb0rz8dh9p0w36wgydi3b2pxsa25"; + url = mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz; + sha256 = "0sh47svzz0wm993ywfgpn0fvhajl2sj5hcnf5zxjz02in6ihhjnb"; }; meta = { description = "Allows conversion between Roman and Arabic algarisms"; @@ -15093,10 +16412,10 @@ let self = _self // overrides; _self = with self; { }; TextSimpleTable = buildPerlPackage { - name = "Text-SimpleTable-2.03"; + name = "Text-SimpleTable-2.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.03.tar.gz; - sha256 = "15hpry9jwrf1vbjyk21s65rllxrdvp2fdzzv9gsvczggby2yyzfs"; + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.04.tar.gz; + sha256 = "14sjmdcy7s73sk740g3ccmzmwhwd52x5ay3bjmibjlql1cag70ld"; }; meta = { description = "Simple eyecandy ASCII tables"; @@ -15105,34 +16424,32 @@ let self = _self // overrides; _self = with self; { }; TextSoundex = buildPerlPackage { - name = "Text-Soundex-3.04"; + name = "Text-Soundex-3.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.04.tar.gz; - sha256 = "2e56bb4324ee0186b908b3bd78463643affe7295624af0628e81491e910283d9"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz; + sha256 = "f6dd55b4280b25dea978221839864382560074e1d6933395faee2510c2db60ed"; }; - propagatedBuildInputs = [ if_ ]; }; - TextSprintfNamed = buildPerlPackage rec { + TextSprintfNamed = buildPerlModule rec { name = "Text-Sprintf-Named-0.0402"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "951317fce8fa5dd08190ba760182bc71f2b4346fa21df55c76155e6353e2864f"; }; - buildInputs = [ ModuleBuild TestWarn ]; + buildInputs = [ TestWarn ]; meta = { description = "Sprintf-like function with named conversions"; license = stdenv.lib.licenses.mit; }; }; - TextTable = buildPerlPackage rec { - name = "Text-Table-1.130"; + TextTable = buildPerlModule rec { + name = "Text-Table-1.133"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "02c8v38k639r23dgxwgvsy4myjjzvgdb238kpiffsiz25ab3xp5j"; + sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd"; }; - buildInputs = [ TestPod TestPodCoverage ]; propagatedBuildInputs = [ TextAligner ]; meta = { homepage = http://www.shlomifish.org/open-source/projects/docmake/; @@ -15159,28 +16476,27 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; sha256 = "1s46s4pg5mpfllx3icf4vnqz9iadbbdbsr5p7pr6gdjnzbx902gb"; }; - propagatedBuildInputs = [ TextAligner ]; }; TextTemplate = buildPerlPackage { - name = "Text-Template-1.46"; + name = "Text-Template-1.52"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJD/Text-Template-1.46.tar.gz; - sha256 = "77d812cb86e48091bcd59aa8522ef887b33a0ff758f8a269da8c2b733889d580"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.52.tar.gz; + sha256 = "85da7a5e7eecf1871cda8bf3ce7b8ad0b5f75c6c5791f43a7d94373406859b6c"; }; meta = { description = "Unknown"; license = "unknown"; }; + buildInputs = [ TestWarnings ]; }; - TestTrap = buildPerlPackage rec { - name = "Test-Trap-0.3.2"; + TestTrap = buildPerlModule rec { + name = "Test-Trap-0.3.3"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/${name}.tar.gz"; - sha256 = "1ci5ag9pm850ww55n2929skvw3avy6xcrwmmi2yyn0hifxx9dybs"; + url = mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.3.tar.gz; + sha256 = "1676gqjyk0zig3yyqv053y5j1pajp2af08ffmgx94n414whbhm5c"; }; - buildInputs = [ TestTester ]; propagatedBuildInputs = [ DataDump ]; meta = { description = "Trap exit codes, exceptions, output, etc"; @@ -15189,13 +16505,13 @@ let self = _self // overrides; _self = with self; { }; TestVars = buildPerlModule rec { - name = "Test-Vars-0.008"; + name = "Test-Vars-0.014"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1h0kifiia78s3425hvpjs5di5539vsz15mmkkk0cwshwizhcwp7h"; + sha256 = "0qr8q0ksr925ycwbsyxjwgz4p9r7a8vkxpn33vy23zbijwpa3xx7"; }; - buildInputs = [ TestTester ]; + buildInputs = [ ModuleBuildTiny ]; meta = { homepage = https://github.com/gfx/p5-Test-Vars; @@ -15205,10 +16521,10 @@ let self = _self // overrides; _self = with self; { }; TestVersion = buildPerlPackage rec { - name = "Test-Version-2.05"; + name = "Test-Version-2.07"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "39c0ec02663da0e56962bdafaef6790cf83d12b4d90e8a4cdc971d57d869d63f"; + sha256 = "eae8b758395d6b23d4ce3109b055663379b9970fb8f81e5803d145dbc5ccdbac"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ FileFindRulePerl ]; @@ -15219,13 +16535,12 @@ let self = _self // overrides; _self = with self; { }; }; - TextTrim = buildPerlPackage { + TextTrim = buildPerlModule { name = "Text-Trim-1.02"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MATTLAW/Text-Trim-1.02.tar.gz; sha256 = "1bnwjl5n04w8nnrzrm75ljn4pijqbijr9csfkjcs79h4gwn9lwqw"; }; - propagatedBuildInputs = [ CGI ModuleBuild ]; meta = { description = "Remove leading and/or trailing whitespace from strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15247,10 +16562,10 @@ let self = _self // overrides; _self = with self; { }; TextUnidecode = buildPerlPackage rec { - name = "Text-Unidecode-1.24"; + name = "Text-Unidecode-1.30"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz"; - sha256 = "124q1zfiyj70zz691nrfjfmv4i8dyalddhqisp8y28kzfnba9vrh"; + url = mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz; + sha256 = "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c"; }; }; @@ -15280,7 +16595,7 @@ let self = _self // overrides; _self = with self; { }; }; - TextWikiFormat = buildPerlPackage { + TextWikiFormat = buildPerlModule { name = "Text-WikiFormat-0.81"; src = fetchurl { url = mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz; @@ -15296,7 +16611,7 @@ let self = _self // overrides; _self = with self; { TextWrapI18N = buildPerlPackage { name = "Text-WrapI18N-0.06"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz; + url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz; sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"; }; propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; @@ -15321,13 +16636,14 @@ let self = _self // overrides; _self = with self; { description = "Word wrap text by breaking long lines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDifferences ]; }; threads = buildPerlPackage rec { - name = "threads-2.07"; + name = "threads-2.21"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0fgprp2ghrh1ryxmr0y9bpsjl1ifbf4lqml8k017cbl4zbn21lim"; + sha256 = "047i22mdnf7fa0h9w5jhqrjbg561l5jxk8xqzwh6zbmwlac4qf98"; }; meta = { description = "Perl interpreter-based threads"; @@ -15336,10 +16652,10 @@ let self = _self // overrides; _self = with self; { }; threadsshared = buildPerlPackage rec { - name = "threads-shared-1.51"; + name = "threads-shared-1.58"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0qsbl8rx8p09cb5vj1yhwf1h2awvimfyckw1qwrqbk7dxjldrimn"; + sha256 = "04qbypzgp49sq1wq5kip0m95lffv0pc8xj2wplrdpyqz87y105xd"; }; meta = { description = "Perl extension for sharing data structures between threads"; @@ -15348,10 +16664,10 @@ let self = _self // overrides; _self = with self; { }; ThreadQueue = buildPerlPackage rec { - name = "Thread-Queue-3.09"; + name = "Thread-Queue-3.12"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0f03v10rsasi2j4lh8xw44jac8nfbw66274qgsz5lsmfd6wqvj12"; + sha256 = "0wpqdbdfa4mw8lpcaw1lp2d553gl65cl8mli1srj8wrg0kaxshhx"; }; meta = { description = "Thread-safe queues"; @@ -15360,10 +16676,10 @@ let self = _self // overrides; _self = with self; { }; ThreadSemaphore = buildPerlPackage { - name = "Thread-Semaphore-2.12"; + name = "Thread-Semaphore-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.12.tar.gz; - sha256 = "e0f8e7057b073003e5a96a55b778abb8ee1cc1b279febedce0166526f2988965"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.13.tar.gz; + sha256 = "e3fe2cc047575529c8ea4c168cef8fab2ec931729a1826ffca1ef63e7e45bc81"; }; meta = { description = "Thread-safe semaphores"; @@ -15377,8 +16693,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "184gdcwxqwnkrx5md968v1ny70pq6blzpkihccm3bpdxnpgd11wr"; }; - buildInputs = [ DevelStackTrace ]; - propagatedBuildInputs = [ DevelStackTrace ModuleRuntime Moo ]; + propagatedBuildInputs = [ DevelStackTrace Moo ]; meta = { homepage = https://github.com/rjbs/Throwable; description = "A role for classes that can be thrown"; @@ -15393,7 +16708,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; sha256 = "1bf740450d3a6d7c12b48c25f7da5964e44e7cc38b28572cfb76ff22464f4469"; }; - propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassVirtual enum ]; + propagatedBuildInputs = [ ClassVirtual enum ]; meta = { description = "A Least-Recently Used cache"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15413,10 +16728,10 @@ let self = _self // overrides; _self = with self; { }; TieCycle = buildPerlPackage rec { - name = "Tie-Cycle-1.21"; + name = "Tie-Cycle-1.225"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "0r1mdmd01s42vwlwr2mvr1ywjvvfkc79vz6ysdii5fvcgs6wk50y"; + sha256 = "0i9xq2qm50p2ih24265jndp2x8hfq7ap0d88nrlv5yaad4hxhc7k"; }; meta = { description = "Cycle through a list of values via a scalar"; @@ -15435,7 +16750,7 @@ let self = _self // overrides; _self = with self; { }; }; - TieIxHash = buildPerlPackage { + TieIxHash = buildPerlModule { name = "Tie-IxHash-1.23"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz; @@ -15478,13 +16793,26 @@ let self = _self // overrides; _self = with self; { }; }; + TieSub = buildPerlPackage rec { + name = "Tie-Sub-1.001"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz; + sha256 = "1cgiyj85hhw2m4x2iv4zgaj3hzf3fghircpcfqmjndni4r4a0wgg"; + }; + propagatedBuildInputs = [ ParamsValidate ]; + buildInputs = [ ModuleBuild TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Tie::Sub - Tying a subroutine, function or method to a hash"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TieToObject = buildPerlPackage { name = "Tie-ToObject-0.03"; src = fetchurl { url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz; sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3"; }; - propagatedBuildInputs = [Testuseok]; }; TimeDate = buildPerlPackage { @@ -15501,7 +16829,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; sha256 = "1f5vkid4pl5iq3hal01hk1zjbbzrqpx4m1djawbp93l152shb0j5"; }; - buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Rounded or exact English expression of durations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15509,10 +16836,10 @@ let self = _self // overrides; _self = with self; { }; TimeDurationParse = buildPerlPackage rec { - name = "Time-Duration-Parse-0.12"; + name = "Time-Duration-Parse-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; - sha256 = "0yxfxw7fxs19nncpv54nqh21ak2cmvpz7ks8d9v4lz3mbq6q0q9s"; + sha256 = "0affdzhsiy7dr6dzj2p6m9lynmjh53k31bprfsfa21pz8551hjj1"; }; buildInputs = [ TimeDuration ]; propagatedBuildInputs = [ ExporterLite ]; @@ -15523,18 +16850,18 @@ let self = _self // overrides; _self = with self; { }; TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9726"; + name = "Time-HiRes-1.9753"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "17hhd53p72z08l1riwz5f6rch6hngby1pympkla5miznn7cjlrpz"; + url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9753.tar.gz; + sha256 = "05a9xhn8y0f679kg8n0n3ng4mk6sd7isihqbbhfh29nxkkwxbgqg"; }; }; TimeLocal = buildPerlPackage { - name = "Time-Local-1.2300"; + name = "Time-Local-1.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.2300.tar.gz; - sha256 = "b2acca03700a09f8ae737d3084f3f6287e983da9ab7b537c6599c291b669fb49"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.25.tar.gz; + sha256 = "1ae9c51d777ac44a3ebc154dc625ba24d7c0cde6a8b6dba87b46d0777889fef2"; }; meta = { description = "Efficiently compute time from local and GMT time"; @@ -15556,13 +16883,13 @@ let self = _self // overrides; _self = with self; { }; Tk = buildPerlPackage rec { - name = "Tk-804.033"; + name = "Tk-804.034"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; - sha256 = "84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad"; + sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; - buildInputs = with pkgs; [ xorg.libX11 libpng ]; + buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ]; doCheck = false; # Expects working X11. meta = { homepage = https://metacpan.org/pod/distribution/Tk/Tk.pod; @@ -15571,26 +16898,26 @@ let self = _self // overrides; _self = with self; { }; TreeDAGNode = buildPerlPackage rec { - name = "Tree-DAG_Node-1.27"; + name = "Tree-DAG_Node-1.31"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; - sha256 = "1i2i445gh7720bvv06dz67szk2z6q1pi30kb5p2shsa806sj4vr2"; + sha256 = "016kr76azxzfcpxjkhqp2piyyl6529shjis20mc3g2snfabsd2qw"; }; - buildInputs = [ TestPod FileSlurpTiny ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An N-ary tree"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ FileSlurpTiny ]; }; TreeSimple = buildPerlPackage rec { - name = "Tree-Simple-1.25"; + name = "Tree-Simple-1.33"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; - sha256 = "1xj1n70v4qbx7m9k01bj9aixk77yssliavgvfds3xj755hcan0nr"; + sha256 = "1alnwb6c7n4al91m9cyknvcyvdz521lh22dz1hyk4v7c50adffnv"; }; - buildInputs = [ TestException TestMemoryCycle ]; + buildInputs = [ TestException ]; meta = { description = "A simple tree object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15598,22 +16925,22 @@ let self = _self // overrides; _self = with self; { }; TreeSimpleVisitorFactory = buildPerlPackage { - name = "Tree-Simple-VisitorFactory-0.12"; + name = "Tree-Simple-VisitorFactory-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.12.tgz; - sha256 = "1g27xl48q1vr7aikhxg4vvcsj1si8allxz59vmnks61wsw4by7vg"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz; + sha256 = "06y2vazkl307k59hnkp9h5bp3p7711kgmp1qdhb2lgnfwzn84zin"; }; - propagatedBuildInputs = [TreeSimple]; - buildInputs = [TestException]; + propagatedBuildInputs = [ TreeSimple ]; + buildInputs = [ TestException ]; }; TryTiny = buildPerlPackage { - name = "Try-Tiny-0.22"; + name = "Try-Tiny-0.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.22.tar.gz; - sha256 = "60fba46f4693d33d54539104f9001df008dabb400b6837e9605c39a6ee6a1b19"; + url = mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz; + sha256 = "da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b"; }; - buildInputs = [ if_ ]; + buildInputs = [ CPANMetaCheck CaptureTiny ]; meta = { homepage = https://metacpan.org/release/Try-Tiny; description = "Minimal try/catch with proper preservation of $@"; @@ -15621,11 +16948,26 @@ let self = _self // overrides; _self = with self; { }; }; + Twiggy = buildPerlPackage rec { + name = "Twiggy-0.1025"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz; + sha256 = "1a57knbwync7rlzhsz1kdc0sd380xnaccwgiy1qwj5d87abdynnp"; + }; + propagatedBuildInputs = [ AnyEvent Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "AnyEvent HTTP server for PSGI (like Thin)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Twiggy"; + }; + }; + TypeTiny = buildPerlPackage { - name = "Type-Tiny-1.000005"; + name = "Type-Tiny-1.002001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.000005.tar.gz; - sha256 = "42ed36c011825aa1e6995a4e8638621a1b2103a0970b15764ca3919368042365"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002001.tar.gz; + sha256 = "93c9eeaaf23016625126794af483bc626a149f7226f9a6ec1081ef896acc13dd"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { @@ -15635,6 +16977,17 @@ let self = _self // overrides; _self = with self; { }; }; + TypesSerialiser = buildPerlPackage rec { + name = "Types-Serialiser-1.0"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz; + sha256 = "03bk0hm5ys8k7265dkap825ybn2zmzb1hl0kf1jdm8yq95w39lvs"; + }; + propagatedBuildInputs = [ commonsense ]; + meta = { + }; + }; + UNIVERSALcan = buildPerlPackage { name = "UNIVERSAL-can-1.20140328"; src = fetchurl { @@ -15649,10 +17002,10 @@ let self = _self // overrides; _self = with self; { }; UNIVERSALisa = buildPerlPackage { - name = "UNIVERSAL-isa-1.20120726"; + name = "UNIVERSAL-isa-1.20171012"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-isa-1.20120726.tar.gz; - sha256 = "1qal99sp888b50kwank9ffyprv7kqx42p4vyfahdabf915lyzc61"; + url = mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz; + sha256 = "0avzv9j32aab6l0rd63n92v0pgliz1p4yabxxjfq275hdh1mcsfi"; }; meta = { homepage = https://github.com/chromatic/UNIVERSAL-isa; @@ -15661,6 +17014,19 @@ let self = _self // overrides; _self = with self; { }; }; + UNIVERSALref = buildPerlPackage rec { + name = "UNIVERSAL-ref-0.14"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JJ/JJORE/UNIVERSAL-ref-0.14.tar.gz; + sha256 = "1ar8dfj90nn52cb8c6yyj4bi6ya8hk2f2sl0a5q7pmchj321bn1m"; + }; + propagatedBuildInputs = [ BUtils ]; + meta = { + description = "Turns ref() into a multimethod"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + UNIVERSALrequire = buildPerlPackage rec { name = "UNIVERSAL-require-0.18"; src = fetchurl { @@ -15679,7 +17045,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; - buildInputs = [ ModuleBuild ]; meta = { homepage = https://metacpan.org/release/Unicode-CaseFold; description = "Unicode case-folding for case-insensitive lookups"; @@ -15727,10 +17092,10 @@ let self = _self // overrides; _self = with self; { }; UnicodeLineBreak = buildPerlPackage rec { - name = "Unicode-LineBreak-2017.004"; + name = "Unicode-LineBreak-2018.003"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz"; - sha256 = "0xnb80na1ps1b5gmj3n70bk28brjzrn725kqv5q0gbb0rg2c6nv5"; + sha256 = "1cbilpy7ypr26rjr6cmrbkxhsm1l6yx7s1p7lcf0l3vi7vzr4346"; }; propagatedBuildInputs = [ MIMECharset ]; meta = { @@ -15785,12 +17150,12 @@ let self = _self // overrides; _self = with self; { }; URIdb = buildPerlModule { - name = "URI-db-0.15"; + name = "URI-db-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.15.tar.gz; - sha256 = "ac3dc3eeb8ca58dc4f7e1dfed6bca5bb8ebbc5dfacee63161490b09a4bfac982"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.18.tar.gz; + sha256 = "460a1d3b9a45779f56dbbeebc60612370b32771f3158c87da981857163b43e0b"; }; - propagatedBuildInputs = [ URI URINested ]; + propagatedBuildInputs = [ URINested ]; meta = { homepage = https://search.cpan.org/dist/URI-db/; description = "Database URIs"; @@ -15799,10 +17164,10 @@ let self = _self // overrides; _self = with self; { }; URIFind = buildPerlModule rec { - name = "URI-Find-20140709"; + name = "URI-Find-20160806"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; - sha256 = "0czc4h182s7sx3k123m7qlg7yybnwxgh369hap3c3b6xgrglrhy0"; + sha256 = "1mk3jv8x0mcq3ajrn9garnxd0jc7sw4pkwqi88r5apqvlljs84z2"; }; propagatedBuildInputs = [ URI ]; meta = { @@ -15813,10 +17178,10 @@ let self = _self // overrides; _self = with self; { }; URIFromHash = buildPerlPackage { - name = "URI-FromHash-0.04"; + name = "URI-FromHash-0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.04.tar.gz; - sha256 = "03yckli4fj8cgsyh1l1lmyxj56q9qc04a3r8kv0whbnb37zz1j23"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.05.tar.gz; + sha256 = "1l3g5ygv83vn9y1zpwjdqq5cs4ip2q058q0gmpcf5wp9rsycbjm7"; }; propagatedBuildInputs = [ ParamsValidate URI ]; meta = { @@ -15825,6 +17190,7 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestFatal ]; }; UriGoogleChart = buildPerlPackage rec { @@ -15833,7 +17199,19 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; sha256 = "00hq5cpsk7sa04n0wg52qhpqf9i2849yyvw2zk83ayh1qqpc50js"; }; - buildInputs = [URI TestMore]; + propagatedBuildInputs = [ URI ]; + }; + + UserIdentity = buildPerlPackage rec { + name = "User-Identity-0.99"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz; + sha256 = "0c2qwxgpqncm4ya3rb5zz2hgiwwf559j1b1a6llyarf9jy43hfzm"; + }; + meta = { + description = "Collect information about a user"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; URIIMAP = buildPerlPackage { @@ -15842,7 +17220,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz; sha256 = "0bdv6mrdijcq46r3lmz801rscs63f8p9qqliy2safd6fds4rj55v"; }; - propagatedBuildInputs = [URI]; + propagatedBuildInputs = [ URI ]; }; URINested = buildPerlModule { @@ -15865,7 +17243,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; sha256 = "6e6b0e4172acb6a53c222639c000608c2dd61d50848647482ac8600d50e541ef"; }; - buildInputs = [ URI ]; propagatedBuildInputs = [ URI ]; meta = { homepage = http://perl.wdlabs.com/URI-ws/; @@ -15887,10 +17264,10 @@ let self = _self // overrides; _self = with self; { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.61"; + name = "Variable-Magic-0.62"; src = fetchurl { url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "b8afe92e54c72a2ed2ca1b08ce90518b855734f7d33c454d0f66f2c1ccf8a6d7"; + sha256 = "3f9a18517e33f006a9c2fc4f43f01b54abfe6ff2eae7322424f31069296b615c"; }; meta = { homepage = http://search.cpan.org/dist/Variable-Magic/; @@ -15931,13 +17308,12 @@ let self = _self // overrides; _self = with self; { }; VMEC2 = buildPerlModule rec { - name = "VM-EC2-1.28"; + name = "VM-EC2-1.25"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; + sha256 = "cc8002965e3a4919527a85a84100cfc3703165a449ade29e95f4e31889fbd9ad"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ AnyEvent AnyEventCacheDNS AnyEventHTTP JSON LWP StringApprox URI XMLSimple ]; + propagatedBuildInputs = [ AnyEventHTTP JSON StringApprox XMLSimple ]; meta = { description = "Perl interface to Amazon EC2, Virtual Private Cloud, Elastic Load Balancing, Autoscaling, and Relational Database services"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15965,7 +17341,7 @@ let self = _self // overrides; _self = with self; { sha256 = "6239f61b20d91dce7b21e4d4f626ab93a8f1e2f207da5015590d508cf6c66a65"; }; outputs = [ "out" ]; - propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral CryptSSLeay EncodeLocale HTMLParser HTTPCookies HTTPMessage LWP LWPProtocolHttps NetHTTP NetIP TermReadKey URI ]; + propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP NetIP TermReadKey ]; meta = { homepage = http://validator.w3.org/checklink; description = "A tool to check links and anchors in Web pages or full Web sites"; @@ -15990,19 +17366,34 @@ let self = _self // overrides; _self = with self; { doCheck = false; # performs network access }; + WWWFormUrlEncoded = buildPerlModule rec { + name = "WWW-Form-UrlEncoded-0.24"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.24.tar.gz; + sha256 = "04fh54zgmrlhrmdaqs2yrwqmqwk9hd737z7rnbbd438l36skn7vd"; + }; + buildInputs = [ JSON ]; + meta = { + description = "parser and builder for application/x-www-form-urlencoded"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/WWW-Form-UrlEncoded"; + }; + }; + WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.73"; + name = "WWW-Mechanize-1.88"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/WWW-Mechanize-1.73.tar.gz; - sha256 = "1zrw8aadhwy48q51x2z2rqlkwf17bya4j4h3hy89mw783j96rmg9"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.88.tar.gz; + sha256 = "0yd8a1zsfpbv5wr79x3iqmik9gvcd10iam9dfrdan4dri9vpxn9n"; }; - propagatedBuildInputs = [ HTMLForm HTMLParser HTMLTree HTTPDaemon HTTPMessage HTTPServerSimple LWP LWPUserAgent TestWarn URI ]; + propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; meta = { homepage = https://github.com/bestpractical/www-mechanize; description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { @@ -16069,16 +17460,14 @@ let self = _self // overrides; _self = with self; { }; }; - Workflow = buildPerlPackage rec { - name = "Workflow-1.42"; + Workflow = buildPerlModule rec { + name = "Workflow-1.45"; src = fetchurl { url = "mirror://cpan/authors/id/J/JO/JONASBN/${name}.tar.gz"; - sha256 = "0d93wc9cgw862x9x5zmbx6l6326dhq8py25yqpw7nqym6yphisnc"; + sha256 = "0w814z4j85gghzqnbxzsr60m8dbqc02yi7137sq58lhbsfshmvhx"; }; - buildInputs = [ DBDMock ListMoreUtils TestException ]; - propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI - DateTime DateTimeFormatStrptime ExceptionClass FileSlurp LogDispatch - Log4Perl XMLSimple DataUUID ]; + buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; + propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; meta = { homepage = https://github.com/jonasbn/perl-workflow; description = "Simple, flexible system to implement workflows"; @@ -16087,15 +17476,16 @@ let self = _self // overrides; _self = with self; { }; Wx = buildPerlPackage rec { - name = "Wx-0.9927"; + name = "Wx-0.9932"; src = fetchurl { url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; - sha256 = "1fr23nn5cvzydl8nxfv0iljn10pvwbny0nvpjx31fn2md8dvsx51"; + sha256 = "0w0vcpk8bmklh16c0z1vxgipnmvdw7cckcmay7k7cihgb99vdz8w"; }; - propagatedBuildInputs = [ ExtUtilsXSpp AlienWxWidgets ]; + propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: # Error: Unable to initialize GTK+, is DISPLAY set properly?" doCheck = false; + buildInputs = [ ExtUtilsXSpp ]; }; WxGLCanvas = buildPerlPackage rec { @@ -16104,7 +17494,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; - propagatedBuildInputs = [ Wx OpenGL pkgs.libGLU ]; + propagatedBuildInputs = [ pkgs.libGLU Wx ]; doCheck = false; }; @@ -16128,7 +17518,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz"; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; - buildInputs = [pkgs.xlibsWrapper]; + buildInputs = [ pkgs.xlibsWrapper ]; NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server }; @@ -16139,24 +17529,20 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz"; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; - buildInputs = [pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi]; + buildInputs = [ pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi ]; NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst"; doCheck = false; # requires an X server }; X11XCB = buildPerlPackage rec { - name = "X11-XCB-0.16"; + name = "X11-XCB-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; - sha256 = "14mnvr1001py2z1n43l18yaw0plwvjg5pcsyc7k81sa0amw8ahzw"; + sha256 = "12qyf98s5hbybmh0mblpz50c00i68srq73w5rw31m2dhclj8n96q"; }; AUTOMATED_TESTING = false; - buildInputs = [ - ExtUtilsDepends ExtUtilsPkgConfig DataDump - XMLSimple XMLDescent TestDeep TestException - pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm - ]; - propagatedBuildInputs = [ XSObjectMagic Mouse MouseXNativeTraits TryTiny ]; + buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; + propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; doCheck = false; # requires an X server meta = { @@ -16165,7 +17551,7 @@ let self = _self // overrides; _self = with self; { }; }; - XMLDescent = buildPerlPackage rec { + XMLDescent = buildPerlModule rec { name = "XML-Descent-1.04"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; @@ -16180,12 +17566,12 @@ let self = _self // overrides; _self = with self; { }; XMLDOM = buildPerlPackage rec { - name = "XML-DOM-1.45"; + name = "XML-DOM-1.46"; src = fetchurl { url = "mirror://cpan/authors/id/T/TJ/TJMATHER/${name}.tar.gz"; - sha256 = "1jvqfi0jm8wh80rd5h9c3k72car8l7x1jywj8rck8w6rm1mlxldy"; + sha256 = "0phpkc4li43m2g44hdcvyxzy9pymqwlqhh5hwp2xc0cv8l5lp8lb"; }; - propagatedBuildInputs = [XMLRegExp XMLParser LWP libxml_perl]; + propagatedBuildInputs = [ XMLRegExp libxml_perl ]; }; XMLFilterBufferText = buildPerlPackage { @@ -16251,12 +17637,12 @@ let self = _self // overrides; _self = with self; { }; XMLLibXMLSimple = buildPerlPackage { - name = "XML-LibXML-Simple-0.93"; + name = "XML-LibXML-Simple-0.99"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.93.tar.gz; - sha256 = "f2eb1c1523d6414cf2a646a289b0325b489954382c862928d165a03a7cce767c"; + url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.99.tar.gz; + sha256 = "14fe45c9fcb36c1cf14ac922da4439f1f83d451a5e70aa7177cb6edb705c9e44"; }; - propagatedBuildInputs = [ FileSlurp XMLLibXML ]; + propagatedBuildInputs = [ XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -16264,10 +17650,10 @@ let self = _self // overrides; _self = with self; { }; XMLLibXSLT = buildPerlPackage rec { - name = "XML-LibXSLT-1.89"; + name = "XML-LibXSLT-1.96"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0py7ll5vj2k977l4r2g8bbz0hdy0hhkdq0mzblrwizify0825b12"; + sha256 = "0wyl8klgr65j8y8fzgwz9jlvfjwvxazna8j3dg9gksd2v973fpia"; }; buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; @@ -16279,30 +17665,29 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz; sha256 = "1vz5pbi4lm5fhq2slrs2hlp6bnk29863abgjlcx43l4dky2rbsa7"; }; - propagatedBuildInputs = [ constant ]; - buildInputs = [ ExtUtilsMakeMaker ]; }; XMLParser = buildPerlPackage { - name = "XML-Parser-2.41"; + name = "XML-Parser-2.44"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz; - sha256 = "1sadi505g5qmxr36lgcbrcrqh3a5gcdg32b405gnr8k54b6rg0dl"; + url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; + sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; }; patchPhase = if stdenv.isCygwin then '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm '' else null; makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include"; + propagatedBuildInputs = [ LWP ]; }; XMLXPath = buildPerlPackage rec { - name = "XML-XPath-1.37"; + name = "XML-XPath-1.42"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; - sha256 = "b8ae1196184f794528a9727988dce944ecec7155e6ee1c433b17e12737a22725"; + sha256 = "9e6ac67c2cead5f918a060b8b9ccdbdcaa6d610be8517bba42a96cd56748b512"; }; buildInputs = [ PathTiny ]; - propagatedBuildInputs = [ XMLParser ]; + propagatedBuildInputs = [ ScalarListUtils XMLParser ]; meta = { description = "Modules for parsing and evaluating XPath statements"; license = stdenv.lib.licenses.artistic2; @@ -16330,14 +17715,13 @@ let self = _self // overrides; _self = with self; { }; }; - XMLRSS = buildPerlPackage { - name = "XML-RSS-1.57"; + XMLRSS = buildPerlModule { + name = "XML-RSS-1.60"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.57.tar.gz; - sha256 = "c540a1aa7445bf611635537015590575c90c2b07c19529537677a4bcf3a4e6ae"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.60.tar.gz; + sha256 = "4b3359878bb1a2bc06dae7ed17b00143a2b89c814b8b12f6e2780f35b1528677"; }; - buildInputs = [ TestManifest ]; - propagatedBuildInputs = [ DateTime DateTimeFormatMail DateTimeFormatW3CDTF HTMLParser XMLParser ]; + propagatedBuildInputs = [ DateTimeFormatMail DateTimeFormatW3CDTF XMLParser ]; meta = { homepage = http://perl-rss.sourceforge.net/; description = "Creates and updates RSS files"; @@ -16355,7 +17739,6 @@ let self = _self // overrides; _self = with self; { postInstall = '' perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()" ''; - buildInputs = [ ExtUtilsMakeMaker ]; }; XMLSAXBase = buildPerlPackage { @@ -16369,14 +17752,26 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/grantm/XML-SAX-Base; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ ExtUtilsMakeMaker TestSimple13 ]; + }; + + XMLSAXExpat = buildPerlPackage rec { + name = "XML-SAX-Expat-0.51"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz; + sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac"; + }; + propagatedBuildInputs = [ XMLParser XMLSAX ]; + meta = { + description = "SAX Driver for Expat"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; XMLSAXWriter = buildPerlPackage { - name = "XML-SAX-Writer-0.56"; + name = "XML-SAX-Writer-0.57"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.56.tar.gz; - sha256 = "d073f7a25072c8150317b86b99d07031316a15bffab99e63e5afe591c8217d03"; + url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz; + sha256 = "3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0"; }; propagatedBuildInputs = [ XMLFilterBufferText XMLNamespaceSupport XMLSAXBase ]; meta = { @@ -16386,11 +17781,11 @@ let self = _self // overrides; _self = with self; { }; }; - XMLSemanticDiff = buildPerlPackage { - name = "XML-SemanticDiff-1.0000"; + XMLSemanticDiff = buildPerlModule { + name = "XML-SemanticDiff-1.0006"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-SemanticDiff-1.0000.tar.gz; - sha256 = "05rzm433vvndh49k8p4gqnyw4x4lxa4zr6qdlrlgplqkxvhvk6jk"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-SemanticDiff-1.0006.tar.gz; + sha256 = "1z0lkb7xzhw9calz4pbwzry2lqqpy6pw6pvfn2gv70ry1xqycr0k"; }; propagatedBuildInputs = [ XMLParser ]; meta = { @@ -16400,12 +17795,12 @@ let self = _self // overrides; _self = with self; { }; XMLSimple = buildPerlPackage { - name = "XML-Simple-2.20"; + name = "XML-Simple-2.25"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz; - sha256 = "0jj3jiray1l4pi9wkjcpxjc3v431whdwx5aqnhgdm4i7h3817zsw"; + url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz; + sha256 = "1y6vh328zrh085d40852v4ij2l4g0amxykswxd1nfhd2pspds7sk"; }; - propagatedBuildInputs = [XMLParser]; + propagatedBuildInputs = [ XMLSAXExpat ]; }; XMLTokeParser = buildPerlPackage rec { @@ -16435,12 +17830,12 @@ let self = _self // overrides; _self = with self; { }; XMLTwig = buildPerlPackage rec { - name = "XML-Twig-3.49"; + name = "XML-Twig-3.52"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIROD/${name}.tar.gz"; - sha256 = "00af6plljrx2dc0js60975wqp725ka4i3gzs4y6gmzkpfj5fy39y"; + sha256 = "1bc0hrz4jp6199hi29sdxmb9gyy45whla9hd19yqfasgq8k5ixzy"; }; - propagatedBuildInputs = [XMLParser]; + propagatedBuildInputs = [ XMLParser ]; doCheck = false; # requires lots of extra packages }; @@ -16450,7 +17845,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz; sha256 = "6142679580150a891f7d32232b5e31e2b4e5e53e8a6fa9cbeecb5c23814f1422"; }; - buildInputs = [ FileSlurpTiny ]; propagatedBuildInputs = [ TreeDAGNode XMLFilterBufferText XMLSAX ]; meta = { description = "Validate XML against a subset of W3C XML Schema"; @@ -16466,10 +17860,10 @@ let self = _self // overrides; _self = with self; { }; XSLoader = buildPerlPackage { - name = "XSLoader-0.20"; + name = "XSLoader-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.20.tar.gz; - sha256 = "020fyjhfp385nlkp217fm511sbjz768vqk1lmxz99k4bah740y7i"; + url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.24.tar.gz; + sha256 = "0pyqr12jsqagna75fm2gijfzw06wy1hrh5chn9hwnmcfddda66g8"; }; meta = { homepage = https://metacpan.org/module/Math::BigInt; @@ -16484,7 +17878,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; }; - buildInputs = [ ExtUtilsDepends TestFatal Testuseok ]; + buildInputs = [ ExtUtilsDepends TestFatal ]; meta = { description = "XS pointer backed objects using sv_magic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -16492,10 +17886,10 @@ let self = _self // overrides; _self = with self; { }; YAML = buildPerlPackage rec { - name = "YAML-1.15"; + name = "YAML-1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "06wx1pzc2sb7vidlp17g1x11rrz57ch8q68gjj8fbgd75wr9bx40"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.24.tar.gz; + sha256 = "1dpzgnjbd8yvf94vf45cmyj5bc6vrm6bchhx9xqwxqd5f9d093dm"; }; buildInputs = [ TestBase TestYAML ]; @@ -16508,10 +17902,10 @@ let self = _self // overrides; _self = with self; { }; YAMLSyck = buildPerlPackage rec { - name = "YAML-Syck-1.29"; + name = "YAML-Syck-1.30"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; - sha256 = "0ff9rzb1gg12iiizjqv6bsxdxk39g3f6sa18znha4476acv7nmnk"; + sha256 = "1iwd4pbwg7m1vwc74s3f3hk9yyqmhn1ssrbh9466lmbnc4hl9cv2"; }; meta = { homepage = http://search.cpan.org/dist/YAML-Syck; @@ -16521,10 +17915,10 @@ let self = _self // overrides; _self = with self; { }; YAMLTiny = buildPerlPackage rec { - name = "YAML-Tiny-1.69"; + name = "YAML-Tiny-1.73"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "14pmhksj68ii3rf4dza8im1i6jw3zafxkvxww5xlz7ib95cv135w"; + sha256 = "0i3p4nz8ysrsrs6vlzc6gkjcfpcaf05xjc7lwbjkw7lg5shmycdw"; }; }; @@ -16534,9 +17928,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; sha256 = "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33"; }; - preBuild = '' - sed -i 's/FULLPERL *= "/FULLPERL = /' LibYAML/Makefile - ''; + doCheck = false; }; WebServiceLinode = buildPerlModule rec { @@ -16546,7 +17938,7 @@ let self = _self // overrides; _self = with self; { sha256 = "66a315016999c0d2043caae86e664dad10c6613708f33a2f56aae8030326c509"; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ JSON LWP LWPProtocolhttps ]; + propagatedBuildInputs = [ JSON LWPProtocolHttps ]; meta = { homepage = https://github.com/mikegrb/WebService-Linode; description = "Perl Interface to the Linode.com API"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c36cf6f92158..02d9ec51b3d7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.10.4"; + version = "2.11.1"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "00i90cbd6lkq3wssp8z2b0l2q8ahajxlrzdrqcf2jnjdhv2xms4a"; + sha256 = "1270s5y7bgcml452lngq4fqn3a1mx15gfgmgcczjiiv0fxir446b"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca4a13b86dfd..93e821fb719d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -66,6 +66,9 @@ let toPythonModule = x: x; # Application does not provide modules. })); + # See build-setupcfg/default.nix for documentation. + buildSetupcfg = import ../build-support/build-setupcfg self; + graphiteVersion = "1.0.2"; fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: @@ -133,6 +136,7 @@ in { inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; + inherit buildSetupcfg; # helpers @@ -233,6 +237,8 @@ in { email_validator = callPackage ../development/python-modules/email-validator { }; + ewmh = callPackage ../development/python-modules/ewmh { }; + dbus-python = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; @@ -305,6 +311,10 @@ in { pyamf = callPackage ../development/python-modules/pyamf { }; + pyarrow = callPackage ../development/python-modules/pyarrow { + inherit (pkgs) arrow-cpp cmake pkgconfig; + }; + pyatspi = disabledIf (!isPy3k) (callPackage ../development/python-modules/pyatspi { }); pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; @@ -353,7 +363,7 @@ in { pyjwkest = callPackage ../development/python-modules/pyjwkest { }; - pykde4 = callPackage ../development/python-modules/pykde4/default.nix { + pykde4 = callPackage ../development/python-modules/pykde4 { inherit (self) pyqt4; callPackage = pkgs.callPackage; }; @@ -404,6 +414,8 @@ in { rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); + rlp = callPackage ../development/python-modules/rlp { }; + rx = callPackage ../development/python-modules/rx { }; salmon-mail = callPackage ../development/python-modules/salmon-mail { }; @@ -424,6 +436,8 @@ in { tokenserver = callPackage ../development/python-modules/tokenserver {}; + toml = callPackage ../development/python-modules/toml { }; + unifi = callPackage ../development/python-modules/unifi { }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; @@ -482,26 +496,7 @@ in { anyjson = callPackage ../development/python-modules/anyjson {}; - amqp = buildPythonPackage rec { - name = "amqp-${version}"; - version = "2.1.4"; - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/amqp/${name}.tar.gz"; - sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; - }; - - buildInputs = with self; [ pytest case ]; - propagatedBuildInputs = with self; [ vine ]; - - meta = { - homepage = https://github.com/celery/py-amqp; - description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; - license = licenses.lgpl21; - }; - }; - + amqp = callPackage ../development/python-modules/amqp {}; amqplib = callPackage ../development/python-modules/amqplib {}; @@ -511,20 +506,7 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; - application = buildPythonPackage rec { - pname = "python-application"; - name = "${pname}-${version}"; - version = "2.0.2"; - disabled = isPy3k; - - src = pkgs.fetchdarcs { - url = "http://devel.ag-projects.com/repositories/${pname}"; - rev = "release-${version}"; - sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; - }; - buildInputs = with self; [ zope_interface ]; - - }; + application = callPackage ../development/python-modules/application { }; appnope = buildPythonPackage rec { version = "0.1.0"; @@ -547,22 +529,7 @@ in { astor = callPackage ../development/python-modules/astor {}; - asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec { - name = "asyncio-${version}"; - version = "3.4.3"; - - - src = pkgs.fetchurl { - url = "mirror://pypi/a/asyncio/${name}.tar.gz"; - sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; - }; - - meta = { - description = "Reference implementation of PEP 3156"; - homepage = http://www.python.org/dev/peps/pep-3156; - license = licenses.free; - }; - } else null; + asyncio = callPackage ../development/python-modules/asyncio {}; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; @@ -598,66 +565,20 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - asn1ate = callPackage ../development/python-modules/asn1ate { }; - - atomiclong = buildPythonPackage rec { - version = "0.1.1"; - name = "atomiclong-${version}"; + async_generator = callPackage ../development/python-modules/async_generator { }; - src = pkgs.fetchurl { - url = "mirror://pypi/a/atomiclong/atomiclong-${version}.tar.gz"; - sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb"; - }; - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ cffi ]; - - meta = { - description = "Long data type with atomic operations using CFFI"; - homepage = https://github.com/dreid/atomiclong; - license = licenses.mit; - maintainers = with maintainers; [ robbinch ]; - }; - - }; - - atomicwrites = buildPythonPackage rec { - version = "0.1.9"; - name = "atomicwrites-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/atomicwrites/atomicwrites-${version}.tar.gz"; - sha256 = "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw"; - }; + asn1ate = callPackage ../development/python-modules/asn1ate { }; - meta = { - description = "Atomic file writes on POSIX"; - homepage = https://pypi.python.org/pypi/atomicwrites/0.1.0; - maintainers = with maintainers; [ matthiasbeyer ]; - }; + atomiclong = callPackage ../development/python-modules/atomiclong { }; - }; + atomicwrites = callPackage ../development/python-modules/atomicwrites { }; # argparse is part of stdlib in 2.7 and 3.2+ argparse = null; astroid = callPackage ../development/python-modules/astroid { }; - attrdict = buildPythonPackage (rec { - name = "attrdict-2.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/attrdict/${name}.tar.gz"; - sha256 = "86aeb6d3809e0344409f8148d7cac9eabce5f0b577c160b5e90d10df3f8d2ad3"; - }; - - propagatedBuildInputs = with self; [ coverage nose six ]; - - meta = { - description = "A dict with attribute-style access"; - homepage = https://github.com/bcj/AttrDict; - license = licenses.mit; - }; - }); + attrdict = callPackage ../development/python-modules/attrdict { }; attrs = callPackage ../development/python-modules/attrs { }; @@ -710,60 +631,15 @@ in { }; }; - avro = buildPythonPackage (rec { - name = "avro-1.7.6"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/avro/${name}.tar.gz"; - sha256 = "edf14143cabb2891f05a73d60a57a9fc5a9ebd305c2188abb3f5db777c707ad5"; - }; - - meta = { - description = "A serialization and RPC framework"; - homepage = "https://pypi.python.org/pypi/avro/"; - }; - }); - - avro3k = pkgs.lowPrio (buildPythonPackage (rec { - name = "avro3k-1.7.7-SNAPSHOT"; - - disabled = (!isPy3k); - - src = pkgs.fetchurl { - url = "mirror://pypi/a/avro3k/${name}.tar.gz"; - sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; - }; - - doCheck = false; # No such file or directory: './run_tests.py + avro = callPackage ../development/python-modules/avro {}; - meta = { - description = "A serialization and RPC framework"; - homepage = "https://pypi.python.org/pypi/avro3k/"; - }; - })); + avro3k = callPackage ../development/python-modules/avro3k {}; python-slugify = callPackage ../development/python-modules/python-slugify { }; awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; - noise = buildPythonPackage rec { - name = "noise-${version}"; - version = "1.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/noise/${name}.tar.gz"; - sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/caseman/noise"; - description = "Native-code and shader implementations of Perlin noise"; - license = licenses.mit; - platforms = platforms.all; - }; - }; + noise = callPackage ../development/python-modules/noise {}; azure = buildPythonPackage rec { version = "0.11.0"; @@ -779,7 +655,7 @@ in { meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -794,7 +670,7 @@ in { }; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -814,7 +690,7 @@ in { ''; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -834,7 +710,7 @@ in { ''; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -859,7 +735,7 @@ in { propagatedBuildInputs = with self; [ azure-mgmt-common ]; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -884,7 +760,7 @@ in { propagatedBuildInputs = with self; [ azure-mgmt-common ]; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -900,7 +776,7 @@ in { propagatedBuildInputs = with self; [ azure-nspkg ]; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -925,7 +801,7 @@ in { propagatedBuildInputs = with self; [ azure-mgmt-common ]; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -950,7 +826,7 @@ in { propagatedBuildInputs = with self; [ azure-mgmt-common ]; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -969,7 +845,7 @@ in { ''; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; @@ -988,12 +864,14 @@ in { ''; meta = { description = "Microsoft Azure SDK for Python"; - homepage = "http://azure.microsoft.com/en-us/develop/python/"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; }; + backcall = callPackage ../development/python-modules/backcall { }; + backports_abc = callPackage ../development/python-modules/backports_abc { }; backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; @@ -1035,21 +913,7 @@ in { backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; - babelfish = buildPythonPackage rec { - version = "0.5.5"; - name = "babelfish-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/babelfish/${name}.tar.gz"; - sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/babelfish; - description = "A module to work with countries and languages"; - license = licenses.bsd3; - }; - }; + babelfish = callPackage ../development/python-modules/babelfish {}; basiciw = buildPythonPackage rec { name = "${pname}-${version}"; @@ -1073,46 +937,11 @@ in { }; }; - batinfo = buildPythonPackage rec { - version = "0.3"; - name = "batinfo-${version}"; + batinfo = callPackage ../development/python-modules/batinfo {}; - src = pkgs.fetchurl { - url = "mirror://pypi/b/batinfo/${name}.tar.gz"; - sha256 = "0gyzkxzvj5l6qrw706bnm3cckqzzzbrjr7jkxc087d7775a73499"; - }; + bcdoc = callPackage ../development/python-modules/bcdoc {}; - # No tests included - doCheck = false; - - meta = { - homepage = https://github.com/nicolargo/batinfo; - description = "A simple Python lib to retrieve battery information"; - license = licenses.lgpl3; - platforms = platforms.all; - maintainers = with maintainers; [ koral ]; - }; - }; - - bcdoc = buildPythonPackage rec { - name = "bcdoc-0.14.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bcdoc/${name}.tar.gz"; - sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8"; - }; - - buildInputs = with self; [ docutils six ]; - - # Tests fail due to nix file timestamp normalization. - doCheck = false; - - meta = { - homepage = https://github.com/botocore/bcdoc; - license = licenses.asl20; - description = "ReST document generation tools for botocore"; - }; - }; + beancount = callPackage ../development/python-modules/beancount { }; beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; @@ -1148,25 +977,7 @@ in { }; }; - betamax = buildPythonPackage rec { - name = "betamax-0.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/betamax/${name}.tar.gz"; - sha256 = "18f8v5gng3j773jlbbzx4rg1i4y2zw3m2l1zpmbvp8bh5a2q1i42"; - }; - - propagatedBuildInputs = [ self.requests ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://betamax.readthedocs.org/en/latest/; - description = "A VCR imitation for requests"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - }; - }; + betamax = callPackage ../development/python-modules/betamax {}; betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; @@ -1202,6 +1013,8 @@ in { binwalk = self.binwalk_fun { }; binwalk-full = self.binwalk_fun { visualizationSupport = true; pyqtgraph = self.pyqtgraph; }; + bitmath = callPackage ../development/python-modules/bitmath { }; + caldavclientlibrary-asynk = buildPythonPackage rec { version = "asynkdev"; name = "caldavclientlibrary-asynk-${version}"; @@ -1227,6 +1040,7 @@ in { homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/; maintainers = with maintainers; [ pjones ]; + broken = true; # 2018-04-11 }; }; @@ -1274,33 +1088,9 @@ in { enablePython = true; }); - buttersink = buildPythonPackage rec { - name = "buttersink-0.6.8"; - - src = pkgs.fetchurl { - sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3"; - url = "mirror://pypi/b/buttersink/${name}.tar.gz"; - }; - - # Python 2 syntax - disabled = isPy3k; + bumps = callPackage ../development/python-modules/bumps {}; - meta = { - description = "Synchronise btrfs snapshots"; - longDescription = '' - ButterSink is like rsync, but for btrfs subvolumes instead of files, - which makes it much more efficient for things like archiving backup - snapshots. It is built on top of btrfs send and receive capabilities. - Sources and destinations can be local btrfs file systems, remote btrfs - file systems over SSH, or S3 buckets. - ''; - homepage = https://github.com/AmesCornish/buttersink/wiki; - license = licenses.gpl3; - platforms = platforms.linux; - }; - - propagatedBuildInputs = with self; [ boto crcmod psutil ]; - }; + buttersink = callPackage ../development/python-modules/buttersink {}; cached-property = callPackage ../development/python-modules/cached-property { }; @@ -1341,9 +1131,6 @@ in { cement = callPackage ../development/python-modules/cement {}; cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; - postPatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; @@ -1353,59 +1140,15 @@ in { cheroot = callPackage ../development/python-modules/cheroot {}; - circus = buildPythonPackage rec { - name = "circus-0.11.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/circus/${name}.tar.gz"; - sha256 = "3757344aa5073ea29e6e2607b3de8ba1652502c61964316116931884293fe846"; - }; - - doCheck = false; # weird error - - propagatedBuildInputs = with self; [ iowait psutil pyzmq tornado mock ]; - }; - - colorclass = buildPythonPackage rec { - pname = "colorclass"; - version = "2.2.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; - }; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; - # No tests in archive - doCheck = false; + circus = callPackage ../development/python-modules/circus {}; - meta = { - homepage = "https://github.com/Robpol86/colorclass"; - license = licenses.mit; - description = "Automatic support for console colors"; - }; - }; + colorclass = callPackage ../development/python-modules/colorclass {}; colorlog = callPackage ../development/python-modules/colorlog { }; - colour = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "colour"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/${pname}/${name}.tar.gz"; - sha256 = "0w1j43l76zw10dvs2kk7jz7kqj2ss7gfgfdxyls27pckwin89gxb"; - }; - - buildInputs = with self; [ d2to1 ]; - - meta = { - description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; - homepage = https://github.com/vaab/colour; - license = licenses.bsd2; - }; - }; + colour = callPackage ../development/python-modules/colour {}; constantly = callPackage ../development/python-modules/constantly { }; @@ -1441,32 +1184,12 @@ in { cx_oracle = callPackage ../development/python-modules/cx_oracle {}; - cvxopt = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "cvxopt"; - version = "1.1.7"; - disabled = isPyPy; - src = pkgs.fetchurl { - url = "mirror://pypi/c/${pname}/${name}.tar.gz"; - sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97"; - }; - doCheck = false; - buildInputs = with pkgs; [ openblasCompat ]; - preConfigure = '' - export CVXOPT_BLAS_LIB_DIR=${pkgs.openblasCompat}/lib - export CVXOPT_BLAS_LIB=openblas - export CVXOPT_LAPACK_LIB=openblas - ''; - meta = { - homepage = "http://cvxopt.org/"; - description = "Python Software for Convex Optimization"; - maintainers = with maintainers; [ edwtjo ]; - license = licenses.gpl3Plus; - }; - }; + cvxopt = callPackage ../development/python-modules/cvxopt { }; cycler = callPackage ../development/python-modules/cycler { }; + cysignals = callPackage ../development/python-modules/cysignals { }; + dlib = buildPythonPackage rec { inherit (pkgs.dlib) name src nativeBuildInputs meta; @@ -1475,108 +1198,17 @@ in { checkInputs = with self; [ pytest ]; }; - datadog = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "datadog"; - version = "0.10.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/${pname}/${name}.tar.gz"; - sha256 = "0y2if4jj43n5jis20imragvhhyhr840w4m1g7j7fxh9bn7h273zp"; - }; + datadog = callPackage ../development/python-modules/datadog {}; - buildInputs = with self; [ pillow tox mock six nose ]; - propagatedBuildInputs = with self; [ requests decorator simplejson ]; + debian = callPackage ../development/python-modules/debian {}; - meta = { - description = "The Datadog Python library "; - license = licenses.bsd3; - homepage = https://github.com/DataDog/datadogpy; - }; - }; + defusedxml = callPackage ../development/python-modules/defusedxml {}; - debian = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "python-debian"; - version = "0.1.23"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh"; - }; - propagatedBuildInputs = with self; [ chardet six ]; - }; + dugong = callPackage ../development/python-modules/dugong {}; - defusedxml = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "defusedxml"; - version = "0.5.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/${pname}/${name}.tar.gz"; - sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; - }; - }; + iowait = callPackage ../development/python-modules/iowait {}; - dosage = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "dosage"; - version = "2016.03.17"; - PBR_VERSION = version; - src = pkgs.fetchFromGitHub { - owner = "webcomics"; - repo = "dosage"; - rev = "1af022895e5f86bc43da95754c4c4ed305790f5b"; - sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6"; - }; - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ requests lxml pbr ]; - # prompt_toolkit doesn't work on 3.5 on OSX. - doCheck = !isPy35; - - meta = { - description = "A comic strip downloader and archiver"; - homepage = http://dosage.rocks/; - broken = true; # ctypes error - }; - }; - - dugong = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "dugong"; - version = "3.5"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/${pname}/${name}.tar.bz2"; - sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; - }; - - disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 - }; - - iowait = buildPythonPackage rec { - name = "iowait-0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/iowait/${name}.tar.gz"; - sha256 = "ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299"; - }; - - meta = { - description = "Platform-independent module for I/O completion events"; - homepage = https://launchpad.net/python-iowait; - }; - }; - - responses = self.buildPythonPackage rec { - name = "responses-0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/responses/${name}.tar.gz"; - sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; - }; - - propagatedBuildInputs = with self; [ cookies mock requests six ]; - - doCheck = false; - - }; + responses = callPackage ../development/python-modules/responses {}; rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; @@ -1584,84 +1216,15 @@ in { py4j = callPackage ../development/python-modules/py4j { }; - pyechonest = self.buildPythonPackage rec { - name = "pyechonest-8.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyechonest/pyechonest-8.0.2.tar.gz"; - sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; - }; - - meta = { - description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; - homepage = https://github.com/echonest/pyechonest; - }; - }; - - billiard = buildPythonPackage rec { - name = "billiard-${version}"; - version = "3.5.0.2"; + pyechonest = callPackage ../development/python-modules/pyechonest { }; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/billiard/${name}.tar.gz"; - sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; - }; - - buildInputs = with self; [ pytest case ]; - - meta = { - homepage = https://github.com/celery/billiard; - description = "Python multiprocessing fork with improvements and bugfixes"; - license = licenses.bsd3; - }; - }; + billiard = callPackage ../development/python-modules/billiard { }; binaryornot = callPackage ../development/python-modules/binaryornot { }; - bitbucket_api = buildPythonPackage rec { - name = "bitbucket-api-0.4.4"; - # python3 does not support relative imports - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bitbucket-api/${name}.tar.gz"; - sha256 = "e890bc3893d59a6f203c1eb2bae60e78ac4d3869da7ea4fb104dca588aea85b2"; - }; - - propagatedBuildInputs = with self; [ requests_oauthlib nose sh ]; - - doCheck = false; - - meta = { - homepage = https://github.com/Sheeprider/BitBucket-api; - description = "Python library to interact with BitBucket REST API"; - license = licenses.mit; - }; - }; - - # Should be moved out of python-packages.nix - bitbucket-cli = buildPythonPackage rec { - name = "bitbucket-cli-0.5.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/b/bitbucket-cli/${name}.tar.gz"; - sha256 = "d881e21ec7ebfa006cfca6d10a5b7229aa59990568f8c6b8e3364769fa38b6f6"; - }; - - propagatedBuildInputs = [ self.requests ]; - - # No tests - doCheck = false; - - disabled = isPy3k; + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - meta = { - description = "Bitbucket command line interface"; - homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; - maintainers = with maintainers; [ refnil ]; - }; - }; + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; bitstring = callPackage ../development/python-modules/bitstring { }; @@ -1708,22 +1271,7 @@ in { }; }; - blinker = buildPythonPackage rec { - name = "blinker-${version}"; - version = "1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/blinker/${name}.tar.gz"; - sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; - }; - - meta = { - homepage = http://pythonhosted.org/blinker/; - description = "Fast, simple object-to-object and broadcast signaling"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + blinker = callPackage ../development/python-modules/blinker { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; @@ -1754,7 +1302,7 @@ in { meta = { description = "Python bindings for Oracle Berkeley DB"; - homepage = http://www.jcea.es/programacion/pybsddb.htm; + homepage = https://www.jcea.es/programacion/pybsddb.htm; license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x }; }; @@ -1798,25 +1346,7 @@ in { botocore = callPackage ../development/python-modules/botocore { }; - bottle = buildPythonPackage rec { - version = "0.12.11"; - name = "bottle-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bottle/${name}.tar.gz"; - sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1"; - }; - - propagatedBuildInputs = with self; [ setuptools ]; - - meta = { - homepage = http://bottlepy.org; - description = "A fast and simple micro-framework for small web-applications"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ koral ]; - }; - }; + bottle = callPackage ../development/python-modules/bottle { }; box2d = buildPythonPackage rec { name = "box2d-${version}"; @@ -1846,32 +1376,7 @@ in { branca = callPackage ../development/python-modules/branca { }; - bugwarrior = buildPythonPackage rec { - name = "bugwarrior-${version}"; - version = "1.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bugwarrior/${name}.tar.gz"; - sha256 = "1jkz5vzbwspi1jcb3qsgcl619yip77khb696pc3ryk0pdhjhgs5w"; - }; - - buildInputs = with self; [ mock unittest2 nose /* jira megaplan */ ]; - propagatedBuildInputs = with self; [ - twiggy requests offtrac bugzilla taskw dateutil pytz keyring six - jinja2 pycurl dogpile_cache lockfile click pyxdg - ]; - - # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. - doCheck = false; - - meta = { - homepage = http://github.com/ralphbean/bugwarrior; - description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; - }; - }; + bugwarrior = callPackage ../development/python-modules/bugwarrior { }; # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; @@ -1891,52 +1396,9 @@ in { # }; # }); - bugzilla = buildPythonPackage rec { - name = "bugzilla-${version}"; - version = "1.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-bugzilla/python-${name}.tar.gz"; - sha256 = "11361635a4f1613803a0b9b93ba9126f7fd36180653f953e2590b1536d107d46"; - }; - - patches = [ ../development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch ]; - - buildInputs = with self; [ pep8 coverage logilab_common ]; - propagatedBuildInputs = [ self.requests ]; - - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - meta = { - homepage = https://fedorahosted.org/python-bugzilla/; - description = "Bugzilla XMLRPC access module"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; - }; - }; - - check-manifest = buildPythonPackage rec { - name = "check-manifest"; - version = "0.30"; + bugzilla = callPackage ../development/python-modules/bugzilla { }; - src = pkgs.fetchurl { - url = "mirror://pypi/c/check-manifest/check-manifest-${version}.tar.gz"; - sha256 = "b19fd0d8b9286532ba3dc0282484fd76d11200cf24b340dc3d08f293c7dd0500"; - }; - - doCheck = false; - - meta = { - homepage = https://github.com/mgedmin/check-manifest; - description = "Check MANIFEST.in in a Python source package for completeness"; - license = licenses.mit; - maintainers = with maintainers; [ lewo ]; - }; - }; + check-manifest = callPackage ../development/python-modules/check-manifest { }; devpi-common = callPackage ../development/python-modules/devpi-common { }; # A patched version of buildout, useful for buildout based development on Nix @@ -1944,32 +1406,9 @@ in { zc_buildout = self.zc_buildout221; - zc_buildout221 = buildPythonPackage rec { - name = "zc.buildout-2.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zc.buildout/${name}.tar.gz"; - sha256 = "a6122ea5c06c6c044a9efce4a3df452c8573e1aebfda7b24262655daac894ef5"; - }; - - meta = { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpl21; - maintainers = with maintainers; [ garbas ]; - }; - }; + zc_buildout221 = callPackage ../development/python-modules/buildout { }; - bunch = buildPythonPackage (rec { - name = "bunch-1.0.1"; - meta.maintainers = with maintainers; [ ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bunch/${name}.tar.gz"; - sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; - }; - doCheck = false; - }); + bunch = callPackage ../development/python-modules/bunch { }; can = callPackage ../development/python-modules/can {}; @@ -1979,66 +1418,11 @@ in { cairocffi = callPackage ../development/python-modules/cairocffi {}; - cairosvg = buildPythonPackage rec { - version = "1.0.18"; - name = "cairosvg-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/CairoSVG/CairoSVG-${version}.tar.gz"; - sha256 = "01lpm38qp7xlnv8jv7qg48j44p5088dwfsrcllgs5fz355lrfds1"; - }; + cairosvg = callPackage ../development/python-modules/cairosvg {}; - propagatedBuildInputs = with self; [ cairocffi ]; - - meta = { - homepage = https://cairosvg.org; - license = licenses.lgpl3; - description = "SVG converter based on Cairo"; - }; - }; + carrot = callPackage ../development/python-modules/carrot {}; - - carrot = buildPythonPackage rec { - name = "carrot-0.10.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/carrot/${name}.tar.gz"; - sha256 = "cb46374f3c883c580d142a79d2609883713a867cc86e0514163adce784ce2468"; - }; - - buildInputs = with self; [ self.nose ]; - - propagatedBuildInputs = - [ self.amqplib - self.anyjson - ]; - - doCheck = false; # depends on the network - - meta = { - homepage = https://pypi.python.org/pypi/carrot; - description = "AMQP Messaging Framework for Python"; - }; - }; - - case = buildPythonPackage rec { - name = "case-${version}"; - version = "1.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/case/${name}.tar.gz"; - sha256 = "1zbhbw87izcxj9rvqg432a7r69ps2ks20mqq3g3hgd42sckcy3ca"; - }; - - propagatedBuildInputs = with self; [ six nose unittest2 mock ]; - - meta = { - homepage = https://github.com/celery/case; - description = "unittests utilities"; - license = licenses.bsd3; - }; - - }; + case = callPackage ../development/python-modules/case {}; cassandra-driver = buildPythonPackage rec { name = "cassandra-driver-3.6.0"; @@ -2071,7 +1455,7 @@ in { }; }; - cccolutils = callPackage ../development/python-modules/cccolutils/default.nix {}; + cccolutils = callPackage ../development/python-modules/cccolutils {}; CDDB = buildPythonPackage rec { name = "CDDB-1.4"; @@ -2120,21 +1504,7 @@ in { celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; }; - cerberus = buildPythonPackage rec { - name = "Cerberus-${version}"; - version = "0.9.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/Cerberus/${name}.tar.gz"; - sha256 = "1km7hvns1snrmcwz58bssi4wv3gwd34zm1z1hwjylmpqrfrcf8mi"; - }; - - meta = { - homepage = http://python-cerberus.org/; - description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; - license = licenses.mit; - }; - }; + cerberus = callPackage ../development/python-modules/cerberus { }; certifi = callPackage ../development/python-modules/certifi { }; @@ -2144,119 +1514,15 @@ in { cherrypy = callPackage ../development/python-modules/cherrypy {}; - cjson = buildPythonPackage rec { - name = "python-cjson-${version}"; - version = "1.1.0"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-cjson/${name}.tar.gz"; - sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3"; - }; - - meta = { - description = "A very fast JSON encoder/decoder for Python"; - homepage = "http://ag-projects.com/"; - license = licenses.lgpl2; - platforms = platforms.all; - }; - }; + cjson = callPackage ../development/python-modules/cjson { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; - clf = buildPythonPackage rec { - name = "clf-${version}"; - version = "0.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/clf/${name}.tar.gz"; - sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5"; - }; - - patchPhase = '' - sed -i 's/==/>=/' requirements.txt - ''; - - propagatedBuildInputs = with self; [ docopt requests pygments ]; - - # Error when running tests: - # No local packages or download links found for requests - doCheck = false; - - meta = { - homepage = https://github.com/ncrocfer/clf; - description = "Command line tool to search snippets on Commandlinefu.com"; - license = licenses.mit; - maintainers = with maintainers; [ koral ]; - }; - }; - - click = buildPythonPackage rec { - name = "click-6.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/click/${name}.tar.gz"; - sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = '' - py.test tests - ''; + clf = callPackage ../development/python-modules/clf {}; - # https://github.com/pallets/click/issues/823 - doCheck = false; + click = callPackage ../development/python-modules/click {}; - meta = { - homepage = http://click.pocoo.org/; - description = "Create beautiful command line interfaces in Python"; - longDescription = '' - A Python package for creating beautiful command line interfaces in a - composable way, with as little code as necessary. - ''; - license = licenses.bsd3; - }; - }; - - click_5 = buildPythonPackage rec { - name = "click-5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/click/${name}.tar.gz"; - sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"; - }; - - meta = { - homepage = http://click.pocoo.org/; - description = "Create beautiful command line interfaces in Python"; - longDescription = '' - A Python package for creating beautiful command line interfaces in a - composable way, with as little code as necessary. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ mog ]; - }; - }; - - click-log = buildPythonPackage rec { - version = "0.2.1"; - name = "click-log-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/click-log/${name}.tar.gz"; - sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; - }; - - propagatedBuildInputs = with self; [ click ]; - - meta = { - homepage = https://github.com/click-contrib/click-log/; - description = "Logging integration for Click"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }; + click-log = callPackage ../development/python-modules/click-log {}; click-plugins = callPackage ../development/python-modules/click-plugins {}; @@ -2288,74 +1554,13 @@ in { }; }; - cloudpickle = buildPythonPackage rec { - name = "cloudpickle-${version}"; - version = "0.2.2"; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cloudpickle/${name}.tar.gz"; - sha256 = "0x4fbycipkhfax7lydaxcnc14g42g274qba17j51shr5gbq6m8lx"; - }; - - buildInputs = with self; [ pytest mock ]; - - # See README for tests invocation - checkPhase = '' - PYTHONPATH=$PYTHONPATH:'.:tests' py.test - ''; - - # TypeError: cannot serialize '_io.FileIO' object - doCheck = false; - - meta = { - description = "Extended pickling support for Python objects"; - homepage = https://github.com/cloudpipe/cloudpickle; - license = with licenses; [ bsd3 ]; - }; - }; - - cmdline = buildPythonPackage rec { - pname = "cmdline"; - version = "0.1.6"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/${pname}/${name}.tar.gz"; - sha256 = "be2cb4711e9111bb7386a408e3c66a730c36dd6ac05851a9f03d0f4eae63536a"; - }; - - # No tests, https://github.com/rca/cmdline/issues/1 - doCheck = false; - propagatedBuildInputs = with self; [ pyyaml ]; - meta = { - description = "Utilities for consistent command line tools"; - homepage = https://github.com/rca/cmdline; - license = licenses.asl20; - }; - }; + cmdline = callPackage ../development/python-modules/cmdline { }; codecov = callPackage ../development/python-modules/codecov {}; - cogapp = buildPythonPackage rec { - version = "2.3"; - name = "cogapp-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cogapp/${name}.tar.gz"; - sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn"; - }; - - # there are no tests - doCheck = false; - - meta = { - description = "A code generator for executing Python snippets in source files"; - homepage = http://nedbatchelder.com/code/cog; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - }; + cogapp = callPackage ../development/python-modules/cogapp {}; colorama = callPackage ../development/python-modules/colorama { }; @@ -2371,62 +1576,12 @@ in { }; }); - - coilmq = buildPythonPackage (rec { - name = "CoilMQ-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/CoilMQ/${name}.tar.gz"; - sha256 = "0wwa6fsqw1mxsryvgp0yrdjil8axyj0kslzi7lr45cnhgp5ab375"; - }; - - propagatedBuildInputs = with self; [ stompclient pythondaemon redis pid]; - - buildInputs = with self; [ pytest six click coverage sqlalchemy ]; - - # The teste data is not included in the distribution - doCheck = false; - - meta = { - description = "Simple, lightweight, and easily extensible STOMP message broker"; - homepage = http://code.google.com/p/coilmq/; - license = licenses.asl20; - }; - }); - + coilmq = callPackage ../development/python-modules/coilmq { }; colander = callPackage ../development/python-modules/colander { }; # Backported version of the ConfigParser library of Python 3.3 - configparser = if isPy3k then null else buildPythonPackage rec { - name = "configparser-${version}"; - version = "3.5.0"; - - # running install_egg_info - # error: [Errno 9] Bad file descriptor: '<stdout>' - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/configparser/${name}.tar.gz"; - sha256 = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"; - }; - - # No tests available - doCheck = false; - - # Fix issue when used together with other namespace packages - # https://github.com/NixOS/nixpkgs/issues/23855 - patches = [ - ./../development/python-modules/configparser/0001-namespace-fix.patch - ]; - - meta = { - maintainers = [ ]; - platforms = platforms.all; - }; - }; - + configparser = callPackage ../development/python-modules/configparser { }; ColanderAlchemy = buildPythonPackage rec { name = "ColanderAlchemy-${version}"; @@ -2456,27 +1611,7 @@ in { conda = callPackage ../development/python-modules/conda { }; - configobj = buildPythonPackage (rec { - name = "configobj-5.0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/configobj/${name}.tar.gz"; - sha256 = "a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902"; - }; - - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Config file reading, writing and validation"; - homepage = https://pypi.python.org/pypi/configobj; - license = licenses.bsd3; - maintainers = with maintainers; [ garbas ]; - }; - }); - + configobj = callPackage ../development/python-modules/configobj { }; confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; @@ -2484,109 +1619,23 @@ in { construct = callPackage ../development/python-modules/construct {}; - consul = buildPythonPackage (rec { - name = "python-consul-0.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-consul/${name}.tar.gz"; - sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm"; - }; - - buildInputs = with self; [ requests six pytest ]; - - # No tests distributed. https://github.com/cablehead/python-consul/issues/133 - doCheck = false; - - meta = { - description = "Python client for Consul (https://www.consul.io/)"; - homepage = https://github.com/cablehead/python-consul; - license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; - }; - }); - - contexter = buildPythonPackage rec { - name = "contexter-${version}"; - version = "0.1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/contexter/${name}.tar.gz"; - sha256 = "0xrnkjya29ya0hkj8y4k9ni2mnr58i6r0xfqlj7wk07v4jfrkc8n"; - }; - }; + consul = callPackage ../development/python-modules/consul { }; + contexter = callPackage ../development/python-modules/contexter { }; contextlib2 = callPackage ../development/python-modules/contextlib2 { }; - cookiecutter = buildPythonPackage rec { - version = "1.4.0"; - name = "cookiecutter-${version}"; - - # not sure why this is broken - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz"; - sha256 = "1clxnabmc5s4b519r1sxyj1163x833ir8xcypmdfpf6r9kbb35vn"; - }; - - buildInputs = with self; [ itsdangerous pytest freezegun docutils ]; - propagatedBuildInputs = with self; [ - jinja2 future binaryornot click whichcraft poyo jinja2_time ]; - - meta = { - homepage = https://github.com/audreyr/cookiecutter; - description = "A command-line utility that creates projects from project templates"; - license = licenses.bsd3; - maintainers = with maintainers; [ kragniz ]; - }; - }; - - cookies = buildPythonPackage rec { - name = "cookies-2.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cookies/${name}.tar.gz"; - sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; - }; + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; - doCheck = false; - - meta = { - description = "Friendlier RFC 6265-compliant cookie parser/renderer"; - homepage = https://github.com/sashahart/cookies; - license = licenses.mit; - }; - }; + cookies = callPackage ../development/python-modules/cookies { }; coveralls = callPackage ../development/python-modules/coveralls { }; coverage = callPackage ../development/python-modules/coverage { }; - covCore = buildPythonPackage rec { - name = "cov-core-1.15.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cov-core/${name}.tar.gz"; - sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c"; - }; - meta = { - description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; - }; - propagatedBuildInputs = with self; [ self.coverage ]; - }; + covCore = callPackage ../development/python-modules/cov-core { }; - crcmod = buildPythonPackage rec { - name = "crcmod-1.7"; - src = pkgs.fetchurl { - url = mirror://pypi/c/crcmod/crcmod-1.7.tar.gz; - sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"; - }; - meta = { - description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; - homepage = http://crcmod.sourceforge.net/; - license = licenses.mit; - }; - }; + crcmod = callPackage ../development/python-modules/crcmod { }; credstash = callPackage ../development/python-modules/credstash { }; @@ -2594,24 +1643,7 @@ in { cytoolz = callPackage ../development/python-modules/cytoolz { }; - cryptacular = buildPythonPackage rec { - name = "cryptacular-1.4.1"; - - buildInputs = with self; [ coverage nose ]; - propagatedBuildInputs = with self; [ pbkdf2 ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cryptacular/${name}.tar.gz"; - sha256 = "273f03d03f9b316671ae4f1c1c6b8d3c883da19a5706873e8f3d6543e13dd4a1"; - }; - - # TODO: tests fail: TypeError: object of type 'NoneType' has no len() - doCheck = false; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + cryptacular = callPackage ../development/python-modules/cryptacular { }; cryptography = callPackage ../development/python-modules/cryptography { }; @@ -2619,6 +1651,8 @@ in { curtsies = callPackage ../development/python-modules/curtsies { }; + envs = callPackage ../development/python-modules/envs { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; @@ -2674,8 +1708,7 @@ in { pythonPackages = self; }); - openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {}; - + openidc-client = callPackage ../development/python-modules/openidc-client {}; idna = callPackage ../development/python-modules/idna { }; @@ -2775,91 +1808,13 @@ in { portpicker = callPackage ../development/python-modules/portpicker { }; - pkginfo = buildPythonPackage rec { - version = "1.3.2"; - name = "pkginfo-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pkginfo/${name}.tar.gz"; - sha256 = "0qg4sq3m0pxvjahc3sncwhw42z5rfw22k0ybskmdqkl2agykay7q"; - }; - - doCheck = false; # I don't know why, but with doCheck = true it fails. - - meta = { - homepage = https://pypi.python.org/pypi/pkginfo; - license = licenses.mit; - description = "Query metadatdata from sdists / bdists / installed packages"; - - longDescription = '' - This package provides an API for querying the distutils metadata - written in the PKG-INFO file inside a source distriubtion (an sdist) - or a binary distribution (e.g., created by running bdist_egg). It can - also query the EGG-INFO directory of an installed distribution, and the - *.egg-info stored in a “development checkout” (e.g, created by running - setup.py develop). - ''; - }; - }; - - pretend = buildPythonPackage rec { - name = "pretend-1.0.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pretend/pretend-1.0.8.tar.gz"; - sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = https://github.com/alex/pretend; - license = licenses.bsd3; - }; - }; - - - detox = self.buildPythonPackage rec { - name = "detox-0.10.0"; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ tox py eventlet ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/detox/${name}.tar.gz"; - sha256 = "33b704c2a5657366850072fb2aa839df14dd2e692c0c1c2642c3ac30d5c0baec"; - }; - - checkPhase = '' - py.test - ''; - - # eventlet timeout, and broken invokation 3.5 - doCheck = false; - - meta = { - description = "What is detox?"; - homepage = https://bitbucket.org/hpk42/detox; - }; - }; - + pkginfo = callPackage ../development/python-modules/pkginfo { }; - pbkdf2 = buildPythonPackage rec { - name = "pbkdf2-1.3"; + pretend = callPackage ../development/python-modules/pretend { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pbkdf2/${name}.tar.gz"; - sha256 = "ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979"; - }; + detox = callPackage ../development/python-modules/detox { }; - # ImportError: No module named test - doCheck = false; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; bcrypt = callPackage ../development/python-modules/bcrypt { }; @@ -2867,46 +1822,9 @@ in { pycollada = callPackage ../development/python-modules/pycollada { }; - pycontracts = buildPythonPackage rec { - version = "1.7.9"; - name = "PyContracts-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyContracts/${name}.tar.gz"; - sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf"; - }; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [ pyparsing decorator six ]; - - meta = { - description = "Allows to declare constraints on function parameters and return values"; - homepage = https://pypi.python.org/pypi/PyContracts; - license = licenses.lgpl2; - }; - }; - - pycparser = buildPythonPackage rec { - name = "pycparser-${version}"; - version = "2.14"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pycparser/${name}.tar.gz"; - sha256 = "7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests - ''; + pycontracts = callPackage ../development/python-modules/pycontracts { }; - meta = { - description = "C parser in Python"; - homepage = https://github.com/eliben/pycparser; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + pycparser = callPackage ../development/python-modules/pycparser { }; pydub = callPackage ../development/python-modules/pydub {}; @@ -2916,6 +1834,8 @@ in { python-jose = callPackage ../development/python-modules/python-jose {}; + python-ly = callPackage ../development/python-modules/python-ly {}; + pyhepmc = buildPythonPackage rec { name = "pyhepmc-${version}"; version = "0.5.0"; @@ -2951,9 +1871,9 @@ in { }; }; - pytest = self.pytest_34; + pytest = self.pytest_35; - pytest_34 = callPackage ../development/python-modules/pytest/default.nix{ + pytest_35 = callPackage ../development/python-modules/pytest { hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -2962,7 +1882,7 @@ in { }; # Needed for celery - pytest_32 = self.pytest_34.overrideAttrs( oldAttrs: rec { + pytest_32 = self.pytest_35.overrideAttrs( oldAttrs: rec { version = "3.2.5"; src = oldAttrs.src.override { inherit version; @@ -2976,50 +1896,9 @@ in { pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; - pytestcache = buildPythonPackage rec { - name = "pytest-cache-1.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz"; - sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; - }; - - buildInputs = with self; [ pytest]; - propagatedBuildInputs = with self ; [ execnet ]; - - checkPhase = '' - py.test - ''; + pytestcache = callPackage ../development/python-modules/pytestcache { }; - # Too many failing tests. Are they maintained? - doCheck = false; - - meta = { - license = licenses.mit; - homepage = "https://pypi.python.org/pypi/pytest-cache/"; - description = "pytest plugin with mechanisms for caching across test runs"; - }; - }; - - pytest-catchlog = buildPythonPackage rec { - name = "pytest-catchlog-1.2.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-catchlog/${name}.zip"; - sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = "make test"; - - # Requires pytest < 3.1 - doCheck = false; - - meta = { - license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-catchlog/; - description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; - }; - }; + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; @@ -3027,31 +1906,7 @@ in { pytest-django = callPackage ../development/python-modules/pytest-django { }; - pytest-fixture-config = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-fixture-config"; - version = "1.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "7d7cc1cb25f88a707f083b1dc2e3c2fdfc6f37709567a2587dd0cd0bcd70edb6"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ coverage virtualenv pytestcov six ]; - - checkPhase = '' - py.test -k "not test_yield_requires_config_doesnt_skip and not test_yield_requires_config_skips" - ''; - - meta = { - description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; - homepage = https://github.com/manahl/pytest-plugins; - license = licenses.mit; - maintainers = with maintainers; [ ryansydnor ]; - platforms = platforms.all; - }; - }; + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; pytest-forked = callPackage ../development/python-modules/pytest-forked { }; @@ -3059,28 +1914,9 @@ in { pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - pytestflakes = buildPythonPackage rec { - name = "pytest-flakes-${version}"; - version = "1.0.1"; + pytestflakes = callPackage ../development/python-modules/pytest-flakes { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-flakes/${name}.tar.gz"; - sha256 = "9c2271654294020e134624020a2144cb93b7334809d70fb3f470cd31ec788a3a"; - }; - - buildInputs = with self; [ pytestpep8 pytest ]; - propagatedBuildInputs = with self; [ pyflakes pytestcache ]; - - checkPhase = '' - py.test test_flakes.py - ''; - - meta = { - license = licenses.mit; - homepage = "https://pypi.python.org/pypi/pytest-flakes"; - description = "pytest plugin to check source code with pyflakes"; - }; - }; + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; pytest-mock = callPackage ../development/python-modules/pytest-mock { }; @@ -3088,180 +1924,31 @@ in { pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; - pytestpep8 = buildPythonPackage rec { - name = "pytest-pep8"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz"; - sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ pytestcache pep8 ]; - - checkPhase = '' - py.test - ''; - - # Fails - doCheck = false; - - meta = { - license = licenses.mit; - homepage = "https://pypi.python.org/pypi/pytest-pep8"; - description = "pytest plugin to check PEP8 requirements"; - }; - }; + pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - pytest-raisesregexp = buildPythonPackage rec { - name = "pytest-raisesregexp-${version}"; - version = "2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-raisesregexp/${name}.tar.gz"; - sha256 = "0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61"; - }; - - buildInputs = with self; [ py pytest ]; - - # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3 - prePatch = '' - sed -i '3i\import io' setup.py - substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," - ''; - - meta = { - description = "Simple pytest plugin to look for regex in Exceptions"; - homepage = https://github.com/Walkman/pytest_raisesregexp; - license = with licenses; [ mit ]; - }; - }; + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; - pytest-server-fixtures = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-server-fixtures"; - version = "1.1.0"; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests ]; - - meta = { - description = "Extensible server fixures for py.test"; - homepage = "https://github.com/manahl/pytest-plugins"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - - doCheck = false; - # RuntimeError: Unable to find a free server number to start Xvfb + pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "1gs9qimcn8q6xi9d6i5624l0dziwvn6nj2rda07fg15g1cq66s8l"; - }; - }; + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; - pytest-shutil = buildPythonPackage rec { - name = "pytest-shutil-${version}"; - version = "1.2.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz"; - sha256 = "924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d"; - }; - buildInputs = with self; [ cmdline pytest ]; - propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; - meta = { - description = "A goodie-bag of unix shell and environment tools for py.test"; - homepage = https://github.com/manahl/pytest-plugins; - maintainers = with maintainers; [ ryansydnor ]; - platforms = platforms.all; - license = licenses.mit; - }; - - checkPhase = '' - py.test - ''; - }; - - pytestcov = buildPythonPackage rec { - name = "pytest-cov-2.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-cov/${name}.tar.gz"; - sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k"; - }; - - buildInputs = with self; [ pytest pytest_xdist virtualenv process-tests ]; - propagatedBuildInputs = with self; [ coverage ]; - - # xdist related tests fail with the following error - # OSError: [Errno 13] Permission denied: 'py/_code' - doCheck = false; - checkPhase = '' - # allow to find the module helper during the test run - export PYTHONPATH=$PYTHONPATH:$PWD/tests - py.test tests - ''; - - meta = { - description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; - homepage = https://github.com/pytest-dev/pytest-cov; - license = licenses.mit; - }; - }; + pytestcov = callPackage ../development/python-modules/pytest-cov { }; pytest-expect = callPackage ../development/python-modules/pytest-expect { }; - pytest-virtualenv = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-virtualenv"; - version = "1.2.7"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755"; - }; - buildInputs = with self; [ pytest pytestcov mock cmdline ]; - propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ]; - checkPhase = '' py.test tests/unit ''; - meta = { - description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; - homepage = https://github.com/manahl/pytest-plugins; - license = licenses.mit; - maintainers = with maintainers; [ ryansydnor ]; - platforms = platforms.all; - }; - }; + pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; pytest_xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; - pytest-subtesthack = buildPythonPackage rec { - name = "pytest-subtesthack-${version}"; - version = "0.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-subtesthack/${name}.tar.gz"; - sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; - }; - - buildInputs = with self; [ pytest ]; - - # no upstream test - doCheck = false; - - meta = { - description = "Terrible plugin to set up and tear down fixtures within the test function itself"; - homepage = https://github.com/untitaker/pytest-subtesthack; - license = licenses.publicDomain; - }; - }; + pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; @@ -3292,125 +1979,23 @@ in { }; }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - cssselect = buildPythonPackage rec { - name = "cssselect-${version}"; - version = "0.9.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cssselect/${name}.tar.gz"; - sha256 = "10h623qnp6dp1191jri7lvgmnd4yfkl36k9smqklp1qlf3iafd85"; - }; - # AttributeError: 'module' object has no attribute 'tests' - doCheck = false; - }; - - cssutils = buildPythonPackage (rec { - name = "cssutils-1.0.1"; - - src = pkgs.fetchurl { - url = mirror://pypi/c/cssutils/cssutils-1.0.1.tar.gz; - sha256 = "0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq"; - }; - - buildInputs = with self; [ self.mock ]; - - # couple of failing tests - doCheck = false; - - meta = { - description = "A Python package to parse and build CSS"; - - homepage = http://code.google.com/p/cssutils/; - - license = licenses.lgpl3Plus; - }; - }); - - darcsver = buildPythonPackage (rec { - name = "darcsver-1.7.4"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/darcsver/${name}.tar.gz"; - sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6"; - }; - - buildInputs = with self; [ self.mock ]; + cssselect = callPackage ../development/python-modules/cssselect { }; - # Note: We don't actually need to provide Darcs as a build input. - # Darcsver will DTRT when Darcs isn't available. See news.gmane.org - # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a - # discussion. + cssselect2 = callPackage ../development/python-modules/cssselect2 { }; - # AttributeError: 'module' object has no attribute 'test_darcsver' - doCheck = false; + cssutils = callPackage ../development/python-modules/cssutils { }; - meta = { - description = "Darcsver, generate a version number from Darcs history"; - - homepage = https://pypi.python.org/pypi/darcsver; - - license = "BSD-style"; - }; - }); + darcsver = callPackage ../development/python-modules/darcsver { }; dask = callPackage ../development/python-modules/dask { }; - datrie = buildPythonPackage rec { - name = "datrie"; - version = "0.7.1"; + datrie = callPackage ../development/python-modules/datrie { }; - src = pkgs.fetchurl { - url = "mirror://pypi/d/datrie/datrie-${version}.tar.gz"; - sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; - }; - - buildInputs = with self; [ pytest pytestrunner hypothesis ]; - meta = { - description = "Super-fast, efficiently stored Trie for Python"; - homepage = "https://github.com/kmike/datrie"; - license = licenses.lgpl2; - maintainers = with maintainers; [ lewo ]; - }; - }; - - heapdict = buildPythonPackage rec { - name = "HeapDict-${version}"; - version = "1.0.0"; + heapdict = callPackage ../development/python-modules/heapdict { }; - src = pkgs.fetchurl { - url = "mirror://pypi/H/HeapDict/${name}.tar.gz"; - sha256 = "0nhvxyjq6fp6zd7jzmk5x4fg6xhakqx9lhkp5yadzkqn0rlf7ja0"; - }; - doCheck = !isPy3k; - meta = { - description = "a heap with decrease-key and increase-key operations."; - homepage = http://stutzbachenterprises.com; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; - - zict = buildPythonPackage rec { - - name = "zict-${version}"; - version = "0.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zict/${name}.tar.gz"; - sha256 = "12h95vbkbar1hc6cr1kpr6zr486grj3mpx4lznvmnai0iy6pbqp4"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ heapdict ]; - - meta = { - description = "Mutable mapping tools."; - homepage = https://github.com/dask/zict; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; + zict = callPackage ../development/python-modules/zict { }; distributed = buildPythonPackage rec { @@ -3440,26 +2025,7 @@ in { }; }; - digital-ocean = buildPythonPackage rec { - name = "python-digitalocean-1.10.1"; - - propagatedBuildInputs = with self; [ requests ]; - - # Package doesn't distribute tests. - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-digitalocean/${name}.tar.gz"; - sha256 = "12qybflfnl08acspz7rpaprmlabgrzimacbd7gm9qs5537hl3qnp"; - }; - - meta = { - description = "digitalocean.com API to manage Droplets and Images"; - homepage = https://pypi.python.org/pypi/python-digitalocean; - license = licenses.lgpl3; - maintainers = with maintainers; [ teh ]; - }; - }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; leather = callPackage ../development/python-modules/leather { }; @@ -3471,164 +2037,23 @@ in { linuxfd = callPackage ../development/python-modules/linuxfd { }; - locket = buildPythonPackage rec { - name = "locket-${version}"; - version = "0.2.0"; + locket = callPackage ../development/python-modules/locket { }; - src = pkgs.fetchurl { - url = "mirror://pypi/l/locket/${name}.tar.gz"; - sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ ]; - - # weird test requirements (spur.local>=0.3.7,<0.4) - doCheck = false; - - meta = { - description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; - homepage = "https://github.com/mwilliamson/locket.py"; - license = licenses.bsd2; - maintainers = with maintainers; [ teh ]; - }; - }; - - tblib = buildPythonPackage rec { - name = "tblib-${version}"; - version = "1.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tblib/${name}.tar.gz"; - sha256 = "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"; - }; - - meta = { - description = "Traceback fiddling library. Allows you to pickle tracebacks."; - homepage = "https://github.com/ionelmc/python-tblib"; - license = licenses.bsd2; - maintainers = with maintainers; [ teh ]; - }; - }; - - s3fs = buildPythonPackage rec { - name = "s3fs-${version}"; - version = "0.0.8"; + tblib = callPackage ../development/python-modules/tblib { }; - src = pkgs.fetchurl { - url = "mirror://pypi/s/s3fs/${name}.tar.gz"; - sha256 = "0zbdzqrim0zig94fk1hswg4vfdjplw6jpx3pdi42qc830h0nscn8"; - }; - - buildInputs = with self; [ docutils ]; - propagatedBuildInputs = with self; [ boto3 ]; - - # Depends on `moto` which has a long dependency chain with exact - # version requirements that can't be made to work with current - # pythonPackages. - doCheck = false; - - meta = { - description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; - homepage = "http://github.com/dask/s3fs/"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; + s3fs = callPackage ../development/python-modules/s3fs { }; datashape = callPackage ../development/python-modules/datashape { }; - requests-cache = buildPythonPackage (rec { - name = "requests-cache-${version}"; - version = "0.4.13"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests-cache/${name}.tar.gz"; - sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; - }; - - buildInputs = with self; [ mock ]; - - propagatedBuildInputs = with self; [ requests six urllib3 ]; - - meta = { - description = "Persistent cache for requests library"; - homepage = https://pypi.python.org/pypi/requests-cache; - license = licenses.bsd3; - }; - }); + requests-cache = callPackage ../development/python-modules/requests-cache { }; requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; - howdoi = buildPythonPackage (rec { - name = "howdoi-${version}"; - version = "1.1.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/howdoi/${name}.tar.gz"; - sha256 = "df4e49a219872324875d588e7699a1a82174a267e8487505e86bfcb180aea9b7"; - }; - - propagatedBuildInputs = with self; [ self.six requests-cache pygments pyquery ]; - - meta = { - description = "Instant coding answers via the command line"; - homepage = https://pypi.python.org/pypi/howdoi; - license = licenses.mit; - }; - }); - - neurotools = buildPythonPackage (rec { - name = "NeuroTools-${version}"; - version = "0.3.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/N/NeuroTools/${name}.tar.gz"; - sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4"; - }; - - disabled = isPy3k; - - # Tests are not automatically run - # Many tests fail (using py.test), and some need R - doCheck = false; - - propagatedBuildInputs = with self; [ - scipy - numpy - matplotlib - tables - pyaml - urllib3 - rpy2 - mpi4py - ]; - - meta = { - description = "Collection of tools to support analysis of neural activity"; - homepage = https://pypi.python.org/pypi/NeuroTools; - license = licenses.gpl2; - maintainers = with maintainers; [ nico202 ]; - }; - }); - - jdatetime = buildPythonPackage (rec { - name = "jdatetime-${version}"; - version = "1.7.1"; + howdoi = callPackage ../development/python-modules/howdoi {}; - src = pkgs.fetchurl { - url = "mirror://pypi/j/jdatetime/${name}.tar.gz"; - sha256 = "c08ba5791c2350b26e87ddf478bf223108146e241b6c949538221b54afd633ac"; - }; + neurotools = callPackage ../development/python-modules/neurotools {}; - propagatedBuildInputs = with self; [ self.six ]; - - meta = { - description = "Jalali datetime binding for python"; - homepage = https://pypi.python.org/pypi/jdatetime; - license = licenses.psfl; - }; - }); + jdatetime = callPackage ../development/python-modules/jdatetime {}; daphne = callPackage ../development/python-modules/daphne { }; @@ -3640,24 +2065,7 @@ in { dateutil = self.python-dateutil; # Buildbot 0.8.7p1 needs dateutil==1.5 - dateutil_1_5 = buildPythonPackage (rec { - name = "dateutil-1.5"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; - }; - - propagatedBuildInputs = with self; [ self.six ]; - - meta = { - description = "Powerful extensions to the standard datetime module"; - homepage = https://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; - }); + dateutil_1_5 = callPackage ../development/python-modules/dateutil/1_5.nix { }; decorator = callPackage ../development/python-modules/decorator { }; @@ -3665,22 +2073,7 @@ in { demjson = callPackage ../development/python-modules/demjson { }; - derpconf = self.buildPythonPackage rec { - name = "derpconf-0.4.9"; - - propagatedBuildInputs = with self; [ six ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/derpconf/${name}.tar.gz"; - sha256 = "9129419e3a6477fe6366c339d2df8c614bdde82a639f33f2f40d4de9a1ed236a"; - }; - - meta = { - description = "derpconf abstracts loading configuration files for your app"; - homepage = https://github.com/globocom/derpconf; - license = licenses.mit; - }; - }; + derpconf = callPackage ../development/python-modules/derpconf { }; deskcon = self.buildPythonPackage rec { name = "deskcon-0.3"; @@ -3727,69 +2120,11 @@ in { docker = callPackage ../development/python-modules/docker {}; - dockerpty = buildPythonPackage rec { - name = "dockerpty-0.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dockerpty/${name}.tar.gz"; - sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; - }; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; - homepage = https://github.com/d11wtq/dockerpty; - license = licenses.asl20; - }; - }; - - docker_pycreds = buildPythonPackage rec { - name = "docker-pycreds-${version}"; - version = "0.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-pycreds/${name}.tar.gz"; - sha256 = "0j3k5wk3bww5y0f2rvgzsin0q98k0i9j308vpsmxidw0y8n3m0wk"; - }; + dockerpty = callPackage ../development/python-modules/dockerpty {}; - doCheck = false; # require docker-credential-helpers binaries + docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; - propagatedBuildInputs = with self; [ - six - ]; - - meta = { - description = "Python bindings for the docker credentials store API."; - homepage = https://github.com/shin-/dockerpy-creds; - license = licenses.asl20; - }; - }; - - docker_registry_core = buildPythonPackage rec { - name = "docker-registry-core-2.0.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-registry-core/${name}.tar.gz"; - sha256 = "347e804f1f35b28dbe27bf8d7a0b630fca29d684032139bf26e3940572360360"; - }; - - DEPS = "loose"; - - doCheck = false; - propagatedBuildInputs = with self; [ - boto redis setuptools simplejson - ]; - - patchPhase = "> requirements/main.txt"; - - meta = { - description = "Docker registry core package"; - homepage = https://github.com/docker/docker-registry; - license = licenses.asl20; - }; - }; + docker_registry_core = callPackage ../development/python-modules/docker-registry-core {}; docker_registry = buildPythonPackage rec { name = "docker-registry-0.9.1"; @@ -3822,57 +2157,13 @@ in { }; }; - docopt = buildPythonPackage rec { - name = "docopt-0.6.2"; + docopt = callPackage ../development/python-modules/docopt { }; - src = pkgs.fetchurl { - url = "mirror://pypi/d/docopt/${name}.tar.gz"; - sha256 = "49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"; - }; - - meta = { - description = "Pythonic argument parser, that will make you smile"; - homepage = http://docopt.org/; - license = licenses.mit; - }; - }; - - doctest-ignore-unicode = buildPythonPackage rec { - name = "doctest-ignore-unicode-${version}"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/doctest-ignore-unicode/${name}.tar.gz"; - sha256= "fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - description = "Add flag to ignore unicode literal prefixes in doctests"; - license = with licenses; [ asl20 ]; - homepage = https://github.com/gnublade/doctest-ignore-unicode; - }; - }; + doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; - dogpile_core = buildPythonPackage rec { - name = "dogpile.core-0.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dogpile.core/dogpile.core-0.4.1.tar.gz"; - sha256 = "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76"; - }; - - doCheck = false; - - meta = { - description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = https://bitbucket.org/zzzeek/dogpile.core; - license = licenses.bsd3; - }; - }; + dogpile_core = callPackage ../development/python-modules/dogpile.core { }; dopy = buildPythonPackage rec { version = "2016-01-04"; @@ -3900,25 +2191,7 @@ in { urllib3 = callPackage ../development/python-modules/urllib3 {}; - dropbox = buildPythonPackage rec { - name = "dropbox-${version}"; - version = "8.0.0"; - doCheck = false; # Set DROPBOX_TOKEN environment variable to a valid token. - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dropbox/${name}.tar.gz"; - sha256 = "0bixx80zjq0286dwm4zhg8bdhc8pqlrqy4n2jg7i6m6a4gv4gak5"; - }; - - buildInputs = with self; [ pytestrunner ]; - propagatedBuildInputs = with self; [ requests urllib3 mock setuptools ]; - - meta = { - description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = https://www.dropbox.com/developers/core/docs; - license = licenses.mit; - }; - }; + dropbox = callPackage ../development/python-modules/dropbox {}; ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; @@ -3928,24 +2201,7 @@ in { easydict = callPackage ../development/python-modules/easydict { }; - EasyProcess = buildPythonPackage rec { - name = "EasyProcess-0.2.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/E/EasyProcess/${name}.tar.gz"; - sha256 = "94e241cadc9a46f55b5c06000df85618849602e7e1865b8de87576b90a22e61f"; - }; - - # No tests - doCheck = false; - - meta = { - description = "Easy to use python subprocess interface"; - homepage = "https://github.com/ponty/EasyProcess"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ layus ]; - }; - }; + EasyProcess = callPackage ../development/python-modules/easyprocess { }; easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; @@ -4297,6 +2553,8 @@ in { fpdf = callPackage ../development/python-modules/fpdf { }; + fpylll = callPackage ../development/python-modules/fpylll { }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; frozendict = buildPythonPackage rec { @@ -4689,12 +2947,11 @@ in { wrapProgram $out/bin/gtimelog \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \ - ''; meta = { description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; - homepage = http://mg.pov.lt/gtimelog/; + homepage = https://mg.pov.lt/gtimelog/; license = licenses.gpl2Plus; maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; @@ -4755,7 +3012,7 @@ in { description = "Python humanize utilities"; homepage = https://github.com/jmoiron/humanize; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; @@ -4843,13 +3100,13 @@ in { description = "WSGI HTTP Digest Authentication middleware"; homepage = https://github.com/jonashaag/httpauth; license = licenses.bsd2; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; }; - idna-ssl = callPackage ../development/python-modules/idna-ssl/default.nix { }; + idna-ssl = callPackage ../development/python-modules/idna-ssl { }; - ijson = callPackage ../development/python-modules/ijson/default.nix {}; + ijson = callPackage ../development/python-modules/ijson {}; imagesize = buildPythonPackage rec { name = "imagesize-${version}"; @@ -4868,29 +3125,7 @@ in { }; - imbalanced-learn = buildPythonPackage rec { - name = "imbalanced-learn-${version}"; - version = "0.3.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/imbalanced-learn/${name}.tar.gz"; - sha256 = "0j76m0rrsvyqj9bimky9m7b609y5v6crf9apigww3xvcnchhj901"; - }; - - preConfigure = '' - export HOME=$PWD - ''; - - propagatedBuildInputs = with self; [ scikitlearn ]; - buildInputs = with self; [ nose pytest pandas ]; - - meta = { - description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; - homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; - license = with licenses; [ mit ]; - }; - - }; + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; imread = buildPythonPackage rec { name = "python-imread-${version}"; @@ -5006,6 +3241,8 @@ in { jdcal = callPackage ../development/python-modules/jdcal { }; + jieba = callPackage ../development/python-modules/jieba { }; + internetarchive = callPackage ../development/python-modules/internetarchive {}; JPype1 = callPackage ../development/python-modules/JPype1 {}; @@ -5122,6 +3359,7 @@ in { pname = "lightblue"; version = "0.4"; name = "${pname}-${version}"; + disabled = isPy3k; # build fails, 2018-04-11 src = pkgs.fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; @@ -5199,26 +3437,9 @@ in { jupyter_console = callPackage ../development/python-modules/jupyter_console { }; - jupyterlab = buildPythonPackage rec { - name = "jupyterlab-${version}"; - version = "0.4.1"; + jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; - src = pkgs.fetchurl { - url = "mirror://pypi/j/jupyterlab/${name}.tar.gz"; - sha256 = "91dc4d7dfb1e6ab97e28d6e3a2fc38f5f65d368201c00fd0ed077519258e67bb"; - }; - - propagatedBuildInputs = with self; [ notebook ]; - - # No tests in archive - doCheck = false; - - meta = { - description = "Jupyter lab environment notebook server extension."; - license = with licenses; [ bsd3 ]; - homepage = "http://jupyter.org/"; - }; - }; + jupyterlab = callPackage ../development/python-modules/jupyterlab {}; PyLTI = callPackage ../development/python-modules/pylti { }; @@ -5326,6 +3547,8 @@ in { }; }; + misaka = callPackage ../development/python-modules/misaka {}; + mt-940 = callPackage ../development/python-modules/mt-940 { }; mwlib = let @@ -5511,7 +3734,7 @@ in { meta = { description = "PAM interface using ctypes"; - homepage = "http://github.com/minrk/pamela"; + homepage = "https://github.com/minrk/pamela"; license = licenses.mit; }; }; @@ -5560,7 +3783,7 @@ in { meta = { description = "A Python-based build/distribution/deployment scripting tool"; - homepage = http://github.com/paver/paver; + homepage = https://github.com/paver/paver; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; @@ -5696,6 +3919,11 @@ in { }; }; + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; + }; + poyo = buildPythonPackage rec { version = "0.4.0"; name = "poyo-${version}"; @@ -6227,34 +4455,7 @@ in { }; - py3status = buildPythonPackage rec { - version = "3.7"; - name = "py3status-${version}"; - src = pkgs.fetchFromGitHub { - owner = "ultrabug"; - repo = "py3status"; - rev = version; - sha256 = "1khrvxjjcm1bsswgrdgvyrdrimxx92yhql4gmji6a0kpp59dp541"; - }; - doCheck = false; - propagatedBuildInputs = with self; [ requests ]; - buildInputs = with pkgs; [ file ]; - prePatch = '' - sed -i -e "s|'file|'${pkgs.file}/bin/file|" py3status/parse_config.py - sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py - sed -i -e "s|notify-send|${pkgs.libnotify}/bin/notify-send|" py3status/modules/battery_level.py - sed -i -e "s|/usr/bin/whoami|${pkgs.coreutils}/bin/whoami|" py3status/modules/external_script.py - sed -i -e "s|'amixer|'${pkgs.alsaUtils}/bin/amixer|" py3status/modules/volume_status.py - sed -i -e "s|'i3-nagbar|'${pkgs.i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py - sed -i -e "s|'free|'${pkgs.procps}/bin/free|" py3status/modules/sysdata.py - sed -i -e "s|'sensors|'${pkgs.lm_sensors}/bin/sensors|" py3status/modules/sysdata.py - sed -i -e "s|'setxkbmap|'${pkgs.xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py - sed -i -e "s|'xset|'${pkgs.xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py - ''; - meta = { - maintainers = with maintainers; [ garbas ]; - }; - }; + py3status = callPackage ../development/python-modules/py3status {}; multi_key_dict = buildPythonPackage rec { name = "multi_key_dict-${version}"; @@ -7423,9 +5624,7 @@ in { }; }; - # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067 - graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet" - else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; grappelli_safe = buildPythonPackage rec { version = "0.3.13"; @@ -7639,7 +5838,7 @@ in { meta = { description = "Filesystem abstraction"; - homepage = http://pypi.python.org/pypi/fs; + homepage = https://pypi.python.org/pypi/fs; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; @@ -7679,43 +5878,17 @@ in { }; future = callPackage ../development/python-modules/future { }; - - futures = buildPythonPackage rec { - name = "futures-${version}"; - version = "3.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/futures/${name}.tar.gz"; - sha256 = "1z9j05fdj2yszjmz4pmjhl2jdnwhdw80cjwfqq3ci0yx19gv9v2i"; - }; - - # This module is for backporting functionality to Python 2.x, it's builtin in py3k - disabled = isPy3k; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - # Tests fail - doCheck = false; - - meta = with pkgs.stdenv.lib; { - description = "Backport of the concurrent.futures package from Python 3.2"; - homepage = "https://github.com/agronholm/pythonfutures"; - license = licenses.bsd2; - maintainers = with maintainers; [ garbas ]; + future15 = self.future.overridePythonAttrs (old: rec { + name = "future-${version}"; + version = "0.15.2"; + src = fetchPypi { + pname = "future"; + version = "0.15.2"; + sha256 = "15wvcfzssc68xqnqi1dq4fhd0848hwi9jn42hxyvlqna40zijfrx"; }; - }; - - futures_2_2 = self.futures.override rec { - version = "2.2.0"; - name = "futures-${version}"; + }); - src = pkgs.fetchurl { - url = "mirror://pypi/f/futures/${name}.tar.gz"; - sha256 = "1lqfzl3z3pkxakgbcrfy6x7x0fp3q18mj5lpz103ljj7fdqha70m"; - }; - }; + futures = callPackage ../development/python-modules/futures { }; gcovr = buildPythonPackage rec { name = "gcovr-2.4"; @@ -7952,14 +6125,14 @@ in { github3_py = buildPythonPackage rec { name = "github3.py-${version}"; - version = "1.0.0a4"; + version = "1.0.2"; src = pkgs.fetchurl { url = "mirror://pypi/g/github3.py/${name}.tar.gz"; - sha256 = "0rhnrhb7qc60h82hkd4wnj1jh544yzrf4pjmn4rqacdi59p7f3jp"; + sha256 = "1g91a8q9w0dalf4y4v0g72zi7vfrxwpx639an28vvys20y5zlvwp"; }; - buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers ]; + buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers dateutil ]; propagatedBuildInputs = with self; [ requests pyopenssl uritemplate_py ndg-httpsclient requests_toolbelt pyasn1 ]; @@ -8032,27 +6205,7 @@ in { google_api_core = callPackage ../development/python-modules/google_api_core { }; - google_api_python_client = buildPythonPackage rec { - name = "google-api-python-client-${version}"; - version = "1.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/google-api-python-client/${name}.tar.gz"; - sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = with self; [ httplib2 six oauth2client uritemplate ]; - - meta = { - description = "The core Python library for accessing Google APIs"; - homepage = "https://code.google.com/p/google-api-python-client/"; - license = licenses.asl20; - platforms = platforms.unix; - }; - }; + google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; google_apputils = buildPythonPackage rec { name = "google-apputils-0.4.1"; @@ -8088,6 +6241,8 @@ in { google_gax = callPackage ../development/python-modules/google_gax { }; + gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); + grammalecte = callPackage ../development/python-modules/grammalecte { }; greenlet = buildPythonPackage rec { @@ -8397,7 +6552,7 @@ in { ''; meta = { - homepage = "http://falcao.it/HTTPretty/"; + homepage = "https://falcao.it/HTTPretty/"; description = "HTTP client request mocking tool"; license = licenses.mit; }; @@ -8810,8 +6965,10 @@ in { keyutils = callPackage ../development/python-modules/keyutils { }; + kiwisolver = callPackage ../development/python-modules/kiwisolver { }; + klein = callPackage ../development/python-modules/klein { }; - + koji = callPackage ../development/python-modules/koji { }; kombu = buildPythonPackage rec { @@ -8837,20 +6994,20 @@ in { meta = { description = "Messaging library for Python"; - homepage = "http://github.com/celery/kombu"; + homepage = "https://github.com/celery/kombu"; license = licenses.bsd3; }; }; konfig = callPackage ../development/python-modules/konfig { }; - kitchen = callPackage ../development/python-modules/kitchen/default.nix { }; + kitchen = callPackage ../development/python-modules/kitchen { }; - kubernetes = callPackage ../development/python-modules/kubernetes/default.nix { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; - pylast = callPackage ../development/python-modules/pylast/default.nix { }; + pylast = callPackage ../development/python-modules/pylast { }; - pylru = callPackage ../development/python-modules/pylru/default.nix { }; + pylru = callPackage ../development/python-modules/pylru { }; lark-parser = callPackage ../development/python-modules/lark-parser { }; @@ -8933,6 +7090,8 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { }; + python-Levenshtein = buildPythonPackage rec { name = "python-Levenshtein-${version}"; version = "0.12.0"; @@ -9075,7 +7234,7 @@ in { ''; meta = { - homepage = http://launchpad.net/pylockfile; + homepage = https://launchpad.net/pylockfile; description = "Platform-independent advisory file locking capability for Python applications"; license = licenses.asl20; }; @@ -9108,7 +7267,7 @@ in { }; }); - py_scrypt = callPackage ../development/python-modules/py_scrypt/default.nix { }; + py_scrypt = callPackage ../development/python-modules/py_scrypt { }; python_magic = callPackage ../development/python-modules/python-magic { }; @@ -9179,6 +7338,8 @@ in { marisa = pkgs.marisa; }; + marisa-trie = callPackage ../development/python-modules/marisa-trie { }; + markupsafe = buildPythonPackage rec { name = "markupsafe-${version}"; version = "1.0"; @@ -9321,13 +7482,13 @@ in { }; - matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { + matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; - matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { }; + matrix-client = callPackage ../development/python-modules/matrix-client { }; maya = callPackage ../development/python-modules/maya { }; @@ -9355,7 +7516,7 @@ in { }; }); - MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup/default.nix { }; + MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; @@ -9690,6 +7851,8 @@ in { }; }); + mock-open = callPackage ../development/python-modules/mock-open { }; + modestmaps = buildPythonPackage rec { name = "ModestMaps-1.4.6"; @@ -9835,30 +7998,7 @@ in { }; - - mrbob = buildPythonPackage rec { - name = "mrbob-${version}"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mr.bob/mr.bob-${version}.tar.gz"; - sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121"; - }; - - buildInputs = [ pkgs.glibcLocales self.mock ]; - - disabled = isPy3k; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ argparse jinja2 six ] ++ - (optionals isPy26 [ importlib ordereddict ]); - - meta = { - homepage = https://github.com/domenkozar/mr.bob.git; - description = "A tool to generate code skeletons from templates"; - }; - }; + mrbob = callPackage ../development/python-modules/mrbob {}; msgpack = callPackage ../development/python-modules/msgpack {}; @@ -9966,26 +8106,7 @@ in { }; }; - mutagen = buildPythonPackage (rec { - name = "mutagen-1.36"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mutagen/${name}.tar.gz"; - sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp"; - }; - - # Needed for tests only - buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pytest - ]; - LC_ALL = "en_US.UTF-8"; - - meta = { - description = "Python multimedia tagging library"; - homepage = http://code.google.com/p/mutagen; - license = licenses.lgpl2; - }; - }); + mutagen = callPackage ../development/python-modules/mutagen { }; muttils = buildPythonPackage (rec { @@ -10300,7 +8421,15 @@ in { name = "sleekxmpp-${version}"; version = "1.3.3"; - propagatedBuildInputs = with self; [ dnspython pyasn1 gevent ]; + patches = [ + # Fix https://github.com/etingof/pyasn1/issues/112 + (pkgs.fetchpatch { + url = "https://github.com/kdschlosser/SleekXMPP/commit/597014ba5ca258763e96ee37729ac933c5af1602.patch"; + sha256 = "176v3f3pr0bx48wv1kf9jn2pwxdn7qpqyc2chwv1m8gbppsfaikf"; + }) + ]; + + propagatedBuildInputs = with self; [ dnspython pyasn1 pyasn1-modules gevent ]; checkInputs = [ pkgs.gnupg ]; checkPhase = "${python.interpreter} testall.py"; doCheck = false; # Tests failed all this time and upstream doesn't seem to care. @@ -10382,7 +8511,7 @@ in { }; meta = { - homepage = http://alastairs-place.net/projects/netifaces/; + homepage = https://alastairs-place.net/projects/netifaces/; description = "Portable access to network interfaces from Python"; }; }; @@ -10726,7 +8855,7 @@ in { dynd = buildPythonPackage rec { version = "0.7.2"; name = "dynd-${version}"; - disabled = isPyPy; + disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11 src = pkgs.fetchFromGitHub { owner = "libdynd"; @@ -10756,6 +8885,8 @@ in { }; }; + langcodes = callPackage ../development/python-modules/langcodes { }; + livestreamer = buildPythonPackage rec { version = "1.12.2"; name = "livestreamer-${version}"; @@ -10851,23 +8982,7 @@ in { }; }); - oauth2client = buildPythonPackage rec { - name = "oauth2client-1.4.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oauth2client/${name}.tar.gz"; - sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; - }; - - propagatedBuildInputs = with self; [ six httplib2 pyasn1-modules rsa ]; - doCheck = false; - - meta = { - description = "A client library for OAuth 2.0"; - homepage = https://github.com/google/oauth2client/; - license = licenses.bsd2; - }; - }; + oauth2client = callPackage ../development/python-modules/oauth2client { }; oauthlib = buildPythonPackage rec { version = "2.0.0"; @@ -10936,7 +9051,7 @@ in { meta = { description = "Draws Python object reference graphs with graphviz"; - homepage = http://mg.pov.lt/objgraph/; + homepage = https://mg.pov.lt/objgraph/; license = licenses.mit; }; }; @@ -11326,22 +9441,9 @@ in { olefile = callPackage ../development/python-modules/olefile { }; - requests-mock = buildPythonPackage rec { - name = "requests-mock-${version}"; - version = "1.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests-mock/${name}.tar.gz"; - sha256 = "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx"; - }; + requests-mock = callPackage ../development/python-modules/requests-mock { }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - buildInputs = with self; [ pbr testtools testrepository mock ]; - propagatedBuildInputs = with self; [ six requests ]; - }; + mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; mox3 = buildPythonPackage rec { name = "mox3-${version}"; @@ -11765,6 +9867,8 @@ in { }; }; + periodictable = callPackage ../development/python-modules/periodictable { }; + pg8000 = buildPythonPackage rec { name = "pg8000-1.10.1"; @@ -11850,31 +9954,7 @@ in { piexif = callPackage ../development/python-modules/piexif { }; - pip = buildPythonPackage rec { - pname = "pip"; - version = "9.0.1"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d"; - }; - - # pip detects that we already have bootstrapped_pip "installed", so we need - # to force it a little. - installFlags = [ "--ignore-installed" ]; - - checkInputs = with self; [ mock scripttest virtualenv pretend pytest ]; - # Pip wants pytest, but tests are not distributed - doCheck = false; - - meta = { - description = "The PyPA recommended tool for installing Python packages"; - license = licenses.mit; - homepage = https://pip.pypa.io/; - priority = 10; - }; - }; + pip = callPackage ../development/python-modules/pip { }; pip-tools = callPackage ../development/python-modules/pip-tools { git = pkgs.gitMinimal; @@ -11903,9 +9983,12 @@ in { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; - platformio = callPackage ../development/python-modules/platformio { }; - kmsxx = callPackage ../development/libraries/kmsxx { }; + kmsxx = (callPackage ../development/libraries/kmsxx { + inherit (pkgs.kmsxx) stdenv; + }).overrideAttrs (oldAttrs: { + name = "${python.libPrefix}-${pkgs.kmsxx.name}"; + }); pybase64 = callPackage ../development/python-modules/pybase64 { }; @@ -12142,7 +10225,7 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; - protobuf = pkgs.protobuf; + protobuf = pkgs.protobuf3_5; }; protobuf3_1 = callPackage ../development/python-modules/protobuf { @@ -12339,32 +10422,7 @@ in { }; }; - - - vobject = buildPythonPackage rec { - version = "0.9.5"; - name = "vobject-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "eventable"; - repo = "vobject"; - sha256 = "1f5lw9kpssr66bdirkjba3izbnm68p8pd47546m5yl4c7x76s1ld"; - rev = version; - }; - - disabled = isPyPy; - - propagatedBuildInputs = with self; [ dateutil ]; - - checkPhase = "${python.interpreter} tests.py"; - - meta = { - description = "Module for reading vCard and vCalendar files"; - homepage = http://eventable.github.io/vobject/; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; - }; + vobject = callPackage ../development/python-modules/vobject { }; pycarddav = buildPythonPackage rec { version = "0.7.0"; @@ -12389,24 +10447,7 @@ in { pygit2 = callPackage ../development/python-modules/pygit2 { }; - Babel = buildPythonPackage (rec { - name = "Babel-2.3.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/B/Babel/${name}.tar.gz"; - sha256 = "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ pytz ]; - - meta = { - homepage = http://babel.edgewall.org; - description = "A collection of tools for internationalizing Python applications"; - license = licenses.bsd3; - maintainers = with maintainers; [ garbas ]; - }; - }); + Babel = callPackage ../development/python-modules/Babel { }; pybfd = callPackage ../development/python-modules/pybfd { }; @@ -12436,6 +10477,7 @@ in { meta = { description = "Interface for working with block devices"; license = licenses.gpl2Plus; + broken = isPy3k; # doesn't build on python 3, 2018-04-11 }; }; @@ -12498,6 +10540,7 @@ in { license = licenses.bsd2; platforms = platforms.all; homepage = "http://jparyani.github.io/pycapnp/index.html"; + broken = true; # 2018-04-11 }; }; @@ -13313,7 +11356,7 @@ in { }; }; - python_fedora = callPackage ../development/python-modules/python_fedora/default.nix {}; + python_fedora = callPackage ../development/python-modules/python_fedora {}; python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; python_simple_hipchat = self.python-simple-hipchat; @@ -13387,8 +11430,12 @@ in { progressbar2 = callPackage ../development/python-modules/progressbar2 { }; + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + + progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl openssl; + inherit (pkgs) openldap cyrus_sasl; }; ldap3 = callPackage ../development/python-modules/ldap3 {}; @@ -13676,23 +11723,7 @@ in { }; }; - pyperclip = buildPythonPackage rec { - version = "1.5.27"; - name = "pyperclip-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyperclip/${name}.zip"; - sha256 = "1i9zxm7qc49n9yxfb41c0jbmmp2hpzx98kaizjl7qmgiv3snvjx3"; - }; - - doCheck = false; - - meta = { - homepage = "https://github.com/asweigart/pyperclip"; - license = licenses.bsdOriginal; - description = "Cross-platform clipboard module"; - }; - }; + pyperclip = callPackage ../development/python-modules/pyperclip { }; pysqlite = buildPythonPackage rec { name = "pysqlite-2.8.3"; @@ -13798,12 +11829,12 @@ in { python-wifi = buildPythonPackage rec { name = "python-wifi-${version}"; - version = "0.6.0"; + version = "0.6.1"; disabled = ! (isPy26 || isPy27 ); src = pkgs.fetchurl { url = "mirror://pypi/p/python-wifi/${name}.tar.bz2"; - sha256 = "504639e5953eaec0e41758900fbe143d33d82ea86762b19b659a118c77d8403d"; + sha256 = "149c3dznb63d82143cz5hqdim0mqjysz6p3yk0zv271vq3xnmzvv"; }; meta = { @@ -14061,7 +12092,7 @@ in { description = "A Python binding to QScintilla, Qt based text editing control"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ danbst ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }); @@ -14416,36 +12447,15 @@ in { }; }; - rpkg = callPackage ../development/python-modules/rpkg/default.nix {}; + rpkg = callPackage ../development/python-modules/rpkg {}; - rply = callPackage ../development/python-modules/rply/default.nix {}; + rply = callPackage ../development/python-modules/rply {}; rpm = toPythonModule (pkgs.rpm.override{inherit python;}); rpmfluff = callPackage ../development/python-modules/rpmfluff {}; - rpy2 = buildPythonPackage rec { - name = "rpy2-2.8.2"; - disabled = isPyPy; - src = pkgs.fetchurl { - url = "mirror://pypi/r/rpy2/${name}.tar.gz"; - sha256 = "2c1a313df4e64236dcfe1078ce847b8e3c180656c894928d3a4b391aacb9b24c"; - }; - buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ]; - propagatedBuildInputs = with self; [ singledispatch six ]; - - # According to manual this is how the testsuite should be invoked - checkPhase = '' - ${python.interpreter} -m rpy2.tests - ''; - meta = { - homepage = http://rpy.sourceforge.net/rpy2; - description = "Python interface to R"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ joelmo ]; - broken = true; - }; - }; + rpy2 = callPackage ../development/python-modules/rpy2 {}; rpyc = buildPythonPackage rec { name = "rpyc-${version}"; @@ -14484,6 +12494,8 @@ in { }; }; + Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; + squaremap = buildPythonPackage rec { name = "squaremap-1.0.4"; disabled = isPy3k; @@ -14635,6 +12647,8 @@ in { sampledata = callPackage ../development/python-modules/sampledata { }; + sasmodels = callPackage ../development/python-modules/sasmodels { }; + scapy = callPackage ../development/python-modules/scapy { }; scipy = callPackage ../development/python-modules/scipy { }; @@ -15433,17 +13447,29 @@ in { sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; - version = "3.0.0"; + version = "3.1.1"; disabled = isPy3k; - src = pkgs.fetchurl { - url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; - sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4"; + src = pkgs.fetchdarcs { + url = http://devel.ag-projects.com/repositories/python-sipsimple; + rev = "release-${version}"; + sha256 = "0jdilm11f5aahxrzrkxrfx9sgjgkbla1r0wayc5dzd2wmjrdjyrg"; }; + preConfigure = '' + chmod +x ./deps/pjsip/configure ./deps/pjsip/aconfigure + ''; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; propagatedBuildInputs = with self; [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; + + meta = { + description = "SIP SIMPLE implementation for Python"; + homepage = http://sipsimpleclient.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + }; }; @@ -16633,13 +14659,15 @@ in { }; }; - uritemplate_py = buildPythonPackage rec { + unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + + uritemplate_py = buildPythonPackage rec { name = "uritemplate.py-${version}"; - version = "0.3.0"; + version = "3.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/u/uritemplate.py/${name}.tar.gz"; - sha256 = "0xvvdiwnag2pdi96hjf7v8asdia98flk2rxcjqnwcs3rk99alygx"; + sha256 = "1k5zvc5fyyrgv33mi3p86a9jn5n0pqffs9cviz92fw6q1kf7zvmr"; }; meta = with stdenv.lib; { @@ -16715,27 +14743,7 @@ in { update_checker = callPackage ../development/python-modules/update_checker {}; - uritemplate = buildPythonPackage rec { - name = "uritemplate-${version}"; - version = "0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uritemplate/${name}.tar.gz"; - sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; - }; - - # No tests in archive - doCheck = false; - - propagatedBuildInputs = with self; [ simplejson ]; - - meta = with stdenv.lib; { - homepage = https://github.com/uri-templates/uritemplate-py; - description = "Python implementation of URI Template"; - license = licenses.asl20; - maintainers = with maintainers; [ matthiasbeyer ]; - }; - }; + uritemplate = callPackage ../development/python-modules/uritemplate { }; uptime = buildPythonPackage rec { name = "uptime-${version}"; @@ -17101,6 +15109,8 @@ EOF widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; + wordfreq = callPackage ../development/python-modules/wordfreq { }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; @@ -17731,21 +15741,7 @@ EOF }; }; - pyzmq = buildPythonPackage rec { - name = "pyzmq-16.0.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyzmq/${name}.tar.gz"; - sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d"; - }; - buildInputs = with self; [ pkgs.zeromq3 pytest tornado ]; - propagatedBuildInputs = [ self.py ]; - - # Disable broken test - # https://github.com/zeromq/pyzmq/issues/799 - checkPhase = '' - py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send and not test_recv_json_cancelled" - ''; - }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; testfixtures = callPackage ../development/python-modules/testfixtures {}; @@ -17870,25 +15866,7 @@ EOF }; }; - - whichcraft = buildPythonPackage rec { - name = "whichcraft-${version}"; - version = "0.1.1"; - - src = pkgs.fetchurl { - url = "https://github.com/pydanny/whichcraft/archive/${version}.tar.gz"; - sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv"; - }; - - buildInputs = with self; [ pytest ]; - - meta = { - homepage = https://github.com/pydanny/whichcraft; - description = "Cross-platform cross-python shutil.which functionality"; - license = licenses.bsd3; - }; - }; - + whichcraft = callPackage ../development/python-modules/whichcraft { }; whisper = buildPythonPackage rec { name = "whisper-${version}"; @@ -18585,8 +16563,6 @@ EOF }; }; - redNotebook = pkgs.rednotebook; # Backwards compatibility alias. - uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = buildPythonPackage rec { @@ -18608,6 +16584,8 @@ EOF }; }; + vxi11 = callPackage ../development/python-modules/vxi11 { }; + svg2tikz = self.buildPythonPackage { name = "svg2tikz-1.0.0"; disabled = ! isPy27; @@ -18710,6 +16688,10 @@ EOF propagatedBuildInputs = with self; []; }; + pybindgen = callPackage ../development/python-modules/pybindgen {}; + + pygccxml = callPackage ../development/python-modules/pygccxml {}; + pymacaroons-pynacl = callPackage ../development/python-modules/pymacaroons-pynacl { }; pynacl = callPackage ../development/python-modules/pynacl { }; @@ -18923,7 +16905,7 @@ EOF doCheck = false; meta = { - homepage = "http://matplotlib.org/basemap/"; + homepage = "https://matplotlib.org/basemap/"; description = "Plot data on map projections with matplotlib"; longDescription = '' An add-on toolkit for matplotlib that lets you plot data on map projections with @@ -19083,7 +17065,7 @@ EOF meta = { description = "Copy your docs directly to the gh-pages branch"; - homepage = "http://github.com/davisp/ghp-import"; + homepage = "https://github.com/davisp/ghp-import"; license = "Tumbolia Public License"; maintainers = with maintainers; [ garbas ]; }; @@ -19199,7 +17181,7 @@ EOF meta = { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; - homepage = "http://docs.openstack.org/infra/system-config/jjb.html"; + homepage = "https://docs.openstack.org/infra/system-config/jjb.html"; license = licenses.asl20; maintainers = with maintainers; [ garbas ]; }; @@ -19770,12 +17752,15 @@ EOF tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow = callPackage ../development/python-modules/tensorflow rec { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit9; - cudnn = pkgs.cudnn_cudatoolkit9; - }; + tensorflow = + if stdenv.isDarwin + then callPackage ../development/python-modules/tensorflow/bin.nix { } + else callPackage ../development/python-modules/tensorflow rec { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit9; + cudnn = pkgs.cudnn_cudatoolkit9; + }; tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; @@ -20051,24 +18036,7 @@ EOF moreItertools = self.more-itertools; - more-itertools = buildPythonPackage rec { - name = "more-itertools-${version}"; - version = "4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/more-itertools/${name}.tar.gz"; - sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ six ]; - - meta = { - homepage = https://more-itertools.readthedocs.org; - description = "Expansion of the itertools module"; - license = licenses.mit; - }; - }; + more-itertools = callPackage ../development/python-modules/more-itertools { }; jaraco_functools = buildPythonPackage rec { name = "jaraco.functools-${version}"; @@ -20179,6 +18147,8 @@ EOF yapf = callPackage ../development/python-modules/yapf { }; + black = callPackage ../development/python-modules/black { }; + autobahn = callPackage ../development/python-modules/autobahn { }; jsonref = callPackage ../development/python-modules/jsonref { }; @@ -20315,6 +18285,8 @@ EOF sseclient = callPackage ../development/python-modules/sseclient { }; + warrant = callPackage ../development/python-modules/warrant { }; + textacy = callPackage ../development/python-modules/textacy { }; pyemd = callPackage ../development/python-modules/pyemd { }; @@ -20340,6 +18312,8 @@ EOF wsproto = callPackage ../development/python-modules/wsproto { }; h11 = callPackage ../development/python-modules/h11 { }; + + python-docx = callPackage ../development/python-modules/python-docx { }; }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix new file mode 100644 index 000000000000..26adcda8ee17 --- /dev/null +++ b/pkgs/top-level/unix-tools.nix @@ -0,0 +1,152 @@ +{ pkgs, buildEnv, runCommand, hostPlatform, lib }: + +# These are some unix tools that are commonly included in the /usr/bin +# and /usr/sbin directory under more normal distributions. Along with +# coreutils, these are commonly assumed to be available by build +# systems, but we can't assume they are available. In Nix, we list +# each program by name directly through this unixtools attribute. + +# You should always try to use single binaries when available. For +# instance, if your program needs to use "ps", just list it as a build +# input, not "procps" which requires Linux. + +let + + singleBinary = cmd: providers: let + provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; + in runCommand cmd { + meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); + } '' + mkdir -p $out/bin + + if ! [ -x "${provider}" ]; then + echo "Cannot find command ${cmd}" + exit 1 + fi + + ln -s "${provider}" "$out/bin/${cmd}" + ''; + +in rec { + + # more is unavailable in darwin + # just use less + more_compat = runCommand "more" {} '' + mkdir -p $out/bin + ln -s ${pkgs.less}/bin/less $out/bin/more + ''; + + # singular binaries + arp = singleBinary "arp" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + col = singleBinary "col" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.text_cmds; + }; + eject = singleBinary "eject" { + linux = pkgs.utillinux; + }; + getopt = singleBinary "getopt" { + linux = pkgs.utillinux; + darwin = pkgs.getopt; + }; + fdisk = singleBinary "fdisk" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + fsck = singleBinary "fsck" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + hexdump = singleBinary "hexdump" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + hostname = singleBinary "hostname" { + linux = pkgs.nettools; + darwin = pkgs.darwin.shell_cmds; + }; + ifconfig = singleBinary "ifconfig" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + logger = singleBinary "logger" { + linux = pkgs.utillinux; + }; + more = singleBinary "more" { + linux = pkgs.utillinux; + darwin = more_compat; + }; + mount = singleBinary "mount" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + netstat = singleBinary "netstat" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + ping = singleBinary "ping" { + linux = pkgs.iputils; + darwin = pkgs.darwin.network_cmds; + }; + ps = singleBinary "ps" { + linux = pkgs.procps; + darwin = pkgs.darwin.ps; + }; + quota = singleBinary "quota" { + linux = pkgs.linuxquota; + darwin = pkgs.darwin.diskdev_cmds; + }; + route = singleBinary "route" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + script = singleBinary "script" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + sysctl = singleBinary "sysctl" { + linux = pkgs.procps; + darwin = pkgs.darwin.system_cmds; + }; + top = singleBinary "top" { + linux = pkgs.procps; + darwin = pkgs.darwin.top; + }; + umount = singleBinary "umount" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + whereis = singleBinary "whereis" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + wall = singleBinary "wall" { + linux = pkgs.utillinux; + }; + write = singleBinary "write" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.basic_cmds; + }; + + # Compatibility derivations + # Provided for old usage of these commands. + + procps = buildEnv { + name = "procps-compat"; + paths = [ ps sysctl top ]; + }; + + utillinux = buildEnv { + name = "utillinux-compat"; + paths = [ fsck fdisk getopt hexdump mount + script umount whereis write col ]; + }; + + nettools = buildEnv { + name = "nettools-compat"; + paths = [ arp hostname ifconfig netstat route ]; + }; +} |